forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Get rid of the _pmb_build_in_native_chroot hack

Browse source
This commit is contained in:
Oliver Smith 2017-07-05 18:40:00 +02:00
parent 1220ed9fbe
commit 7b7af3cd2d
2 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
linux-samsung-i9070/APKBUILD
View file

@ -13,10 +13,6 @@
# Kernel config changes, based on: arch/arm/configs/janice_defconfig # Kernel config changes, based on: arch/arm/configs/janice_defconfig
# - enable devtmpfs (needed for udev -> touch support in weston) # - 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 _vendor=samsung
_flavor=samsung-i9070 _flavor=samsung-i9070
_hash="ac7219c4b8dcec7bc5a598d42c6be0db4aa36332" _hash="ac7219c4b8dcec7bc5a598d42c6be0db4aa36332"
@ -28,13 +24,13 @@ case $pkgver in
*.*.*) _kernver=${pkgver%.*};; *.*.*) _kernver=${pkgver%.*};;
*.*) _kernver=$pkgver;; *.*) _kernver=$pkgver;;
esac esac
pkgrel=1 pkgrel=2
arch="armhf" arch="armhf"
pkgdesc="Samsung Galaxy S Advance kernel from Epirex" pkgdesc="Samsung Galaxy S Advance kernel from Epirex"
url="https://github.com/Epirex/Samsung_STE_Kernel" url="https://github.com/Epirex/Samsung_STE_Kernel"
depends="postmarketos-mkinitfs" depends="postmarketos-mkinitfs"
makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev
findutils busybox-static" findutils busybox-static-armhf"
options="!strip !check !tracedeps" options="!strip !check !tracedeps"
install= install=
source=" source="
@ -79,7 +75,8 @@ prepare() {
# Use Alpine's busybox.static instead of the pre-compiled busybox shipped # Use Alpine's busybox.static instead of the pre-compiled busybox shipped
# with the source # 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 # do not use ramdisk.cpio and ramdisk-recovery.cpio, always use
# the initramfs from the kernel2 partition ("isorec"), so we can build # the initramfs from the kernel2 partition ("isorec"), so we can build

11
linux-samsung-i9100/APKBUILD
View file

@ -13,10 +13,6 @@
# - change compression from CONFIG_KERNEL_LZMA=y to # - change compression from CONFIG_KERNEL_LZMA=y to
# CONFIG_KERNEL_GZIP=y (so it works with busybox) # 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 _vendor=samsung
_flavor=samsung-i9100 _flavor=samsung-i9100
_hash="349a3e91e76d17e67ef6213e1f6712e700695631" _hash="349a3e91e76d17e67ef6213e1f6712e700695631"
@ -28,13 +24,13 @@ case $pkgver in
*.*.*) _kernver=${pkgver%.*};; *.*.*) _kernver=${pkgver%.*};;
*.*) _kernver=$pkgver;; *.*) _kernver=$pkgver;;
esac esac
pkgrel=5 pkgrel=6
arch="armhf" arch="armhf"
pkgdesc="Samsung Galaxy SII kernel from LineageOS" pkgdesc="Samsung Galaxy SII kernel from LineageOS"
url="https://github.com/LineageOS/android_kernel_samsung_smdk4412" url="https://github.com/LineageOS/android_kernel_samsung_smdk4412"
depends="postmarketos-mkinitfs" depends="postmarketos-mkinitfs"
makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev
findutils busybox-static" findutils busybox-static-armhf"
options="!strip !check !tracedeps" options="!strip !check !tracedeps"
install= install=
source=" source="
@ -78,7 +74,8 @@ prepare() {
# Use Alpine's busybox.static instead of the pre-compiled busybox shipped # Use Alpine's busybox.static instead of the pre-compiled busybox shipped
# with the source # 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 # do not use ramdisk.cpio and ramdisk-recovery-device.cpio, always use
# the initramfs from the recovery partition ("isorec"), so we can build # the initramfs from the recovery partition ("isorec"), so we can build