From 1220ed9fbe2f5a58489b4946790af68619ba2c88 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 5 Jul 2017 18:24:47 +0200 Subject: [PATCH 1/2] Generate aports for busybox-static-armhf and -aarch64 ...and add generating both aports to the testsuite. --- busybox-static-aarch64/APKBUILD | 29 +++++++++++++++++++++++++++++ busybox-static-armhf/APKBUILD | 29 +++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 busybox-static-aarch64/APKBUILD create mode 100644 busybox-static-armhf/APKBUILD diff --git a/busybox-static-aarch64/APKBUILD b/busybox-static-aarch64/APKBUILD new file mode 100644 index 000000000..16f3aa5e3 --- /dev/null +++ b/busybox-static-aarch64/APKBUILD @@ -0,0 +1,29 @@ +# Automatically generated aport, do not edit! +# Generator: pmbootstrap aportgen busybox-static-aarch64 + +pkgname=busybox-static-aarch64 +pkgver=1.26.2 +pkgrel=8 + +_arch="aarch64" +_mirror="https://nl.alpinelinux.org/alpine/" + +url="http://busybox.net" +license="GPL2" +arch="all" +options="!check !strip" +pkgdesc="Statically linked Busybox for $_arch" +_target="$(arch_to_hostspec $_arch)" + +source=" + busybox-static-$pkgver-r$pkgrel-$_arch.apk::$_mirror/edge/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk +" + +package() { + mkdir -p "$pkgdir/usr/$_target" + cd "$pkgdir/usr/$_target" + tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch.apk + rm .PKGINFO .SIGN.* +} + +sha512sums="7daaafd1c8a8b6cca2dfc92bd57cb06e5e411027c2d6f7de8af735669b0c2e00c232331e9785f7e1a717fcc182b4e39f1906ee62b64579fa9a29cdff670b1549 busybox-static-1.26.2-r8-aarch64.apk" diff --git a/busybox-static-armhf/APKBUILD b/busybox-static-armhf/APKBUILD new file mode 100644 index 000000000..06f4f5110 --- /dev/null +++ b/busybox-static-armhf/APKBUILD @@ -0,0 +1,29 @@ +# Automatically generated aport, do not edit! +# Generator: pmbootstrap aportgen busybox-static-armhf + +pkgname=busybox-static-armhf +pkgver=1.26.2 +pkgrel=8 + +_arch="armhf" +_mirror="https://nl.alpinelinux.org/alpine/" + +url="http://busybox.net" +license="GPL2" +arch="all" +options="!check !strip" +pkgdesc="Statically linked Busybox for $_arch" +_target="$(arch_to_hostspec $_arch)" + +source=" + busybox-static-$pkgver-r$pkgrel-$_arch.apk::$_mirror/edge/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk +" + +package() { + mkdir -p "$pkgdir/usr/$_target" + cd "$pkgdir/usr/$_target" + tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch.apk + rm .PKGINFO .SIGN.* +} + +sha512sums="099c47767ed7f86f6a106afaa8b6e8dc33af4c7c7803d84a576f6640370bc52c995d1a65c5734337882e3452f2c79ebe0809b3120a7582f529f3d036f44c0b65 busybox-static-1.26.2-r8-armhf.apk" From 7b7af3cd2d2f8f5a9c38acb74936682111cc383f Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 5 Jul 2017 18:40:00 +0200 Subject: [PATCH 2/2] Get rid of the _pmb_build_in_native_chroot hack --- linux-samsung-i9070/APKBUILD | 11 ++++------- linux-samsung-i9100/APKBUILD | 11 ++++------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/linux-samsung-i9070/APKBUILD b/linux-samsung-i9070/APKBUILD index 9d655809d..21edff5e0 100644 --- a/linux-samsung-i9070/APKBUILD +++ b/linux-samsung-i9070/APKBUILD @@ -13,10 +13,6 @@ # Kernel config changes, based on: arch/arm/configs/janice_defconfig # - enable devtmpfs (needed for udev -> touch support in weston) -# This must be built in the target chroot, so busybox.static can -# be used. -_pmb_build_in_native_chroot="false" - _vendor=samsung _flavor=samsung-i9070 _hash="ac7219c4b8dcec7bc5a598d42c6be0db4aa36332" @@ -28,13 +24,13 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=1 +pkgrel=2 arch="armhf" pkgdesc="Samsung Galaxy S Advance kernel from Epirex" url="https://github.com/Epirex/Samsung_STE_Kernel" depends="postmarketos-mkinitfs" makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev -findutils busybox-static" +findutils busybox-static-armhf" options="!strip !check !tracedeps" install= source=" @@ -79,7 +75,8 @@ prepare() { # Use Alpine's busybox.static instead of the pre-compiled busybox shipped # with the source - cp -v /bin/busybox.static "$ksrcdir"/usr/u8500_initramfs_files/busybox + cp -v /usr/$(arch_to_hostspec $arch)/bin/busybox.static \ + "$ksrcdir"/usr/u8500_initramfs_files/busybox # do not use ramdisk.cpio and ramdisk-recovery.cpio, always use # the initramfs from the kernel2 partition ("isorec"), so we can build diff --git a/linux-samsung-i9100/APKBUILD b/linux-samsung-i9100/APKBUILD index 5e3f02ff4..7de1bac1b 100644 --- a/linux-samsung-i9100/APKBUILD +++ b/linux-samsung-i9100/APKBUILD @@ -13,10 +13,6 @@ # - change compression from CONFIG_KERNEL_LZMA=y to # CONFIG_KERNEL_GZIP=y (so it works with busybox) -# This must be built in the target chroot, so busybox.static can -# be used. -_pmb_build_in_native_chroot="false" - _vendor=samsung _flavor=samsung-i9100 _hash="349a3e91e76d17e67ef6213e1f6712e700695631" @@ -28,13 +24,13 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=5 +pkgrel=6 arch="armhf" pkgdesc="Samsung Galaxy SII kernel from LineageOS" url="https://github.com/LineageOS/android_kernel_samsung_smdk4412" depends="postmarketos-mkinitfs" makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev -findutils busybox-static" +findutils busybox-static-armhf" options="!strip !check !tracedeps" install= source=" @@ -78,7 +74,8 @@ prepare() { # Use Alpine's busybox.static instead of the pre-compiled busybox shipped # with the source - cp -v /bin/busybox.static "$ksrcdir"/usr/galaxys2_initramfs_files/busybox + cp -v /usr/$(arch_to_hostspec $arch)/bin/busybox.static \ + "$ksrcdir"/usr/galaxys2_initramfs_files/busybox # do not use ramdisk.cpio and ramdisk-recovery-device.cpio, always use # the initramfs from the recovery partition ("isorec"), so we can build