Unconditionally replacing bootloader symlinks with syslinux 6 from jessie, this will break building wheezy images (so we have to come up with something better than that prior upload).

2014-07-22 20:26:06 +02:00 · 2014-07-22 20:26:06 +02:00 · dd47358700
parent 1606ed3c5a
commit dd47358700
23 changed files with 23 additions and 22 deletions
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@ -138,6 +138,7 @@ case "${LB_BUILD_WITH_CHROOT}" in

 			*)
 				Check_package chroot/share/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z]) ${_BOOTLOADER}
+				Check_package chroot/usr/lib/syslinux syslinux-common
 				;;
 		esac

--- a/share/bootloaders/extlinux/hdt.c32
+++ b/share/bootloaders/extlinux/hdt.c32
@ -1 +1 @@
-/usr/lib/syslinux/hdt.c32
+/usr/lib/syslinux/modules/bios/hdt.c32
--- a/share/bootloaders/extlinux/ldlinux.c32
+++ b/share/bootloaders/extlinux/ldlinux.c32
@ -1 +1 @@
-/usr/lib/syslinux/ldlinux.c32
+/usr/lib/syslinux/modules/bios/ldlinux.c32
--- a/share/bootloaders/extlinux/libcom32.c32
+++ b/share/bootloaders/extlinux/libcom32.c32
@ -1 +1 @@
-/usr/lib/syslinux/libcom32.c32
+/usr/lib/syslinux/modules/bios/libcom32.c32
--- a/share/bootloaders/extlinux/libutil.c32
+++ b/share/bootloaders/extlinux/libutil.c32
@ -1 +1 @@
-/usr/lib/syslinux/libutil.c32
+/usr/lib/syslinux/modules/bios/libutil.c32
--- a/share/bootloaders/extlinux/vesamenu.c32
+++ b/share/bootloaders/extlinux/vesamenu.c32
@ -1 +1 @@
-/usr/lib/syslinux/vesamenu.c32
+/usr/lib/syslinux/modules/bios/vesamenu.c32
--- a/share/bootloaders/isolinux/hdt.c32
+++ b/share/bootloaders/isolinux/hdt.c32
@ -1 +1 @@
-/usr/lib/syslinux/hdt.c32
+/usr/lib/syslinux/modules/bios/hdt.c32
--- a/share/bootloaders/isolinux/isolinux.bin
+++ b/share/bootloaders/isolinux/isolinux.bin
@ -1 +1 @@
-/usr/lib/syslinux/isolinux.bin
+/usr/lib/ISOLINUX/isolinux.bin
--- a/share/bootloaders/isolinux/ldlinux.c32
+++ b/share/bootloaders/isolinux/ldlinux.c32
@ -1 +1 @@
-/usr/lib/syslinux/ldlinux.c32
+/usr/lib/syslinux/modules/bios/ldlinux.c32
--- a/share/bootloaders/isolinux/libcom32.c32
+++ b/share/bootloaders/isolinux/libcom32.c32
@ -1 +1 @@
-/usr/lib/syslinux/libcom32.c32
+/usr/lib/syslinux/modules/bios/libcom32.c32
--- a/share/bootloaders/isolinux/libutil.c32
+++ b/share/bootloaders/isolinux/libutil.c32
@ -1 +1 @@
-/usr/lib/syslinux/libutil.c32
+/usr/lib/syslinux/modules/bios/libutil.c32
--- a/share/bootloaders/isolinux/vesamenu.c32
+++ b/share/bootloaders/isolinux/vesamenu.c32
@ -1 +1 @@
-/usr/lib/syslinux/vesamenu.c32
+/usr/lib/syslinux/modules/bios/vesamenu.c32
--- a/share/bootloaders/pxelinux/hdt.c32
+++ b/share/bootloaders/pxelinux/hdt.c32
@ -1 +1 @@
-/usr/lib/syslinux/hdt.c32
+/usr/lib/syslinux/modules/bios/hdt.c32
--- a/share/bootloaders/pxelinux/ldlinux.c32
+++ b/share/bootloaders/pxelinux/ldlinux.c32
@ -1 +1 @@
-/usr/lib/syslinux/ldlinux.c32
+/usr/lib/syslinux/modules/bios/ldlinux.c32
--- a/share/bootloaders/pxelinux/libcom32.c32
+++ b/share/bootloaders/pxelinux/libcom32.c32
@ -1 +1 @@
-/usr/lib/syslinux/libcom32.c32
+/usr/lib/syslinux/modules/bios/libcom32.c32
--- a/share/bootloaders/pxelinux/libutil.c32
+++ b/share/bootloaders/pxelinux/libutil.c32
@ -1 +1 @@
-/usr/lib/syslinux/libutil.c32
+/usr/lib/syslinux/modules/bios/libutil.c32
--- a/share/bootloaders/pxelinux/pxelinux.0
+++ b/share/bootloaders/pxelinux/pxelinux.0
@ -1 +1 @@
-/usr/lib/syslinux/pxelinux.0
+/usr/lib/PXELINUX/pxelinux.0
--- a/share/bootloaders/pxelinux/vesamenu.c32
+++ b/share/bootloaders/pxelinux/vesamenu.c32
@ -1 +1 @@
-/usr/lib/syslinux/vesamenu.c32
+/usr/lib/syslinux/modules/bios/vesamenu.c32
--- a/share/bootloaders/syslinux/hdt.c32
+++ b/share/bootloaders/syslinux/hdt.c32
@ -1 +1 @@
-/usr/lib/syslinux/hdt.c32
+/usr/lib/syslinux/modules/bios/hdt.c32
--- a/share/bootloaders/syslinux/ldlinux.c32
+++ b/share/bootloaders/syslinux/ldlinux.c32
@ -1 +1 @@
-/usr/lib/syslinux/ldlinux.c32
+/usr/lib/syslinux/modules/bios/ldlinux.c32
--- a/share/bootloaders/syslinux/libcom32.c32
+++ b/share/bootloaders/syslinux/libcom32.c32
@ -1 +1 @@
-/usr/lib/syslinux/libcom32.c32
+/usr/lib/syslinux/modules/bios/libcom32.c32
--- a/share/bootloaders/syslinux/libutil.c32
+++ b/share/bootloaders/syslinux/libutil.c32
@ -1 +1 @@
-/usr/lib/syslinux/libutil.c32
+/usr/lib/syslinux/modules/bios/libutil.c32
--- a/share/bootloaders/syslinux/vesamenu.c32
+++ b/share/bootloaders/syslinux/vesamenu.c32
@ -1 +1 @@
-/usr/lib/syslinux/vesamenu.c32
+/usr/lib/syslinux/modules/bios/vesamenu.c32