From f1121b5e0745549037dbdc2ad9a23c7ecb32a9c2 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Sun, 10 Mar 2019 01:45:22 +0100 Subject: [PATCH] cross/musl-*: regenerate pmaports (!270) Regenerated with: $ pmbootstrap aportgen musl-armhf musl-aarch64 musl-aarch64 This new version fixes the build for gitlab-ci and builds.sr.ht: https://gitlab.com/postmarketOS/pmaports/issues/26 --- cross/musl-aarch64/APKBUILD | 8 ++++++-- cross/musl-armhf/APKBUILD | 8 ++++++-- cross/musl-armv7/APKBUILD | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/cross/musl-aarch64/APKBUILD b/cross/musl-aarch64/APKBUILD index 2a6c74d94..ac61c6c6e 100644 --- a/cross/musl-aarch64/APKBUILD +++ b/cross/musl-aarch64/APKBUILD @@ -25,13 +25,17 @@ source=" package() { mkdir -p "$pkgdir/usr/$_target" cd "$pkgdir/usr/$_target" - tar -xf $srcdir/musl-$pkgver-r$pkgrel-$_arch.apk + # Use 'busybox tar' to avoid 'tar: Child returned status 141' + # on some machines (builds.sr.ht, gitlab-ci). See pmaports#26. + busybox tar -xf $srcdir/musl-$pkgver-r$pkgrel-$_arch.apk rm .PKGINFO .SIGN.* } package_dev() { mkdir -p "$subpkgdir/usr/$_target" cd "$subpkgdir/usr/$_target" - tar -xf $srcdir/musl-dev-$pkgver-r$pkgrel-$_arch.apk + # Use 'busybox tar' to avoid 'tar: Child returned status 141' + # on some machines (builds.sr.ht, gitlab-ci). See pmaports#26. + busybox tar -xf $srcdir/musl-dev-$pkgver-r$pkgrel-$_arch.apk rm .PKGINFO .SIGN.* # symlink everything from /usr/$_target/usr/* to /usr/$_target/* diff --git a/cross/musl-armhf/APKBUILD b/cross/musl-armhf/APKBUILD index 2d99d6a48..b4807276d 100644 --- a/cross/musl-armhf/APKBUILD +++ b/cross/musl-armhf/APKBUILD @@ -25,13 +25,17 @@ source=" package() { mkdir -p "$pkgdir/usr/$_target" cd "$pkgdir/usr/$_target" - tar -xf $srcdir/musl-$pkgver-r$pkgrel-$_arch.apk + # Use 'busybox tar' to avoid 'tar: Child returned status 141' + # on some machines (builds.sr.ht, gitlab-ci). See pmaports#26. + busybox tar -xf $srcdir/musl-$pkgver-r$pkgrel-$_arch.apk rm .PKGINFO .SIGN.* } package_dev() { mkdir -p "$subpkgdir/usr/$_target" cd "$subpkgdir/usr/$_target" - tar -xf $srcdir/musl-dev-$pkgver-r$pkgrel-$_arch.apk + # Use 'busybox tar' to avoid 'tar: Child returned status 141' + # on some machines (builds.sr.ht, gitlab-ci). See pmaports#26. + busybox tar -xf $srcdir/musl-dev-$pkgver-r$pkgrel-$_arch.apk rm .PKGINFO .SIGN.* # symlink everything from /usr/$_target/usr/* to /usr/$_target/* diff --git a/cross/musl-armv7/APKBUILD b/cross/musl-armv7/APKBUILD index 07883a8a2..210ab5785 100644 --- a/cross/musl-armv7/APKBUILD +++ b/cross/musl-armv7/APKBUILD @@ -25,13 +25,17 @@ source=" package() { mkdir -p "$pkgdir/usr/$_target" cd "$pkgdir/usr/$_target" - tar -xf $srcdir/musl-$pkgver-r$pkgrel-$_arch.apk + # Use 'busybox tar' to avoid 'tar: Child returned status 141' + # on some machines (builds.sr.ht, gitlab-ci). See pmaports#26. + busybox tar -xf $srcdir/musl-$pkgver-r$pkgrel-$_arch.apk rm .PKGINFO .SIGN.* } package_dev() { mkdir -p "$subpkgdir/usr/$_target" cd "$subpkgdir/usr/$_target" - tar -xf $srcdir/musl-dev-$pkgver-r$pkgrel-$_arch.apk + # Use 'busybox tar' to avoid 'tar: Child returned status 141' + # on some machines (builds.sr.ht, gitlab-ci). See pmaports#26. + busybox tar -xf $srcdir/musl-dev-$pkgver-r$pkgrel-$_arch.apk rm .PKGINFO .SIGN.* # symlink everything from /usr/$_target/usr/* to /usr/$_target/*