syslinux: updated to 3.84

This commit is contained in:
Jose V Beneyto 2009-12-21 11:15:37 +01:00
parent d7a6621070
commit ea34d45d15
4 changed files with 20 additions and 87 deletions

View File

@ -45,6 +45,7 @@ drwxr-sr-x root/root usr/share/syslinux/com32/include/bitsize/
-rw-r--r-- root/root usr/share/syslinux/com32/include/ctype.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/dev.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/dirent.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/dprintf.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/elf.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/endian.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/errno.h
@ -53,10 +54,12 @@ drwxr-sr-x root/root usr/share/syslinux/com32/include/gplinclude/
-rw-r--r-- root/root usr/share/syslinux/com32/include/gplinclude/README
-rw-r--r-- root/root usr/share/syslinux/com32/include/gplinclude/cpuid.h
drwxr-sr-x root/root usr/share/syslinux/com32/include/gplinclude/disk/
-rw-r--r-- root/root usr/share/syslinux/com32/include/gplinclude/disk/bootloaders.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/gplinclude/disk/common.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/gplinclude/disk/errno_disk.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/gplinclude/disk/error.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/gplinclude/disk/geom.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/gplinclude/disk/mbrs.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/gplinclude/disk/msdos.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/gplinclude/disk/partition.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/gplinclude/disk/read.h
@ -85,6 +88,7 @@ drwxr-sr-x root/root usr/share/syslinux/com32/include/klibc/
-rw-r--r-- root/root usr/share/syslinux/com32/include/klibc/endian.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/klibc/extern.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/klibc/sysconfig.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/libansi.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/limits.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/math.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/minmax.h
@ -106,6 +110,7 @@ drwxr-sr-x root/root usr/share/syslinux/com32/include/sys/
-rw-r--r-- root/root usr/share/syslinux/com32/include/sys/elf64.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/sys/elfcommon.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/sys/fpu.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/sys/gpxe.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/sys/io.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/sys/pci.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/sys/stat.h
@ -148,8 +153,12 @@ drwxr-sr-x root/root usr/share/syslinux/com32/include/syslinux/
-rw-r--r-- root/root usr/share/syslinux/cpuidtest.c32
-rw-r--r-- root/root usr/share/syslinux/disk.c32
-rw-r--r-- root/root usr/share/syslinux/dmitest.c32
drwxr-xr-x root/root usr/share/syslinux/dosutil/
-rw-r--r-- root/root usr/share/syslinux/dosutil/eltorito.sys
-rw-r--r-- root/root usr/share/syslinux/dosutil/mdiskchk.com
-rw-r--r-- root/root usr/share/syslinux/elf.c32
-rw-r--r-- root/root usr/share/syslinux/ethersel.c32
-rw-r--r-- root/root usr/share/syslinux/gfxboot.c32
-rw-r--r-- root/root usr/share/syslinux/gfxboot.com
-rw-r--r-- root/root usr/share/syslinux/gptmbr.bin
-rw-r--r-- root/root usr/share/syslinux/gptmbr_c.bin
@ -157,6 +166,7 @@ drwxr-sr-x root/root usr/share/syslinux/com32/include/syslinux/
-rw-r--r-- root/root usr/share/syslinux/gpxecmd.c32
-rw-r--r-- root/root usr/share/syslinux/gpxelinux.0
-rw-r--r-- root/root usr/share/syslinux/hdt.c32
-rw-r--r-- root/root usr/share/syslinux/ifcpu.c32
-rw-r--r-- root/root usr/share/syslinux/ifcpu64.c32
-rw-r--r-- root/root usr/share/syslinux/int18.com
-rw-r--r-- root/root usr/share/syslinux/isohdpfx.bin
@ -187,6 +197,7 @@ drwxr-sr-x root/root usr/share/syslinux/com32/include/syslinux/
-rw-r--r-- root/root usr/share/syslinux/sanboot.c32
-rw-r--r-- root/root usr/share/syslinux/sdi.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/vesainfo.c32
-rw-r--r-- root/root usr/share/syslinux/vesamenu.c32
-rw-r--r-- root/root usr/share/syslinux/vpdtest.c32

View File

@ -1,2 +1 @@
a916479199b6547e22c21c7244fa0d45 Makefile.patch
069160bc3776eca71a57cabace22bb24 syslinux-3.83.tar.bz2
7a3503098a9d1e3b55b90bec303e66e2 syslinux-3.84.tar.bz2

View File

