diff options
| author | Jose V Beneyto <sepen@crux.nu> | 2010-08-12 10:16:34 +0000 |
|---|---|---|
| committer | Bartlomiej Palmowski <rotwang@crux.org.pl> | 2010-09-13 18:41:40 +0200 |
| commit | 1877f4dbb47430db0e3808416a687294c264a9e0 (patch) | |
| tree | 9fd72e915f2785edf635f2565c844cf96d88a705 | |
| parent | 01ed04d99cb302f9f57c740cd5309d116cee0ab3 (diff) | |
| download | contrib-1877f4dbb47430db0e3808416a687294c264a9e0.tar.gz contrib-1877f4dbb47430db0e3808416a687294c264a9e0.tar.xz | |
syslinux: fixed footprint, cleaned up and removed patch file
| -rw-r--r-- | syslinux/.footprint | 1 | ||||
| -rw-r--r-- | syslinux/.md5sum | 1 | ||||
| -rw-r--r-- | syslinux/Pkgfile | 21 | ||||
| -rw-r--r-- | syslinux/dos_out.patch | 37 |
4 files changed, 9 insertions, 51 deletions
diff --git a/syslinux/.footprint b/syslinux/.footprint index 4c9f8bdce..57a745695 100644 --- a/syslinux/.footprint +++ b/syslinux/.footprint @@ -212,6 +212,7 @@ drwxr-xr-x root/root usr/share/syslinux/dosutil/ -rw-r--r-- root/root usr/share/syslinux/sysdump.c32 -rw-r--r-- root/root usr/share/syslinux/syslinux.com -rw-r--r-- root/root usr/share/syslinux/syslinux.exe +-rw-r--r-- root/root usr/share/syslinux/syslinux64.exe -rw-r--r-- root/root usr/share/syslinux/vesainfo.c32 -rw-r--r-- root/root usr/share/syslinux/vesamenu.c32 -rw-r--r-- root/root usr/share/syslinux/vpdtest.c32 diff --git a/syslinux/.md5sum b/syslinux/.md5sum index 90ffd49bf..8d582ee9c 100644 --- a/syslinux/.md5sum +++ b/syslinux/.md5sum @@ -1,2 +1 @@ -8f4b5571157f0025c6c5ed0986268a87 dos_out.patch 52912c03f5c275d6c0ac09180ebab81f syslinux-4.02.tar.bz2 diff --git a/syslinux/Pkgfile b/syslinux/Pkgfile index a6947c274..caf1afe27 100644 --- a/syslinux/Pkgfile +++ b/syslinux/Pkgfile @@ -6,25 +6,20 @@ name=syslinux version=4.02 -release=1 -source=(http://www.kernel.org/pub/linux/utils/boot/$name/$name-$version.tar.bz2 \ - dos_out.patch) +release=2 +source=(http://www.kernel.org/pub/linux/utils/boot/$name/$name-$version.tar.bz2) build() { cd $name-$version - # do not build win/dos installers - patch -Np1 -i $SRC/dos_out.patch - # compilation will fail with LDFLAGS unset LDFLAGS - make OPTFLAGS="$CFLAGS" - make INSTALLROOT=$PKG install + # fix to install extlinux in /usr/bin + sed -i Makefile -e 's|SBINDIR|BINDIR|g' + + make clean + make OPTFLAGS="$CFLAGS" installer + make OPTFLAGS="$CFLAGS" 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 deleted file mode 100644 index e74301b5b..000000000 --- a/syslinux/dos_out.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -purN syslinux-4.02.orig/Makefile syslinux-4.02/Makefile ---- syslinux-4.02.orig/Makefile 2010-08-03 17:31:39.000000000 +0200 -+++ syslinux-4.02/Makefile 2010-08-03 17:34:17.000000000 +0200 -@@ -43,10 +43,7 @@ BOBJECTS = $(BTARGET) \ - 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 win64/syslinux64.exe \ -- dosutil/*.com dosutil/*.sys \ -- $(MODULES) -+ gpxe/gpxelinux.0 $(MODULES) - - # BSUBDIRs build the on-target binary components. - # ISUBDIRs build the installer (host) components. -@@ -55,7 +52,7 @@ BOBJECTS = $(BTARGET) \ - # 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 win64 dosutil -+ libinstaller - ITARGET = - IOBJECTS = $(ITARGET) \ - utils/gethostip utils/isohybrid utils/mkdiskimage \ -@@ -71,10 +68,10 @@ INSTALL_AUX = core/pxelinux.0 gpxe/gpx - core/isolinux-debug.bin \ - dos/syslinux.com \ - mbr/*.bin $(MODULES) --INSTALL_AUX_OPT = win32/syslinux.exe win64/syslinux64.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) |