diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2014-05-06 22:47:37 +0200 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2014-05-07 05:27:23 +0200 |
| commit | 6bfcd3689af7579731e62b13c9e03a4db713f55e (patch) | |
| tree | d10720ecc1fdafce0664f6d8df454de505a7fc3c | |
| parent | 604d5f14167efb96361412390cffd6963181cbb7 (diff) | |
| download | vyos-live-build-6bfcd3689af7579731e62b13c9e03a4db713f55e.tar.gz vyos-live-build-6bfcd3689af7579731e62b13c9e03a4db713f55e.zip | |
Adding wheezy legacy handling for syslinux.
| -rwxr-xr-x | scripts/build/binary_syslinux | 56 |
1 files changed, 49 insertions, 7 deletions
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux index 9d32e222f..4cb18b00d 100755 --- a/scripts/build/binary_syslinux +++ b/scripts/build/binary_syslinux @@ -123,7 +123,24 @@ fi # Checking depends case "${LB_BUILD_WITH_CHROOT}" in true) - Check_package chroot/usr/bin/${_BOOTLOADER} ${_BOOTLOADER} + case "${LB_PARENT_DISTRIBUTION}" in + wheezy|jessie|sid) + case "${_BOOTLOADER}" in + syslinux|extlinux) + Check_package chroot/usr/bin/${_BOOTLOADER} ${_BOOTLOADER} + ;; + + *) + Check_package chroot/usr/lib/syslinux syslinux-common + ;; + esac + ;; + + *) + Check_package chroot/share/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z]) ${_BOOTLOADER} + ;; + esac + Check_package chroot/usr/lib/syslinux syslinux-common if ls "${_SOURCE}"/*.svg* > /dev/null 2>&1 @@ -133,12 +150,37 @@ case "${LB_BUILD_WITH_CHROOT}" in ;; false) - if [ ! -e /usr/bin/${_BOOTLOADER} ] - then - # syslinux or extlinux - Echo_error "/usr/bin/${_BOOTLOADER} - no such file." - exit 1 - fi + case "${LB_PARENT_DISTRIBUTION}" in + wheezy|jessie|sid) + case "${_BOOTLOADER}" in + syslinux|extlinux) + if [ ! -e /usr/bin/${_BOOTLOADER} ] + then + # syslinux or extlinux + Echo_error "/usr/bin/${_BOOTLOADER} - no such file." + exit 1 + fi + ;; + + *) + if ! ls /usr/lib/syslinux/${_BOOTLOADER}* > /dev/null 2>&1 + then + Echo_error "/usr/lib/syslinux/${_BOOTLOADER}* - no such files." + exit 1 + fi + ;; + esac + ;; + + *) + if [ ! -e "/usr/share/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z])" ] + then + Echo_error "/usr/share/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z])" + exit 1 + fi + ;; + esac + if [ ! -e /usr/lib/syslinux ] then |