diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2017-02-09 13:40:17 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-02-09 13:40:17 +0200 |
| commit | b1f3e812d7ad4e21c3c109a2d5e44a8cf3d70add (patch) | |
| tree | 2a4e0a1279bc69a536486c3f2c9e754451258881 /main/abuild | |
| parent | 9409d6ec32cfd0f40069167c7ded9e22f6b07fad (diff) | |
| download | aports-b1f3e812d7ad4e21c3c109a2d5e44a8cf3d70add.tar.bz2 aports-b1f3e812d7ad4e21c3c109a2d5e44a8cf3d70add.tar.xz | |
main/abuild: preserve xattr when creating -dbg
Diffstat (limited to 'main/abuild')
| -rw-r--r-- | main/abuild/0001-abuild-preserve-xattrs-when-creating-dbg.patch | 41 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 20 |
2 files changed, 59 insertions, 2 deletions
diff --git a/main/abuild/0001-abuild-preserve-xattrs-when-creating-dbg.patch b/main/abuild/0001-abuild-preserve-xattrs-when-creating-dbg.patch new file mode 100644 index 0000000000..4fd1058bf4 --- /dev/null +++ b/main/abuild/0001-abuild-preserve-xattrs-when-creating-dbg.patch @@ -0,0 +1,41 @@ +From 9d2567f1e6ff75bb5c9dc34b354bdb3d1f02b343 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Thu, 9 Feb 2017 11:30:03 +0000 +Subject: [PATCH] abuild: preserve xattrs when creating -dbg + +--- + abuild.in | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/abuild.in b/abuild.in +index a71a2dd..19dedda 100644 +--- a/abuild.in ++++ b/abuild.in +@@ -1532,10 +1532,12 @@ default_dbg() { + mkdir -p $dstdir + fi + cd $srcdir ++ local XATTR=$(getfattr --match="" --dump "${srcfile}") + ${CROSS_COMPILE}objcopy --only-keep-debug $srcfile $dstfile + ${CROSS_COMPILE}objcopy --add-gnu-debuglink=$dstfile $srcdir/$srcfile + mv $dstfile $dstdir + ${CROSS_COMPILE}strip $srcfile ++ [ -n "$XATTR" ] && { echo "$XATTR" | setfattr --restore=-; } + done + return 0 + } +@@ -1978,9 +1980,9 @@ stripbin() { + scanelf --recursive --nobanner --etype "ET_DYN,ET_EXEC" . \ + | sed -e 's:^ET_DYN ::' -e 's:^ET_EXEC ::' \ + | while read filename; do +- XATTR=$(getfattr --match="" --dump "${filename}") ++ local XATTR=$(getfattr --match="" --dump "${filename}") + "${stripcmd}" "${filename}" +- [ -n "$XATTR" ] && (echo "$XATTR" | setfattr --restore=-) ++ [ -n "$XATTR" ] && { echo "$XATTR" | setfattr --restore=-; } + done + } + +-- +2.11.1 + diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 93884cc814..6e4c6671c3 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -2,7 +2,7 @@ pkgname=abuild pkgver=2.29.0 _ver=${pkgver%_git*} -pkgrel=5 +pkgrel=6 pkgdesc="Script to build Alpine Packages" url="http://git.alpinelinux.org/cgit/abuild/" arch="all" @@ -25,6 +25,7 @@ source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz 0001-abuild-properly-detect-package-size-on-filesystems.patch 0001-abuild-add-missing-triplet-definitions-for-ppc-and-p.patch 0001-abuild-use-only-sha512sum.patch + 0001-abuild-preserve-xattrs-when-creating-dbg.patch " _builddir="$srcdir/$pkgname-$_ver" @@ -67,9 +68,24 @@ gems() { mv "$pkgdir"/usr/bin/apkbuild-gem-resolver "$subpkgdir"/usr/bin/ } +md5sums="1a51f8786331ddf79bf46357fe938f6a abuild-2.29.0.tar.xz +5dc373cd5daf473a4ee060f9cedbc9c0 0001-abuild-properly-detect-failure-of-dependency-install.patch +fd7ac6bc2c104869b6c21d75570f4e01 0001-abuild-pass-arch-to-apk-whenever-sysroot-is-used.patch +5f8853c8afa27f49bc2cf1216c4b95c3 0001-abuild-properly-detect-package-size-on-filesystems.patch +47bced6bf9bc8bd3f9fc7e3f899b8cca 0001-abuild-add-missing-triplet-definitions-for-ppc-and-p.patch +d109b0225276b0726ed814ac4d1d494e 0001-abuild-use-only-sha512sum.patch +0127a8a8764d8a680aaf75c792172ca0 0001-abuild-preserve-xattrs-when-creating-dbg.patch" +sha256sums="06ba81d4b42e7d1ebb0761b0b0e1cbaf999acac54ab075906cecdf8f825950c1 abuild-2.29.0.tar.xz +e79ba4cdcdea3fa18d8441b8144c2db8c497523ee56927b466a701736ee9b906 0001-abuild-properly-detect-failure-of-dependency-install.patch +24f0ceb383a8651f3df192773d62c7258d2ce9b3220fcedfe9a2c173d522111a 0001-abuild-pass-arch-to-apk-whenever-sysroot-is-used.patch +3d4a2534548b25b9f0497c1a3536ae7585a0595547f4844e69a362751baa754e 0001-abuild-properly-detect-package-size-on-filesystems.patch +d897d365fdf9ab7bb911ff37af4d1287e7891ca7b49ad5a1196c076cd5bd5322 0001-abuild-add-missing-triplet-definitions-for-ppc-and-p.patch +f14477ad0b2ba2d0b425130abff7363edaae74a928fb96b8aeb9ef5517cb3eb2 0001-abuild-use-only-sha512sum.patch +581ae5e89c50183a4e891184777b46967446955d2e031dfeea367c231f261392 0001-abuild-preserve-xattrs-when-creating-dbg.patch" sha512sums="349c0d5efaff05dc6f680a93e59a997857991520ae892426252d198aa4ef0b2854f1675ce3b1bc1bea810d5f97fae0985474ea13df3905d590b320373723990c abuild-2.29.0.tar.xz 1bc4bb62ee881051f41f5f68d25f8794208407f552a30bd7aad235c0bd57ebadc2a12dc21a4c1826eff3e320a5f9e7c40f89fd964144ff2f0d49f747708a61b4 0001-abuild-properly-detect-failure-of-dependency-install.patch 655476f5d263701d59f85ff8c28c342d8d0710bb6c869ca7e0cb8df9f70ca2cd5af44c460b578f6ebcf320774575ce193be15830b942a956a04c0345bf27bd4e 0001-abuild-pass-arch-to-apk-whenever-sysroot-is-used.patch fb7d65b1c65368dfddf7e3b55774a699169eb1de63e1aa619d5a210773e912e66c6a573d7fb98d579e30f416968592592d7a912fb6efce8805ac0f149c500776 0001-abuild-properly-detect-package-size-on-filesystems.patch 6f4212c796829578f318b257adcfdf493a1520cd45c623c110a3181fd076bbcb94f84b04f9292bd081a923e5819448673e5adc1a3e8450e086784c00c3515459 0001-abuild-add-missing-triplet-definitions-for-ppc-and-p.patch -99a260d2c1ebc625fece8fc0a6d31357c1695825da6357b67c138cf2d738507640a3b1873cf3a4ba1ed502a7d6f29fe7a9898ebc3005faf27353c989b3c340c1 0001-abuild-use-only-sha512sum.patch" +99a260d2c1ebc625fece8fc0a6d31357c1695825da6357b67c138cf2d738507640a3b1873cf3a4ba1ed502a7d6f29fe7a9898ebc3005faf27353c989b3c340c1 0001-abuild-use-only-sha512sum.patch +37f9de0e6f160f3ccbee56a973e08fcf9b4c27318023eacb47bf5ff1ee0d7f3710bef368d998a65bff0420fb73e6e05963b05af95e4beacf6a39cfe1bee95ec1 0001-abuild-preserve-xattrs-when-creating-dbg.patch" |