diff --git a/.cvsignore b/.cvsignore index 5daf8ee..5e43902 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -syslinux-2.06.tar.bz2 +syslinux-2.08.tar.bz2 diff --git a/sources b/sources index e70c4c3..df75d9f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c3be5acc14742ad7b23cb6cdf63725c6 syslinux-2.06.tar.bz2 +f1c699a3996a000f0cd0bdd075cbcf6c syslinux-2.08.tar.bz2 diff --git a/syslinux-2.08-x86_64.patch b/syslinux-2.08-x86_64.patch new file mode 100644 index 0000000..23529db --- /dev/null +++ b/syslinux-2.08-x86_64.patch @@ -0,0 +1,25 @@ +--- syslinux-2.08/sample/Makefile.x86_64 2003-12-10 15:44:57.000000000 -0500 ++++ syslinux-2.08/sample/Makefile 2003-12-14 17:26:35.142040434 -0500 +@@ -29,6 +29,13 @@ + + LIBOBJS = conio.o atou.o skipatou.o printf.o + ++ARCH := $(shell uname -m) ++ifneq (x86_64, $ARCH) ++CFLAGS += -m32 ++SFLAGS += -m32 ++LDFLAGS += -m elf_i386 ++endif ++ + .SUFFIXES: .lss .c .o .elf .c32 + + all: syslogo.lss comecho.com hello.c32 hello2.c32 filetest.c32 c32echo.c32 fd.c32 chain.c32 +@@ -40,7 +47,7 @@ + $(CC) $(CFLAGS) -c -o $@ $< + + %.elf: c32entry.o %.o $(LIB) +- $(LD) -Ttext 0x101000 -e _start -o $@ $^ ++ $(LD) $(LDFLAGS) -Ttext 0x101000 -e _start -o $@ $^ + + %.c32: %.elf + $(OBJCOPY) -O binary $< $@ diff --git a/syslinux.spec b/syslinux.spec index 9907108..f9d49ea 100644 --- a/syslinux.spec +++ b/syslinux.spec @@ -1,11 +1,11 @@ Summary: Simple kernel loader which boots from a FAT filesystem Name: syslinux -Version: 2.06 +Version: 2.08 Release: 1 License: GPL Group: Applications/System Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{version}.tar.bz2 -Patch0: syslinux-2.04-x86_64.patch +Patch0: syslinux-2.08-x86_64.patch ExclusiveArch: i386 x86_64 Buildroot: %{_tmppath}/%{name}-%{version}-root BuildPrereq: nasm, perl @@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/gethostip %changelog +* Sun Dec 14 2003 Jeremy Katz 2.08-1 +- 2.08 + * Fri Aug 22 2003 Jeremy Katz 2.06-1 - 2.06