synit
/
pmbootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Get rid of the _pmb_build_in_native_chroot hack

This commit is contained in:
Oliver Smith 2017-07-05 18:40:00 +02:00
parent a7beb4a1f7
commit dede11657d
No known key found for this signature in database
GPG Key ID: 5AE7F5513E0885CB
4 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
aports/linux-samsung-i9070/APKBUILD
View File

@ -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

11
aports/linux-samsung-i9100/APKBUILD
View File

@ -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

2
pmb/build/autodetect.py
View File

@ -47,7 +47,7 @@ def suffix(args, apkbuild, carch):
pkgname = apkbuild["pkgname"]
if pkgname.endswith("-repack"):
return "native"
if args.cross and apkbuild["_pmb_build_in_native_chroot"] != "false":
if args.cross:
for pattern in pmb.config.build_cross_native:
if fnmatch.fnmatch(pkgname, pattern):
return "native"

1
pmb/config/__init__.py
View File

@ -143,7 +143,6 @@ apkbuild_attributes = {
"_flavor": {"array": False},
"_device": {"array": False},
"_kernver": {"array": False},
"_pmb_build_in_native_chroot": {"array": False},
# mesa
"_llvmver": {"array": False},