diff --git a/sysa/linux-4.9.10/linux-4.9.10.sh b/sysa/linux-4.9.10/linux-4.9.10.sh index a893361..94bc925 100644 --- a/sysa/linux-4.9.10/linux-4.9.10.sh +++ b/sysa/linux-4.9.10/linux-4.9.10.sh @@ -3,6 +3,8 @@ # # SPDX-License-Identifier: GPL-3.0-or-later +# XXX: Fix package after builder-hex0 + src_unpack() { mkdir "${pkg}" mv "${DISTFILES}/deblob-4.9" "${pkg}/" @@ -48,7 +50,6 @@ src_compile() { generate_autoconf_h # Allow use of patched initramfs_list.sh (which is required anyway) - export PATH=$PWD/usr:$PATH make ARCH=i386 prepare make ARCH=i386 @@ -57,8 +58,7 @@ src_compile() { } src_install() { - mkdir -p "${PREFIX}/boot" - cp arch/i386/boot/bzImage "${PREFIX}/boot/linux-4.9.10" - cp usr/gen_init_cpio "${PREFIX}/bin" - cp scripts/gen_initramfs_list.sh "${PREFIX}/bin" + install -D -m 644 arch/i386/boot/bzImage "/boot/linux-4.9.10" + install -D -m 755 usr/gen_init_cpio "${PREFIX}/bin/gen_init_cpio" + install -D -m 755 scripts/gen_initramfs_list.sh "${PREFIX}/bin/gen_initramfs_list.sh" } diff --git a/sysa/run.sh b/sysa/run.sh index 8e3c1a1..a2be81f 100755 --- a/sysa/run.sh +++ b/sysa/run.sh @@ -27,7 +27,7 @@ create_sysb() { sys_transfer /sysb_image /sysb gzip patch cp -rl /sysc /sysb_image/sysc_src echo "Creating sysb initramfs" - gen_initramfs_list.sh -o "${PREFIX}/boot/initramfs-sysb.cpio.gz" /sysb_image + gen_initramfs_list.sh -o "/boot/initramfs-sysb.cpio.gz" /sysb_image rm -rf /sysb /sysb_image # Cleanup } @@ -37,8 +37,8 @@ go_sysb() { mount -t proc proc /proc # kexec time echo "Loading kernel + sysb initramfs using kexec" - kexec -l "${PREFIX}/boot/linux-4.9.10" --console-serial \ - --initrd="${PREFIX}/boot/initramfs-sysb.cpio.gz" \ + kexec -l "/boot/linux-4.9.10" --console-serial \ + --initrd="/boot/initramfs-sysb.cpio.gz" \ --append="init=/init console=ttyS0" echo "kexecing into sysb" kexec -e