On 12 Jul 2011, at 15:55, Ulf Hofemeier wrote: > Hi, > I have made the following changes to syslinux in project Trunk. Please review > and accept ASAP. > > Thank You, > Ulf Hofemeier > > [This message was auto-generated] > > --- > > Request #22640: > > submit: Trunk:Testing/syslinux(r2) -> Trunk/syslinux > > > Message: > * Thu Aug 26 2010 Yi Yang <[email protected]> - 4.02 > - Use epoch 2 on debian-based oses > * Thu Aug 26 2010 Yi Yang <[email protected]> - 4.02 > - Fix 4.03 build error on debian-based oses > * Wed Aug 25 2010 Yi Yang <[email protected]> - 4.02 > - Don't have syslinux-extlinux on Fedora and openSUSE > * Fri Jul 23 2010 Yi Yang <[email protected]> - 4.02 > - Update to 4.02 > > State: new 2011-07-12T07:55:15 ulf > Comment: None > > > > changes files: > -------------- > --- syslinux.changes > +++ syslinux.changes > @@ -1,2 +1,11 @@ > -* Thu May 19 2011 Anas Nashif <[email protected]> - 4.00 > -- Move documentation to devel package
Why are you removing my previous changes? Anas > +* Thu Aug 26 2010 Yi Yang <[email protected]> - 4.02 > +- Use epoch 2 on debian-based oses > + > +* Thu Aug 26 2010 Yi Yang <[email protected]> - 4.02 > +- Fix 4.03 build error on debian-based oses > + > +* Wed Aug 25 2010 Yi Yang <[email protected]> - 4.02 > +- Don't have syslinux-extlinux on Fedora and openSUSE > + > +* Fri Jul 23 2010 Yi Yang <[email protected]> - 4.02 > +- Update to 4.02 > > old: > ---- > syslinux-4.00.tar.gz > > new: > ---- > syslinux-4.02.tar.gz > > spec files: > ----------- > --- syslinux.spec > +++ syslinux.spec > @@ -1,18 +1,19 @@ > # -*- rpm -*- > Summary: Kernel loader which uses a FAT, ext2/3 or iso9660 filesystem or a > PXE network > Name: syslinux > -Version: 4.00 > +Version: 4.02 > Release: 1 > License: GPLv2 > Url: http://syslinux.zytor.com/ > Group: System/Boot > Source0: > ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{version}.tar.gz > ExclusiveArch: %{ix86} x86_64 > +Buildroot: %{_tmppath}/%{name}-%{version}-root > BuildRequires: nasm >= 0.98.39, perl > Source101: syslinux-rpmlintrc > Autoreq: 0 > %ifarch x86_64 > -Requires: mtools > +Requires: mtools, libc.so.6()(64bit) > %define my_cc gcc > %else > Requires: mtools, libc.so.6 > @@ -39,6 +40,7 @@ > sophisticated add-on modules. This package contains the libraries > necessary to compile such modules. > > +%if "0%{?meego_version}" != "0" || 0%{?moblin_version} > %package extlinux > Summary: The EXTLINUX bootloader, for booting the local system > Group: System/Boot > @@ -47,6 +49,7 @@ > %description extlinux > The EXTLINUX bootloader, for booting the local system, as well as all > the SYSLINUX/PXELINUX modules in /boot. > +%endif > > %package tftpboot > Summary: SYSLINUX modules in /var/lib/tftpboot, available for network booting > @@ -77,22 +80,11 @@ > %clean > rm -rf %{buildroot} > > -%post extlinux > -# If we have a /boot/extlinux.conf file, assume extlinux is our bootloader > -# and update it. > -if [ -f /boot/extlinux/extlinux.conf ]; then \ > - ln -sf /boot/extlinux/extlinux.conf /etc/extlinux.conf; \ > - extlinux --update /boot/extlinux ; \ > -elif [ -f /boot/extlinux.conf ]; then \ > - mkdir -p /boot/extlinux && \ > - mv /boot/extlinux.conf /boot/extlinux/extlinux.conf && \ > - extlinux --update /boot/extlinux ; \ > -fi > - > - > %files > -%defattr(-,root,root, -) > -%doc COPYING > +%defattr(-,root,root) > +%doc COPYING NEWS doc/* > +%doc sample > +%doc %{_mandir}/man*/* > %{_bindir}/* > %dir %{_datadir}/syslinux > %{_datadir}/syslinux/*.com > @@ -103,19 +95,36 @@ > %{_datadir}/syslinux/memdisk > %{_datadir}/syslinux/dosutil > %{_datadir}/syslinux/dosutil/* > +%if 0%{?fedora_version} || 0%{?suse_version} > +%{_sbindir}/extlinux > +/boot/extlinux > +%endif > > %files devel > -%defattr(-,root,root,-) > -%doc doc/* > -%doc sample > +%defattr(-,root,root) > %{_datadir}/syslinux/com32 > -%doc %{_mandir}/man*/* > > +%if "0%{?meego_version}" != "0" || 0%{?moblin_version} > %files extlinux > -%defattr(-,root,root,-) > +%defattr(-,root,root) > %{_sbindir}/extlinux > /boot/extlinux > +%endif > > %files tftpboot > -%defattr(-,root,root,-) > +%defattr(-,root,root) > /var/lib/tftpboot > + > +%if "0%{?meego_version}" != "0" || 0%{?moblin_version} > +%post extlinux > +# If we have a /boot/extlinux.conf file, assume extlinux is our bootloader > +# and update it. > +if [ -f /boot/extlinux/extlinux.conf ]; then \ > + ln -sf /boot/extlinux/extlinux.conf /etc/extlinux.conf; \ > + extlinux --update /boot/extlinux ; \ > +elif [ -f /boot/extlinux.conf ]; then \ > + mkdir -p /boot/extlinux && \ > + mv /boot/extlinux.conf /boot/extlinux/extlinux.conf && \ > + extlinux --update /boot/extlinux ; \ > +fi > +%endif > > dsc files: > ---------- > --- syslinux.dsc > +++ syslinux.dsc > @@ -1,8 +1,8 @@ > Format: 1.0 > Source: syslinux > Binary: syslinux > -Architecture: all > -Version: 4.00 > +Architecture: any > +Version: 2:4.02 > Maintainer: Yi Yang <[email protected]> > Homepage: http://syslinux.zytor.com/ > Standards-Version: 3.7.2 > > other changes: > -------------- > > ++++++ debian.changelog > --- debian.changelog > +++ debian.changelog > @@ -1,3 +1,8 @@ > +syslinux (2:4.02) unstable; urgency=low > + > + * Update to 2:4.02 > + > + -- Yi Yang <[email protected]> Fri, 23 Jul 2010 09:47:32 +0100 > syslinux (4.00) unstable; urgency=low > > * Update to 4.00 > > ++++++ debian.tar.gz > --- control > +++ control > @@ -7,7 +7,7 @@ > Homepage: http://syslinux.zytor.com/ > > Package: syslinux > -Architecture: all > +Architecture: any > Depends: ${shlibs:Depends}, ${misc:Depends}, mtools > Recommends: mtools > Description: Bootloader for Linux/i386 using MS-DOS floppies > --- patches/00list > +++ patches/00list > @@ -1 +1 @@ > -01-xubuntu-build.patch > +01-dos-win32.patch > --- patches/01-dos-win32.patch > +++ patches/01-dos-win32.patch > +#!/bin/sh /usr/share/dpatch/dpatch-run > +## 01-xubuntu-build.dpatch > +## > +## > + > +@DPATCH@ > + > +diff -Naurp a/Makefile b/Makefile > +--- a/Makefile 2010-08-26 10:38:23.535440604 +0800 > ++++ b/Makefile 2010-08-26 10:39:23.815566130 +0800 > +@@ -30,7 +30,7 @@ include $(topdir)/MCONFIG > + # > + > + # List of module objects that should be installed for all derivatives > +-MODULES = memdisk/memdisk memdump/memdump.com modules/*.com \ > ++MODULES = modules/*.com \ > + com32/menu/*.c32 com32/modules/*.c32 com32/mboot/*.c32 \ > + com32/hdt/*.c32 com32/rosh/*.c32 com32/gfxboot/*.c32 \ > + com32/sysdump/*.c32 com32/lua/src/*.c32 > +@@ -43,8 +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 \ > ++ gpxe/gpxelinux.0 \ > + dosutil/*.com dosutil/*.sys \ > + $(MODULES) > + > +@@ -69,7 +68,6 @@ INSTALL_SBIN = 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 \ > + mbr/*.bin $(MODULES) > + INSTALL_AUX_OPT = win32/syslinux.exe win64/syslinux64.exe > + > --- patches/01-xubuntu-build.patch > +++ patches/01-xubuntu-build.patch > -#!/bin/sh /usr/share/dpatch/dpatch-run > -## 01-xubuntu-build.dpatch > -## > -## > - > -@DPATCH@ > - > -diff --git a/com32/MCONFIG b/com32/MCONFIG > ---- a/com32/MCONFIG > -+++ b/com32/MCONFIG > -@@ -55,7 +55,7 @@ SFLAGS = $(GCCOPT) $(GCCWARN) -march=i386 \ > - -I$(com32)/libutil/include -I$(com32)/include $(GPLINCLUDE) > - > - COM32LD = $(com32)/lib/com32.ld > --LDFLAGS = -m elf_i386 --emit-relocs -T $(COM32LD) > -+MYLDFLAGS = -m elf_i386 --emit-relocs -T $(COM32LD) > - LIBGCC := $(shell $(CC) $(GCCOPT) --print-libgcc) > - > - LNXCFLAGS = -I$(com32)/libutil/include $(GCCWARN) -O -g -D_GNU_SOURCE > -@@ -78,7 +78,8 @@ C_LNXLIBS = $(com32)/libutil/libutil_lnx.a > - > - .PRECIOUS: %.elf > - %.elf: %.o $(LIBS) $(C_LIBS) $(COM32LD) > -- $(LD) $(LDFLAGS) -o $@ $(filter-out $(COM32LD),$^) > -+ echo $(MYLDFLAGS) $(LD) $(CFLAGS) > -+ $(LD) $(MYLDFLAGS) -o $@ $(filter-out $(COM32LD),$^) > - > - .PRECIOUS: %.lo > - %.lo: %.S > -diff --git a/com32/gdbstub/Makefile b/com32/gdbstub/Makefile > ---- a/com32/gdbstub/Makefile > -+++ b/com32/gdbstub/Makefile > -@@ -30,7 +30,7 @@ OBJS = main.o int.o serial.o gdbstub.o > - all: $(MODULES) $(TESTFILES) > - > - gdbstub.elf : $(OBJS) $(LIBS) $(C_LIBS) > -- $(LD) $(LDFLAGS) -o $@ $^ > -+ $(LD) $(MYLDFLAGS) -o $@ $^ > - > - tidy dist clean: > - rm -f *.o *.lo *.a *.lst *.elf .*.d *.tmp > -diff --git a/com32/gfxboot/Makefile b/com32/gfxboot/Makefile > ---- a/com32/gfxboot/Makefile > -+++ b/com32/gfxboot/Makefile > -@@ -19,7 +19,7 @@ MODULES = gfxboot.c32 > - all: $(MODULES) > - > - gfxboot.elf : gfxboot.o realmode_callback.o $(LIBS) $(C_LIBS) > -- $(LD) $(LDFLAGS) -o $@ $^ > -+ $(LD) $(MYLDFLAGS) -o $@ $^ > - > - realmode_callback.o: realmode_callback.asm > - $(NASM) -f bin -O99 -o $*.tmp -l $*.lst $< > -diff --git a/com32/hdt/Makefile b/com32/hdt/Makefile > ---- a/com32/hdt/Makefile > -+++ b/com32/hdt/Makefile > -@@ -50,7 +50,7 @@ ART_DIR ?= art/ > - all: $(MODULES) $(TESTFILES) > - > - hdt.elf : $(OBJS) $(LIBS) $(C_LIBS) > -- $(LD) $(LDFLAGS) -o $@ $^ > -+ $(LD) $(MYLDFLAGS) -o $@ $^ > - > - memtest: > - -[ ! -f $(FLOPPY_DIR)/$(MEMTEST) ] && $(WGET) $(MEMTEST_URL) -O > $(FLOPPY_DIR)/$(MEMTEST) > -diff --git a/com32/mboot/Makefile b/com32/mboot/Makefile > ---- a/com32/mboot/Makefile > -+++ b/com32/mboot/Makefile > -@@ -29,7 +29,7 @@ OBJS = mboot.o map.o mem.o initvesa.o apm.o solaris.o > syslinux.o > - all: $(MODULES) $(TESTFILES) > - > - mboot.elf : $(OBJS) $(LIBS) $(C_LIBS) > -- $(LD) $(LDFLAGS) -o $@ $^ > -+ $(LD) $(MYLDFLAGS) -o $@ $^ > - > - tidy dist: > - rm -f *.o *.lo *.a *.lst *.elf .*.d *.tmp > -diff --git a/com32/menu/Makefile b/com32/menu/Makefile > ---- a/com32/menu/Makefile > -+++ b/com32/menu/Makefile > -@@ -29,10 +29,10 @@ COMMONOBJS = menumain.o readconfig.o passwd.o drain.o > printmsg.o colors.o \ > - all: $(MODULES) $(TESTFILES) > - > - menu.elf : menu.o $(COMMONOBJS) $(LIBS) $(C_LIBS) > -- $(LD) $(LDFLAGS) -o $@ $^ > -+ $(LD) $(MYLDFLAGS) -o $@ $^ > - > - vesamenu.elf : vesamenu.o $(COMMONOBJS) $(LIBS) $(C_LIBS) > -- $(LD) $(LDFLAGS) -o $@ $^ > -+ $(LD) $(MYLDFLAGS) -o $@ $^ > - > - tidy dist: > - rm -f *.o *.lo *.a *.lst *.elf .*.d *.tmp > -diff --git a/com32/modules/Makefile b/com32/modules/Makefile > ---- a/com32/modules/Makefile > -+++ b/com32/modules/Makefile > -@@ -29,20 +29,20 @@ TESTFILES = > - all: $(MODULES) $(TESTFILES) > - > - pcitest.elf : pcitest.o $(LIBS) $(C_LIBS) > -- $(LD) $(LDFLAGS) -o $@ $^ > -+ $(LD) $(MYLDFLAGS) -o $@ $^ > - > - cpuidtest.elf : cpuidtest.o $(GPLLIB) $(LIBS) $(C_LIBS) > -- $(LD) $(LDFLAGS) -o $@ $^ > -+ $(LD) $(MYLDFLAGS) -o $@ $^ > - > - .PRECIOUS: %.o > - dmitest.o: dmitest.c > - $(CC) $(CFLAGS) $(GPLINCLUDE) -c -o $@ $< > - > - dmitest.elf : dmi_utils.o dmitest.o $(GPLLIB) $(LIBS) $(C_LIBS) > -- $(LD) $(LDFLAGS) -o $@ $^ > -+ $(LD) $(MYLDFLAGS) -o $@ $^ > - > - ethersel.elf : ethersel.o $(LIBS) $(C_LIBS) > -- $(LD) $(LDFLAGS) -o $@ $^ > -+ $(LD) $(MYLDFLAGS) -o $@ $^ > - > - tidy dist: > - rm -f *.o *.lo *.a *.lst *.elf .*.d *.tmp > -diff --git a/com32/sysdump/Makefile b/com32/sysdump/Makefile > ---- a/com32/sysdump/Makefile > -+++ b/com32/sysdump/Makefile > -@@ -43,7 +43,7 @@ CFLAGS += -DDATE='"$(DATE)"' > - all: $(MODULES) $(TESTFILES) > - > - sysdump.elf : $(OBJS) $(LIBS) $(C_LIBS) > -- $(LD) $(LDFLAGS) -o $@ $^ > -+ $(LD) $(MYLDFLAGS) -o $@ $^ > - > - tidy dist: > - rm -f *.o *.lo *.a *.lst *.elf .*.d *.tmp > -diff --git a/dos/Makefile b/dos/Makefile > ---- a/dos/Makefile > -+++ b/dos/Makefile > -@@ -20,7 +20,7 @@ include $(topdir)/MCONFIG.embedded > - CFLAGS += -D__MSDOS__ > - # CFLAGS += -DDEBUG > - > --LDFLAGS = -T dosexe.ld > -+MYLDFLAGS = -T dosexe.ld > - OPTFLAGS = -g > - INCLUDES = -include code16.h -nostdinc -iwithprefix include \ > - -I. -I.. -I../libfat -I ../libinstaller > -@@ -53,7 +53,7 @@ spotless: clean > - installer: > - > - syslinux.elf: $(OBJS) dosexe.ld libcom.a > -- $(LD) $(LDFLAGS) -o $@ $(OBJS) libcom.a > -+ $(LD) $(MYLDFLAGS) -o $@ $(OBJS) libcom.a > - > - libcom.a: $(LIBOBJS) > - -rm -f $@ > -diff --git a/memdump/Makefile b/memdump/Makefile > ---- a/memdump/Makefile > -+++ b/memdump/Makefile > -@@ -19,7 +19,7 @@ include $(topdir)/MCONFIG.embedded > - > - OPTFLAGS = > - INCLUDES = -include code16.h -I. > --LDFLAGS = -T com16.ld > -+MYLDFLAGS = -T com16.ld > - > - SRCS = main.c serial.c ymsend.c srecsend.c > - OBJS = crt0.o $(patsubst %.c,%.o,$(notdir $(SRCS))) > -@@ -43,7 +43,7 @@ spotless: clean > - installer: > - > - memdump.elf: $(OBJS) libcom.a > -- $(LD) $(LDFLAGS) -o $@ $^ > -+ $(LD) $(MYLDFLAGS) -o $@ $^ > - > - libcom.a: $(LIBOBJS) > - -rm -f $@ > --- rules > +++ rules > @@ -4,6 +4,7 @@ > #export DH_VERBOSE=1 > > include /usr/share/dpatch/dpatch.make > +unexport LDFLAGS > > upstream: > rm -f doc/rfc5071.txt > @@ -14,8 +15,8 @@ > > # Building package > make clean > - make LDFLAGS=$(LDFLAGS:-Wl,-Bsymbolic-functions=) > - #DATE="Debian-$(DATE)" VERSION="$(VERSION)" > + make installer > + make -C sample tidy > > # Building images > install -d -m 0755 build > @@ -32,7 +33,7 @@ > > for SIZE in 720 1200 1440 1743; \ > do \ > - mtools/syslinux -s build/img$${SIZE}k || exit 1; \ > + mtools/syslinux --stupid build/img$${SIZE}k || exit 1; \ > done > > gzip -9 build/* > @@ -65,7 +66,7 @@ > install -d -m 0755 debian/syslinux/usr/lib/syslinux > install -m 0644 build/* debian/syslinux/usr/lib/syslinux > > - install -m 0644 dosutil/copybs.com core/isolinux.bin > core/isolinux-debug.bin core/ldlinux.bss core/ldlinux.sys core/pxelinux.0 > com32/modules/*.c32 com32/menu/*.c32 dos/syslinux.com mbr/mbr.bin > memdisk/memdisk debian/syslinux/usr/lib/syslinux > + install -m 0644 dosutil/copybs.com core/isolinux.bin > core/isolinux-debug.bin core/ldlinux.bss core/ldlinux.sys core/pxelinux.0 > com32/modules/*.c32 com32/menu/*.c32 mbr/mbr.bin > debian/syslinux/usr/lib/syslinux > > binary-indep: build install > > > ++++++ syslinux-4.00.tar.gz -> syslinux-4.02.tar.gz > 84511 lines of diff (skipped) > > _______________________________________________ > MeeGo-commits mailing list > [email protected] > http://lists.meego.com/listinfo/meego-commits _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
