From b8b2168ba82d399fffe6d67dcef50971cca5d7dc Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Sun, 23 Nov 2008 12:52:40 +0000 Subject: [PATCH] Stefan Fiedler: update syslinux bootloader: use installed syslinux [2008102620144031143] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@9193 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/target-finish/bootloader/bootloader.desc | 2 -- package/target-finish/bootloader/x86/build.sh | 11 ++++++++--- package/x86/syslinux/syslinux.conf | 1 - package/x86/syslinux/syslinux.desc | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package/target-finish/bootloader/bootloader.desc b/package/target-finish/bootloader/bootloader.desc index 1de18d8eb..f86c2493f 100644 --- a/package/target-finish/bootloader/bootloader.desc +++ b/package/target-finish/bootloader/bootloader.desc @@ -36,8 +36,6 @@ [V] 1 [P] O --X-----8- 996.200 -[O] syslinux_ver=2.11 [O] mdlbl_ver=0.1a -[D] 2125465292 syslinux-2.11.tar.bz2 http://www.kernel.org/pub/linux/utils/boot/syslinux/ [D] 1570862055 mdlbl-0.1a.tar.bz2 http://www.rocklinux.net/people/clifford/MDLBL/ diff --git a/package/target-finish/bootloader/x86/build.sh b/package/target-finish/bootloader/x86/build.sh index 04f22f483..858fad59a 100644 --- a/package/target-finish/bootloader/x86/build.sh +++ b/package/target-finish/bootloader/x86/build.sh @@ -1,5 +1,9 @@ -use_isolinux=1 +if pkginstalled syslinux ; then + use_isolinux=1 +else + use_isolinux=0 +fi use_mdlbl=1 cd $disksdir @@ -33,12 +37,13 @@ chmod +x makeimages.sh if [ $use_isolinux -eq 1 ] then + syslinux_ver="$( grep " syslinux " $base/config/$config/packages | cut -f6 -d" " )" + echo "Creating isolinux setup:" # echo "Extracting isolinux boot loader." rm -rf isolinux ; mkdir -p isolinux - tar -O $taropt $base/download/mirror/s/syslinux-$syslinux_ver.tar.bz2 \ - syslinux-$syslinux_ver/isolinux.bin > isolinux/isolinux.bin + cp -a $root/usr/share/syslinux/isolinux.bin isolinux/isolinux.bin # echo "Creating isolinux config file." cp $confdir/x86/{isolinux.cfg,help?.txt} isolinux/ diff --git a/package/x86/syslinux/syslinux.conf b/package/x86/syslinux/syslinux.conf index 13d89ec6f..7350f98f5 100644 --- a/package/x86/syslinux/syslinux.conf +++ b/package/x86/syslinux/syslinux.conf @@ -23,6 +23,5 @@ # just run 'make install' makeopt="" -hook_add postmake 5 "cp -v *.doc $docdir/" var_remove GCC3_WRAPPER_INSERT " " "-fstack-protector" diff --git a/package/x86/syslinux/syslinux.desc b/package/x86/syslinux/syslinux.desc index 54eae12e3..4a9e404ea 100644 --- a/package/x86/syslinux/syslinux.desc +++ b/package/x86/syslinux/syslinux.desc @@ -37,8 +37,8 @@ [L] GPL [S] Stable -[V] 3.52 +[V] 3.72 [P] X -----5---9 155.200 -[D] 2213193550 syslinux-3.52.tar.bz2 http://www.kernel.org/pub/linux/utils/boot/syslinux/ +[D] 1667553364 syslinux-3.72.tar.bz2 http://www.kernel.org/pub/linux/utils/boot/syslinux/