@ -1,79 +0,0 @@
--- Makefile.orig 2009-04-14 06:32:42.697920168 +0000
+++ Makefile 2009-04-14 06:38:11.489920182 +0000
@@ -40,8 +40,7 @@ BTARGET = version.gen version.h version
BOBJECTS = $(BTARGET) \
mbr/mbr.bin mbr/gptmbr.bin \
core/pxelinux.0 core/isolinux.bin core/isolinux-debug.bin \
- gpxe/gpxelinux.0 dos/syslinux.com win32/syslinux.exe \
- $(MODULES)
+ gpxe/gpxelinux.0 dos/syslinux.com $(MODULES)
# BSUBDIRs build the on-target binary components.
# ISUBDIRs build the installer (host) components.
@@ -50,7 +49,7 @@ BOBJECTS = $(BTARGET) \
# files that depend only on the B phase, but may have to be regenerated
# for "make installer".
BSUBDIRS = codepage core memdisk modules com32 mbr memdump gpxe sample \
- libinstaller dos win32
+ libinstaller dos
ITARGET =
IOBJECTS = $(ITARGET) dos/copybs.com \
utils/gethostip utils/isohybrid utils/mkdiskimage \
@@ -58,26 +57,15 @@ IOBJECTS = $(ITARGET) dos/copybs.com \
ISUBDIRS = libinstaller mtools linux extlinux utils
# Things to install in /usr/bin
-INSTALL_BIN = mtools/syslinux
-# Things to install in /sbin
-INSTALL_SBIN = extlinux/extlinux
+INSTALL_BIN = mtools/syslinux extlinux/extlinux
# 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 dos/copybs.com win32/syslinux.exe \
- mbr/*.bin $(MODULES)
-INSTALL_AUX_OPT = win32/syslinux.exe
+ dos/syslinux.com dos/copybs.com mbr/*.bin $(MODULES)
# These directories manage their own installables
INSTALLSUBDIRS = com32 utils
-# Things to install in /boot/extlinux
-EXTBOOTINSTALL = $(MODULES)
-
-# Things to install in /tftpboot
-NETINSTALLABLE = core/pxelinux.0 gpxe/gpxelinux.0 \
- $(MODULES)
-
all:
$(MAKE) all-local
set -e ; for i in $(BSUBDIRS) $(ISUBDIRS) ; do $(MAKE) -C $$i $@ ; done
@@ -102,11 +90,8 @@ version.mk: version version.pl
local-install: installer
mkdir -m 755 -p $(INSTALLROOT)$(BINDIR)
install -m 755 -c $(INSTALL_BIN) $(INSTALLROOT)$(BINDIR)
- mkdir -m 755 -p $(INSTALLROOT)$(SBINDIR)
- install -m 755 -c $(INSTALL_SBIN) $(INSTALLROOT)$(SBINDIR)
mkdir -m 755 -p $(INSTALLROOT)$(AUXDIR)
install -m 644 -c $(INSTALL_AUX) $(INSTALLROOT)$(AUXDIR)
- -install -m 644 -c $(INSTALL_AUX_OPT) $(INSTALLROOT)$(AUXDIR)
mkdir -m 755 -p $(INSTALLROOT)$(MANDIR)/man1
install -m 644 -c man/*.1 $(INSTALLROOT)$(MANDIR)/man1
: mkdir -m 755 -p $(INSTALLROOT)$(MANDIR)/man8
@@ -115,15 +100,7 @@ local-install: installer
install: local-install
set -e ; for i in $(INSTALLSUBDIRS) ; do $(MAKE) -C $$i $@ ; done
-netinstall: installer
- mkdir -p $(INSTALLROOT)$(TFTPBOOT)
- install -m 644 $(NETINSTALLABLE) $(INSTALLROOT)$(TFTPBOOT)
-
-extbootinstall: installer
- mkdir -m 755 -p $(INSTALLROOT)$(EXTLINUXDIR)
- install -m 644 $(EXTBOOTINSTALL) $(INSTALLROOT)$(EXTLINUXDIR)
-
-install-all: install netinstall extbootinstall
+install-all: install
local-tidy:
rm -f *.o *.elf *_bin.c stupid.* patch.offset

View File

@ -5,14 +5,16 @@
# Depends on: mtools perl
name=syslinux
version=3.83
release=2
source=(http://www.kernel.org/pub/linux/utils/boot/$name/$name-$version.tar.bz2 \
Makefile.patch)
version=3.84
release=1
source=(http://www.kernel.org/pub/linux/utils/boot/$name/$name-$version.tar.bz2)
build() {
cd $name-$version
patch -p0 -i $SRC/Makefile.patch
cp win32/syslinux.exe .
make OPTFLAGS="$CFLAGS"
make INSTALLROOT=$PKG install-all
mv syslinux.exe win32
make INSTALLROOT=$PKG install
mv $PKG/sbin/* $PKG/usr/bin
rm -r $PKG/sbin
}