devuan-sdk
/
libdevuansdk
mirror of https://github.com/parazyd/libdevuansdk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

syslinux is now imported, so no need for different paths

This commit is contained in:
parazyd 2017-10-26 21:29:40 +02:00
parent 226008739b
commit f7c38c1457
No known key found for this signature in database
GPG Key ID: F0CB28FCF78637DE
1 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
zlibs/iso
View File

@ -52,25 +52,9 @@ iso_setup_isolinux() {
sudo cp $strapdir/boot/initrd* binary/live/initrd sudo cp $strapdir/boot/initrd* binary/live/initrd
#sudo cp $strapdir/boot/memtest86+.bin binary/live/memtest #sudo cp $strapdir/boot/memtest86+.bin binary/live/memtest
eval $(cat /etc/os-release) sudo cp "$R"/extra/syslinux/isolinux.bin binary/isolinux || zerr
case "$ID" in sudo cp "$R"/extra/syslinux/*.c32 binary/isolinux || zerr
devuan)
sudo cp \
/usr/share/live/build/bootloaders/isolinux/isolinux.bin \
binary/isolinux || zerr
sudo cp /usr/share/live/build/bootloaders/isolinux/*.c32 \
binary/isolinux || zerr
;;
gentoo)
sudo cp \
/usr/share/syslinux/isolinux.bin binary/isolinux || zerr
sudo cp \
/usr/share/syslinux/*.c32 binary/isolinux || zerr
;;
*)
warn "no isolinux has been copied. take care of it yourself"
;;
esac
popd popd
} }
@ -123,15 +107,7 @@ iso_xorriso_build() {
uefi_opt="-eltorito-alt-boot -e boot/grub/efiboot.img -isohybrid-gpt-basdat -no-emul-boot" uefi_opt="-eltorito-alt-boot -e boot/grub/efiboot.img -isohybrid-gpt-basdat -no-emul-boot"
} }
eval $(cat /etc/os-release) isohybrid="$R"/extra/syslinux/isohdpfx.bin
case "$ID" in
devuan)
isohybrid=/usr/lib/ISOLINUX/isohdpfx.bin
;;
gentoo)
isohybrid=/usr/share/syslinux/isohdpfx.bin
;;
esac
mkdir -p $R/dist mkdir -p $R/dist
pushd $workdir pushd $workdir