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).

23 files changed, 23 insertions, 22 deletions

diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index 1de51d279..f928de405 100755
--- 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
 
diff --git a/share/bootloaders/extlinux/hdt.c32 b/share/bootloaders/extlinux/hdt.c32
index e50929575..f84c641c7 120000
--- a/share/bootloaders/extlinux/hdt.c32
+++ b/share/bootloaders/extlinux/hdt.c32
@@ -1 +1 @@
-/usr/lib/syslinux/hdt.c32
\ No newline at end of file
+/usr/lib/syslinux/modules/bios/hdt.c32
\ No newline at end of file
diff --git a/share/bootloaders/extlinux/ldlinux.c32 b/share/bootloaders/extlinux/ldlinux.c32
index c937af6a5..df554c7e5 120000
--- a/share/bootloaders/extlinux/ldlinux.c32
+++ b/share/bootloaders/extlinux/ldlinux.c32
@@ -1 +1 @@
-/usr/lib/syslinux/ldlinux.c32
\ No newline at end of file
+/usr/lib/syslinux/modules/bios/ldlinux.c32
\ No newline at end of file
diff --git a/share/bootloaders/extlinux/libcom32.c32 b/share/bootloaders/extlinux/libcom32.c32
index bca5e3c27..44ab36b56 120000
--- a/share/bootloaders/extlinux/libcom32.c32
+++ b/share/bootloaders/extlinux/libcom32.c32
@@ -1 +1 @@
-/usr/lib/syslinux/libcom32.c32
\ No newline at end of file
+/usr/lib/syslinux/modules/bios/libcom32.c32
\ No newline at end of file
diff --git a/share/bootloaders/extlinux/libutil.c32 b/share/bootloaders/extlinux/libutil.c32
index 351e12b3c..478194e85 120000
--- a/share/bootloaders/extlinux/libutil.c32
+++ b/share/bootloaders/extlinux/libutil.c32
@@ -1 +1 @@
-/usr/lib/syslinux/libutil.c32
\ No newline at end of file
+/usr/lib/syslinux/modules/bios/libutil.c32
\ No newline at end of file
diff --git a/share/bootloaders/extlinux/vesamenu.c32 b/share/bootloaders/extlinux/vesamenu.c32
index d06c44475..84e2eff1e 120000
--- a/share/bootloaders/extlinux/vesamenu.c32
+++ b/share/bootloaders/extlinux/vesamenu.c32
@@ -1 +1 @@
-/usr/lib/syslinux/vesamenu.c32
\ No newline at end of file
+/usr/lib/syslinux/modules/bios/vesamenu.c32
\ No newline at end of file
diff --git a/share/bootloaders/isolinux/hdt.c32 b/share/bootloaders/isolinux/hdt.c32
index e50929575..f84c641c7 120000
--- a/share/bootloaders/isolinux/hdt.c32
+++ b/share/bootloaders/isolinux/hdt.c32
@@ -1 +1 @@
-/usr/lib/syslinux/hdt.c32
\ No newline at end of file
+/usr/lib/syslinux/modules/bios/hdt.c32
\ No newline at end of file
diff --git a/share/bootloaders/isolinux/isolinux.bin b/share/bootloaders/isolinux/isolinux.bin
index 0e3eb53e4..33a2ad6f2 120000
--- a/share/bootloaders/isolinux/isolinux.bin
+++ b/share/bootloaders/isolinux/isolinux.bin
@@ -1 +1 @@
-/usr/lib/syslinux/isolinux.bin
\ No newline at end of file
+/usr/lib/ISOLINUX/isolinux.bin
\ No newline at end of file
diff --git a/share/bootloaders/isolinux/ldlinux.c32 b/share/bootloaders/isolinux/ldlinux.c32
index c937af6a5..df554c7e5 120000
--- a/share/bootloaders/isolinux/ldlinux.c32
+++ b/share/bootloaders/isolinux/ldlinux.c32
@@ -1 +1 @@
-/usr/lib/syslinux/ldlinux.c32
\ No newline at end of file
+/usr/lib/syslinux/modules/bios/ldlinux.c32
\ No newline at end of file
diff --git a/share/bootloaders/isolinux/libcom32.c32 b/share/bootloaders/isolinux/libcom32.c32
index bca5e3c27..44ab36b56 120000
--- a/share/bootloaders/isolinux/libcom32.c32
+++ b/share/bootloaders/isolinux/libcom32.c32
@@ -1 +1 @@
-/usr/lib/syslinux/libcom32.c32
\ No newline at end of file
+/usr/lib/syslinux/modules/bios/libcom32.c32
\ No newline at end of file
diff --git a/share/bootloaders/isolinux/libutil.c32 b/share/bootloaders/isolinux/libutil.c32
index 351e12b3c..478194e85 120000
--- a/share/bootloaders/isolinux/libutil.c32
+++ b/share/bootloaders/isolinux/libutil.c32
@@ -1 +1 @@
-/usr/lib/syslinux/libutil.c32
\ No newline at end of file
+/usr/lib/syslinux/modules/bios/libutil.c32
\ No newline at end of file
diff --git a/share/bootloaders/isolinux/vesamenu.c32 b/share/bootloaders/isolinux/vesamenu.c32
index d06c44475..84e2eff1e 120000
--- a/share/bootloaders/isolinux/vesamenu.c32
+++ b/share/bootloaders/isolinux/vesamenu.c32
@@ -1 +1 @@
-/usr/lib/syslinux/vesamenu.c32
\ No newline at end of file
+/usr/lib/syslinux/modules/bios/vesamenu.c32
\ No newline at end of file
diff --git a/share/bootloaders/pxelinux/hdt.c32 b/share/bootloaders/pxelinux/hdt.c32
index e50929575..f84c641c7 120000
--- a/share/bootloaders/pxelinux/hdt.c32
+++ b/share/bootloaders/pxelinux/hdt.c32
@@ -1 +1 @@
-/usr/lib/syslinux/hdt.c32
\ No newline at end of file
+/usr/lib/syslinux/modules/bios/hdt.c32
\ No newline at end of file
diff --git a/share/bootloaders/pxelinux/ldlinux.c32 b/share/bootloaders/pxelinux/ldlinux.c32
index c937af6a5..df554c7e5 120000
--- a/share/bootloaders/pxelinux/ldlinux.c32
+++ b/share/bootloaders/pxelinux/ldlinux.c32
@@ -1 +1 @@
-/usr/lib/syslinux/ldlinux.c32
\ No newline at end of file
+/usr/lib/syslinux/modules/bios/ldlinux.c32
\ No newline at end of file
diff --git a/share/bootloaders/pxelinux/libcom32.c32 b/share/bootloaders/pxelinux/libcom32.c32
index bca5e3c27..44ab36b56 120000
--- a/share/bootloaders/pxelinux/libcom32.c32
+++ b/share/bootloaders/pxelinux/libcom32.c32
@@ -1 +1 @@
-/usr/lib/syslinux/libcom32.c32
\ No newline at end of file
+/usr/lib/syslinux/modules/bios/libcom32.c32
\ No newline at end of file
diff --git a/share/bootloaders/pxelinux/libutil.c32 b/share/bootloaders/pxelinux/libutil.c32
index 351e12b3c..478194e85 120000
--- a/share/bootloaders/pxelinux/libutil.c32
+++ b/share/bootloaders/pxelinux/libutil.c32
@@ -1 +1 @@
-/usr/lib/syslinux/libutil.c32
\ No newline at end of file
+/usr/lib/syslinux/modules/bios/libutil.c32
\ No newline at end of file
diff --git a/share/bootloaders/pxelinux/pxelinux.0 b/share/bootloaders/pxelinux/pxelinux.0
index 0f93aef01..f723d02d9 120000
--- a/share/bootloaders/pxelinux/pxelinux.0
+++ b/share/bootloaders/pxelinux/pxelinux.0
@@ -1 +1 @@
-/usr/lib/syslinux/pxelinux.0
\ No newline at end of file
+/usr/lib/PXELINUX/pxelinux.0
\ No newline at end of file
diff --git a/share/bootloaders/pxelinux/vesamenu.c32 b/share/bootloaders/pxelinux/vesamenu.c32
index d06c44475..84e2eff1e 120000
--- a/share/bootloaders/pxelinux/vesamenu.c32
+++ b/share/bootloaders/pxelinux/vesamenu.c32
@@ -1 +1 @@
-/usr/lib/syslinux/vesamenu.c32
\ No newline at end of file
+/usr/lib/syslinux/modules/bios/vesamenu.c32
\ No newline at end of file
diff --git a/share/bootloaders/syslinux/hdt.c32 b/share/bootloaders/syslinux/hdt.c32
index e50929575..f84c641c7 120000
--- a/share/bootloaders/syslinux/hdt.c32
+++ b/share/bootloaders/syslinux/hdt.c32
@@ -1 +1 @@
-/usr/lib/syslinux/hdt.c32
\ No newline at end of file
+/usr/lib/syslinux/modules/bios/hdt.c32
\ No newline at end of file
diff --git a/share/bootloaders/syslinux/ldlinux.c32 b/share/bootloaders/syslinux/ldlinux.c32
index c937af6a5..df554c7e5 120000
--- a/share/bootloaders/syslinux/ldlinux.c32
+++ b/share/bootloaders/syslinux/ldlinux.c32
@@ -1 +1 @@
-/usr/lib/syslinux/ldlinux.c32
\ No newline at end of file
+/usr/lib/syslinux/modules/bios/ldlinux.c32
\ No newline at end of file
diff --git a/share/bootloaders/syslinux/libcom32.c32 b/share/bootloaders/syslinux/libcom32.c32
index bca5e3c27..44ab36b56 120000
--- a/share/bootloaders/syslinux/libcom32.c32
+++ b/share/bootloaders/syslinux/libcom32.c32
@@ -1 +1 @@
-/usr/lib/syslinux/libcom32.c32
\ No newline at end of file
+/usr/lib/syslinux/modules/bios/libcom32.c32
\ No newline at end of file
diff --git a/share/bootloaders/syslinux/libutil.c32 b/share/bootloaders/syslinux/libutil.c32
index 351e12b3c..478194e85 120000
--- a/share/bootloaders/syslinux/libutil.c32
+++ b/share/bootloaders/syslinux/libutil.c32
@@ -1 +1 @@
-/usr/lib/syslinux/libutil.c32
\ No newline at end of file
+/usr/lib/syslinux/modules/bios/libutil.c32
\ No newline at end of file
diff --git a/share/bootloaders/syslinux/vesamenu.c32 b/share/bootloaders/syslinux/vesamenu.c32
index d06c44475..84e2eff1e 120000
--- a/share/bootloaders/syslinux/vesamenu.c32
+++ b/share/bootloaders/syslinux/vesamenu.c32
@@ -1 +1 @@
-/usr/lib/syslinux/vesamenu.c32
\ No newline at end of file
+/usr/lib/syslinux/modules/bios/vesamenu.c32
\ No newline at end of file