diff options
| author | Jose V Beneyto <sepen@crux.nu> | 2010-07-16 21:41:35 +0200 |
|---|---|---|
| committer | Bartlomiej Palmowski <rotwang@crux.org.pl> | 2010-09-13 18:41:36 +0200 |
| commit | 7ff5b69ca4b852282d4116dded4e81f269209aab (patch) | |
| tree | 079df1f9fec8e2f8805bf90b5b35b63e4dee038f | |
| parent | c158eaebae733a713f433b998c7e9cc1b7a1702b (diff) | |
| download | contrib-7ff5b69ca4b852282d4116dded4e81f269209aab.tar.gz contrib-7ff5b69ca4b852282d4116dded4e81f269209aab.tar.xz | |
syslinux: some fixes (thanks to cippp)
| -rw-r--r-- | syslinux/.md5sum | 1 | ||||
| -rw-r--r-- | syslinux/Pkgfile | 13 | ||||
| -rw-r--r-- | syslinux/dos_out.patch | 37 |
3 files changed, 47 insertions, 4 deletions
diff --git a/syslinux/.md5sum b/syslinux/.md5sum index f845c2c38..ad09b19d7 100644 --- a/syslinux/.md5sum +++ b/syslinux/.md5sum @@ -1 +1,2 @@ +31d7443aba31984a52806b0e9d859e0f dos_out.patch fbc5b153928d0489e429c7ab4384b0d9 syslinux-4.01.tar.bz2 diff --git a/syslinux/Pkgfile b/syslinux/Pkgfile index c79f89d3d..8d32915c1 100644 --- a/syslinux/Pkgfile +++ b/syslinux/Pkgfile @@ -6,15 +6,20 @@ name=syslinux version=4.01 -release=1 -source=(http://www.kernel.org/pub/linux/utils/boot/$name/$name-$version.tar.bz2) +release=2 +source=(http://www.kernel.org/pub/linux/utils/boot/$name/$name-$version.tar.bz2 \ + dos_out.patch) build() { cd $name-$version - cp win32/syslinux.exe . + patch -Np1 -i $SRC/dos_out.patch + make OPTFLAGS="$CFLAGS" - mv syslinux.exe win32 make INSTALLROOT=$PKG install + mv $PKG/sbin/* $PKG/usr/bin rm -r $PKG/sbin + install -d $PKG/usr/share/syslinux/dosutil + cp dosutil/{copybs.com,eltorito.sys,mdiskchk.com} $PKG/usr/share/syslinux/dosutil + install -m 0644 dos/syslinux.com win32/syslinux.exe $PKG/usr/share/syslinux } diff --git a/syslinux/dos_out.patch b/syslinux/dos_out.patch new file mode 100644 index 000000000..c20ef600b --- /dev/null +++ b/syslinux/dos_out.patch @@ -0,0 +1,37 @@ +--- syslinux-4.01/Makefile 2010-07-02 18:19:39.000000000 +0000 ++++ syslinux-4.01/Makefile.new 2010-07-16 19:02:01.987047109 +0000 +@@ -43,9 +43,7 @@ + mbr/mbr_c.bin mbr/altmbr_c.bin mbr/gptmbr_c.bin \ + mbr/mbr_f.bin mbr/altmbr_f.bin mbr/gptmbr_f.bin \ + core/pxelinux.0 core/isolinux.bin core/isolinux-debug.bin \ +- gpxe/gpxelinux.0 dos/syslinux.com win32/syslinux.exe \ +- dosutil/*.com dosutil/*.sys \ +- $(MODULES) ++ gpxe/gpxelinux.0 $(MODULES) + + # BSUBDIRs build the on-target binary components. + # ISUBDIRs build the installer (host) components. +@@ -54,7 +52,7 @@ + # files that depend only on the B phase, but may have to be regenerated + # for "make installer". + BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \ +- libinstaller dos win32 dosutil ++ libinstaller + ITARGET = + IOBJECTS = $(ITARGET) \ + utils/gethostip utils/isohybrid utils/mkdiskimage \ +@@ -68,12 +66,11 @@ + # Things to install in /usr/lib/syslinux + INSTALL_AUX = core/pxelinux.0 gpxe/gpxelinux.0 core/isolinux.bin \ + core/isolinux-debug.bin \ +- dos/syslinux.com win32/syslinux.exe \ + mbr/*.bin $(MODULES) +-INSTALL_AUX_OPT = win32/syslinux.exe ++INSTALL_AUX_OPT = + + # These directories manage their own installables +-INSTALLSUBDIRS = com32 utils dosutil ++INSTALLSUBDIRS = com32 utils + + # Things to install in /boot/extlinux + EXTBOOTINSTALL = $(MODULES) |