X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by lists.alpinelinux.org (Postfix) with ESMTP id A03E05C41B6 for ; Mon, 18 Jul 2016 19:19:46 +0000 (GMT) Received: by mail-qt0-f195.google.com with SMTP id u25so7426306qtb.3 for ; Mon, 18 Jul 2016 12:19:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=sQeO38Od+kDTYHRIUp84YI0NixFkTve4WoT+pqY+gxA=; b=zP+5Q6sR4zOMHNPkrQDTzS9H9WE5ejRtOwWELBDX4XnwXoxp7vCiZyPKxX2fTA1vU+ 0GjTCDVC5Zl/M+nUNVClhIenBbiEKkwQgwaCuGXMTFo2IWIXOOVlggd/KkYwebaKPMTc bqPXN4YBLzi/R8uRFdpHepNRiogOWecnIeOxnKPFLOEAnSk82OdMnCnQSnYMZ8nnY7fG TTyt6Obqj6kMAnejYa/UZ/0Q0yNrRsy5mASZx8FwM/cPUD9Ld/qGL1313O0cYexTPCH7 HAWfgbyJD0wX/pVwxnittRdyd2uRNQ+DXT6GrKAmv7EJf4wKiS4waw5LBzoNQhI1uPRR bUGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=sQeO38Od+kDTYHRIUp84YI0NixFkTve4WoT+pqY+gxA=; b=bGI1fs5aedWqXnkvfNQ2n5GLckAgfvhAilBfdObgFGKSTqGl6CxPoQt/x/e15EFZCe UsSCTrkEdna8ZOGwrR4xuwn7nVXXUyYXo/+AHTrgWl/AXZnMA+JShu2bb0AmVtitzzkl UWLjlTI12jvI5y2q9oYxzhAxnjzHK4eSj8OFtD74wWGkNHKIjo6v4MJnGKlso8l0UDtH myRC+fCUlT83L4wuctsgak4WnxZk9TGjQs7rgDBefEZ3TLnkY5a+YWztkVvzD6WtchFB HMCsfks2e2vsoeWd1f0KDWwUuE+Me5Rz+8At2yj2oVq9lTTn3FcKDCXl7fZpg7qDt1QN zdZw== X-Gm-Message-State: ALyK8tKX/kd6FyTZoimvv++W1v2XkTlI2CLZaSl/P60oyGp/kA0Q3OphXKp6SYErRSLvNg== X-Received: by 10.200.54.185 with SMTP id a54mr51815081qtc.63.1468869585145; Mon, 18 Jul 2016 12:19:45 -0700 (PDT) Received: from localhost.localdomain (cpe-72-225-29-91.rochester.res.rr.com. [72.225.29.91]) by smtp.gmail.com with ESMTPSA id n89sm418089qte.38.2016.07.18.12.19.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Jul 2016 12:19:44 -0700 (PDT) From: Paul Lorenz To: alpine-aports@lists.alpinelinux.org Cc: Paul Lorenz Subject: [alpine-aports] [PATCH] Fix src builds Date: Mon, 18 Jul 2016 15:19:42 -0400 Message-Id: <1468869582-31793-1-git-send-email-plorenz@gmail.com> X-Mailer: git-send-email 2.7.4 X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: Fix filename_from_uri call Ensure remote sources are fetched Include remote sources in source package Include pre/post scripts Include trigger scripts --- abuild.in | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/abuild.in b/abuild.in index d4614d1..ec1b798 100644 --- a/abuild.in +++ b/abuild.in @@ -1596,13 +1596,31 @@ rootpkg() { } srcpkg() { + echo "Ensuring source is fetched" + fetch getpkgver || return 1 local p="$pkgname-$pkgver-$pkgrel" local prefix="${startdir##*/}" local i files="$prefix/APKBUILD" for i in $source; do - files="$files $prefix/$(filename_from uri $i)" + echo "Packaging source file: $i" + if [ ! -e $(filename_from_uri $i) ]; then + cp $srcdir/$(filename_from_uri $i) $(filename_from_uri $i) + fi + files="$files $prefix/$(filename_from_uri $i)" + done + + for i in $install; do + echo "Packaging install file: $i" + files="$files $prefix/$i" done + + for i in $triggers; do + local f=${i%=*} + echo "Packaging trigger file: $f" + files="$files $prefix/$f" + done + mkdir -p "$PKGDEST" msg "Creating source package $p.src.tar.gz..." (cd .. && tar -zcf "$PKGDEST/$p.src.tar.gz" $files) -- 2.7.4 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---