X-Original-To: alpine-aports@lists.alpinelinux.org Received: from sender153-mail.zoho.com (sender153-mail.zoho.com [74.201.84.153]) by lists.alpinelinux.org (Postfix) with ESMTP id 5750A5C4533 for ; Sat, 3 Dec 2016 19:06:44 +0000 (GMT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=zapps768; d=zoho.com; h=from:to:cc:subject:date:message-id:in-reply-to:references; b=It6WZqxLxRnDt2n6s2DuVg5ikSJe7EpG2wicyjc/RBYw+QQKCXKwKdf1lRkp/AHPuYoc7J3YlGVc 1fCvk3U3Q5/r9hjrUtTTsJq8qk+LEfM7gbGB68kev/6g0Qq0uCZ+ Received: from localhost (89-74-198-11.dynamic.chello.pl [89.74.198.11]) by mx.zohomail.com with SMTPS id 1480791985460464.9814067245229; Sat, 3 Dec 2016 11:06:25 -0800 (PST) From: Przemyslaw Pawelczyk To: ncopa@alpinelinux.org Cc: alpine-aports@lists.alpinelinux.org, timo.teras@iki.fi Subject: [alpine-aports] [PATCH v2] main/abuild: Make default_prepare() always end up in "$builddir". Date: Sat, 3 Dec 2016 20:06:16 +0100 Message-Id: <20161203190616.5974-1-przemoc@zoho.com> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20161203174846.5345-1-przemoc@zoho.com> References: <20161203174846.5345-1-przemoc@zoho.com> X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- Changes since v1: - Before I generated checksums for patch w/ To: and Cc: lines. I removed them from the patch, but forgot to regenerate checksums. Sorry for that. ...-default_prepare-always-end-up-in-builddi.patch | 30 ++++++++++++++++++++++ main/abuild/APKBUILD | 12 ++++++--- 2 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 main/abuild/0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch diff --git a/main/abuild/0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch b/main/abuild/0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch new file mode 100644 index 000000000000..38f8174594bb --- /dev/null +++ b/main/abuild/0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch @@ -0,0 +1,30 @@ +From d5fd6ff4c997a3b50f78deab7b0f2cd545f8c44f Mon Sep 17 00:00:00 2001 +From: Przemyslaw Pawelczyk +Date: Sat, 3 Dec 2016 17:32:24 +0100 +Subject: [PATCH] abuild: Make default_prepare() always end up in "$builddir". + +So far default_prepare() ended up in "$builddir" only if there were any +patches. It's better to be more consistent and make such change always. +--- + abuild.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/abuild.in b/abuild.in +index e49956b76d04..f56ac033f6a9 100644 +--- a/abuild.in ++++ b/abuild.in +@@ -565,10 +565,10 @@ have_patches() { + + default_prepare() { + local i ++ cd "$builddir" || { error "Is \$builddir set correctly?"; return 1; } + if ! have_patches; then + return 0 + fi +- cd "$builddir" || { error "Is \$builddir set correctly?"; return 1; } + for i in $source; do + case $i in + *.patch) +-- +2.8.3 + diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 06f1edce31e5..a6f91e95c586 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -2,7 +2,7 @@ pkgname=abuild pkgver=2.29.0 _ver=${pkgver%_git*} -pkgrel=1 +pkgrel=2 pkgdesc="Script to build Alpine Packages" url="http://git.alpinelinux.org/cgit/abuild/" arch="all" @@ -21,6 +21,7 @@ options="suid" pkggroups="abuild" source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz 0001-abuild-properly-detect-failure-of-dependency-install.patch + 0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch " _builddir="$srcdir/$pkgname-$_ver" @@ -64,8 +65,11 @@ gems() { } md5sums="1a51f8786331ddf79bf46357fe938f6a abuild-2.29.0.tar.xz -5dc373cd5daf473a4ee060f9cedbc9c0 0001-abuild-properly-detect-failure-of-dependency-install.patch" +5dc373cd5daf473a4ee060f9cedbc9c0 0001-abuild-properly-detect-failure-of-dependency-install.patch +5d581130ad0c0122025697773a356c77 0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch" sha256sums="06ba81d4b42e7d1ebb0761b0b0e1cbaf999acac54ab075906cecdf8f825950c1 abuild-2.29.0.tar.xz -e79ba4cdcdea3fa18d8441b8144c2db8c497523ee56927b466a701736ee9b906 0001-abuild-properly-detect-failure-of-dependency-install.patch" +e79ba4cdcdea3fa18d8441b8144c2db8c497523ee56927b466a701736ee9b906 0001-abuild-properly-detect-failure-of-dependency-install.patch +997aa2a222201d5b06149f9f43519ddd0c46a1820d230b749214e6ce796fa97e 0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch" sha512sums="349c0d5efaff05dc6f680a93e59a997857991520ae892426252d198aa4ef0b2854f1675ce3b1bc1bea810d5f97fae0985474ea13df3905d590b320373723990c abuild-2.29.0.tar.xz -1bc4bb62ee881051f41f5f68d25f8794208407f552a30bd7aad235c0bd57ebadc2a12dc21a4c1826eff3e320a5f9e7c40f89fd964144ff2f0d49f747708a61b4 0001-abuild-properly-detect-failure-of-dependency-install.patch" +1bc4bb62ee881051f41f5f68d25f8794208407f552a30bd7aad235c0bd57ebadc2a12dc21a4c1826eff3e320a5f9e7c40f89fd964144ff2f0d49f747708a61b4 0001-abuild-properly-detect-failure-of-dependency-install.patch +07fa01398135e27cef983a4846910e27a50cc06524e01016f425f1d35ff8962a1d6d4d0d3e1277bfba47dece56e526bc1f34bc2c512310b07a59bf323c64197f 0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch" -- 2.8.3 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---