Hello community, here is the log from the commit of package lilo for openSUSE:Factory checked in at Tue Oct 11 17:03:36 CEST 2011.
-------- --- openSUSE:Factory/lilo/lilo.changes 2011-09-23 02:11:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/lilo/lilo.changes 2011-10-10 17:57:07.000000000 +0200 @@ -1,0 +2,18 @@ +Fri Sep 23 09:32:26 UTC 2011 - p...@opensuse.org + +- upgrade to lilo 23.2. Amended mount_by_persistent_name patch so + it applies, removed division-by-zero patch (code now in upstream), + amended other patches to work with new src/ dir. Updated Makefile + to skip hooks, images and samples. Updated spec to skip 'activate' + which was removed from source package. Updated spec to not require + device-mapper-devel-32bit for build. + For a complete changelog for 22.8 to 23.2, see the tarball; lots of + clean-up, optimization, removal of obsolete code etc. Some of the + more significant changes are: + - increase maximum number of sectors (MAX_SETUPSECS) for + kernel setup code to 63. + - support for newer MD RAID metadata format + - support for root on LVM + - allow spaces in boot menu + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- lilo-22.8.src.tar.bz2 lilo.x86.division-by-zero.patch New: ---- lilo-23.2.tar.gz lilo.src.Makefile.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lilo.spec ++++++ --- /var/tmp/diff_new_pack.gVBIfi/_old 2011-10-11 17:03:32.000000000 +0200 +++ /var/tmp/diff_new_pack.gVBIfi/_new 2011-10-11 17:03:32.000000000 +0200 @@ -17,16 +17,17 @@ # norootforbuild -Url: http://lilo.go.dyndns.org/ +Url: http://lilo.alioth.debian.org/ Name: lilo ExclusiveArch: ppc ppc64 %ix86 x86_64 %define yaboot_vers 22.8-r1190 +%define ppc_version 22.8 Group: System/Boot License: BSD3c Summary: The Linux Loader, a Boot Menu BuildRoot: %{_tmppath}/%{name}-%{version}-build -Obsoletes: yaboot activate quik +Obsoletes: yaboot quik %ifarch ppc ppc64 %if 0%{?suse_version} > 1020 BuildRequires: dtc @@ -59,27 +60,28 @@ %endif %ifarch x86_64 BuildRequires: glibc-devel-32bit -%if 0%{?suse_version} > 1010 BuildRequires: device-mapper-32bit +# openSUSE 11.3 and SLE_11 do not have device-mapper-devel-32bit +%if 0%{?suse_version} != 1130 && 0%{?suse_version} != 1110 BuildRequires: device-mapper-devel-32bit -BuildRequires: gcc-32bit %endif +BuildRequires: gcc-32bit %endif # note: already outdated; download fresh sources from: https://alioth.debian.org/frs/?group_id=100507 -Version: 22.8 +Version: 23.2 Release: 65 -Source0: lilo-ppc-%{version}.tar.bz2 +Source0: lilo-ppc-%{ppc_version}.tar.bz2 Source1: http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2 -Source86: lilo-%{version}.src.tar.bz2 +Source86: lilo-%{version}.tar.gz Patch8601: lilo.x86.mount_by_persistent_name.patch Patch8602: lilo.x86.array-bounds.patch -Patch8603: lilo.x86.division-by-zero.patch Patch8604: lilo.x86.checkit.patch Patch8605: lilo-no-build-date.patch Patch8606: lilo.ppc.nvram-fix.patch Patch8607: yaboot-libgcc.patch Patch8608: lilo-libgcc.patch Patch8609: lilo.ppc.ps3.patch +Patch8610: lilo.src.Makefile.patch # $Id: lilo.spec 1188 2008-12-09 14:29:53Z olh $ %description @@ -94,14 +96,14 @@ %prep %setup -q -T -c -a 0 -a 1 -a 86 -mv lilo-ppc-%{version} lilo.ppc +mv lilo-ppc-%{ppc_version} lilo.ppc mv yaboot-%{yaboot_vers} yaboot pushd lilo-%{version} %patch8601 -p1 %patch8602 -p1 -%patch8603 -p1 %patch8604 -p1 -%patch8605 +%patch8605 -p1 +%patch8610 -p1 popd %patch8606 pushd yaboot @@ -119,7 +121,7 @@ %ifarch x86_64 cflags="$cflags -m32" %endif -make CC="gcc $cflags" MAN_DIR=/usr/share/man all activate +make CC="gcc $cflags" MAN_DIR=/usr/share/man all popd # powerpc %else @@ -148,11 +150,10 @@ %install %ifarch %ix86 x86_64 pushd lilo-%{version} -make MAN_DIR=/usr/share/man install ROOT=$RPM_BUILD_ROOT -install -m 0755 activate $RPM_BUILD_ROOT/sbin +make MAN_DIR=/usr/share/man install DESTDIR=$RPM_BUILD_ROOT rm -rfv $RPM_BUILD_ROOT/boot mkdir -p $RPM_BUILD_ROOT/boot -cp -av *.b $RPM_BUILD_ROOT/boot +cp -av src/*.b $RPM_BUILD_ROOT/boot popd %else # powerpc @@ -167,7 +168,6 @@ mkdir -p $RPM_BUILD_ROOT/sbin mkdir -p $RPM_BUILD_ROOT/bin mkdir -p $RPM_BUILD_ROOT/bin -mkdir -p $RPM_BUILD_ROOT/%{_docdir}/lilo/activate mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5 pushd lilo.ppc ++++++ lilo-no-build-date.patch ++++++ --- /var/tmp/diff_new_pack.gVBIfi/_old 2011-10-11 17:03:32.000000000 +0200 +++ /var/tmp/diff_new_pack.gVBIfi/_new 2011-10-11 17:03:32.000000000 +0200 @@ -1,13 +1,11 @@ -Index: lilo.c -=================================================================== ---- lilo.c.orig 2010-08-31 01:14:33.000000000 +0200 -+++ lilo.c 2010-08-31 01:16:27.412954000 +0200 -@@ -825,8 +825,6 @@ fprintf(errstd,"REBOOT=\"%s\"\n", reboot +diff -urp a/src/lilo.c b/src/lilo.c +--- a/src/lilo.c 2011-04-09 18:40:33.000000000 +0200 ++++ b/src/lilo.c 2011-09-23 10:05:21.764105907 +0200 +@@ -839,7 +839,6 @@ fprintf(errstd,"REBOOT=\"%s\"\n", reboot #include <sys/utsname.h> - struct utsname buf; + struct utsname buf; #endif -- printf("Released %s%s and compiled at %s on %s%s\n", -- VERSION_DATE, comma ? "," : "", __TIME__, __DATE__, semi); +- printf("Compiled at %s on %s%s\n", __TIME__, __DATE__, semi); #if !__MSDOS__ - if (verbose>=2 && uname(&buf)==0) { - printf("Running %s kernel %s on %s\n", + if (verbose>=2 && uname(&buf)==0) { + printf("Running %s kernel %s on %s\n", ++++++ lilo.src.Makefile.patch ++++++ --- a/Makefile 2011-04-09 17:14:05.000000000 +0200 +++ b/Makefile 2011-09-23 19:30:20.268889339 +0200 @@ -38,14 +38,12 @@ help: # all: test $(MAKE) -C src all - $(MAKE) -C images all # # everything above plus the statically linked version # alles: test $(MAKE) -C src alles - $(MAKE) -C images all # # documentation files @@ -105,9 +103,6 @@ ins: # install: all $(MAKE) -C src install - $(MAKE) -C images install - $(MAKE) -C hooks install - $(MAKE) -C sample install $(MAKE) -C scripts install $(MAKE) -C man install $(MAKE) -C dos install @@ -134,8 +129,5 @@ distclean: clean uninstall: $(MAKE) -C src uninstall - $(MAKE) -C images uninstall - $(MAKE) -C hooks uninstall - $(MAKE) -C sample uninstall $(MAKE) -C scripts uninstall $(MAKE) -C man uninstall ++++++ lilo.x86.array-bounds.patch ++++++ --- /var/tmp/diff_new_pack.gVBIfi/_old 2011-10-11 17:03:32.000000000 +0200 +++ /var/tmp/diff_new_pack.gVBIfi/_new 2011-10-11 17:03:32.000000000 +0200 @@ -8,8 +8,8 @@ lilo.c | 6 ------ 3 files changed, 11 deletions(-) ---- a/bsect.c -+++ b/bsect.c +--- a/src/bsect.c ++++ b/src/bsect.c @@ -1594,9 +1594,6 @@ void bsect_uninstall(char *boot_dev,char if (*(unsigned short *) &bsect.sector[BOOT_SIG_OFFSET] != BOOT_SIGNATURE) die("Boot sector of %s does not have a boot signature",boot_dev ? @@ -20,8 +20,8 @@ if (strncmp(bsect.par_1.signature,"LILO",4)) die("Boot sector of %s doesn't have a LILO signature",boot_dev ? boot_dev : dev.name); ---- a/common.c -+++ b/common.c +--- a/src/common.c ++++ b/src/common.c @@ -172,8 +172,6 @@ void check_version(BOOT_SECTOR *sect,int { int bs_major, bs_minor; @@ -31,8 +31,8 @@ if (strncmp(sect->par_1.signature,"LILO",4)) die("%s doesn't have a valid LILO signature",name(stage)); if ((sect->par_1.stage&0xFF) != stage) ---- a/lilo.c -+++ b/lilo.c +--- a/src/lilo.c ++++ b/src/lilo.c @@ -216,12 +216,6 @@ static void show_other(int fd) if (read(fd,buf,sizeof(buf)) != sizeof(buf)) ++++++ lilo.x86.checkit.patch ++++++ --- /var/tmp/diff_new_pack.gVBIfi/_old 2011-10-11 17:03:32.000000000 +0200 +++ /var/tmp/diff_new_pack.gVBIfi/_new 2011-10-11 17:03:32.000000000 +0200 @@ -1,13 +1,15 @@ -Passt schon +No need to check. --- - checkit | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + checkit | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) ---- a/checkit -+++ b/checkit -@@ -1,4 +1,5 @@ - #! /bin/sh -+exit 0 +diff -urp a/checkit b/checkit +--- a/checkit 2010-11-01 16:52:58.000000000 +0100 ++++ b/checkit 2011-09-23 09:58:03.662339674 +0200 +@@ -106,5 +106,5 @@ echo + # + # Uncomment the line below to bypass all the checks # - # check: - # Test for correct versions of utilities +-#exit 0 ++exit 0 + exit $ret ++++++ lilo.x86.mount_by_persistent_name.patch ++++++ --- /var/tmp/diff_new_pack.gVBIfi/_old 2011-10-11 17:03:32.000000000 +0200 +++ /var/tmp/diff_new_pack.gVBIfi/_new 2011-10-11 17:03:32.000000000 +0200 @@ -1,11 +1,12 @@ Do not pass root=major:minor to the initrd --- - bsect.c | 41 ++++++++++++++--------------------------- - 1 file changed, 14 insertions(+), 27 deletions(-) + bsect.c | 42 +++++++++++++----------------------------- + 1 file changed, 13 insertions(+), 29 deletions(-) ---- a/bsect.c -+++ b/bsect.c -@@ -943,18 +943,6 @@ printf("MAX_IMAGES = %d\n", MAX_IMAGES); +diff -urp a/src/bsect.c b/src/bsect.c +--- a/src/bsect.c 2010-11-01 17:22:29.000000000 +0100 ++++ b/src/bsect.c 2011-09-23 08:22:56.017387013 +0200 +@@ -947,18 +947,6 @@ printf("MAX_IMAGES = %d\n", MAX_IMAGES); } @@ -23,8 +24,8 @@ - static int get_image(char *name,char *label,IMAGE_DESCR *descr) { - char *here,*deflt; -@@ -1040,7 +1028,6 @@ static char options[SECTOR_SIZE]; /* thi + char *here,*deflt,*tmp; +@@ -1062,7 +1050,6 @@ static char options[SECTOR_SIZE]; /* thi static void bsect_common(IMAGE_DESCR *descr, int image) { @@ -32,7 +33,7 @@ char *here,*root,*ram_disk,*vga,*password; char *literal,*append,*fback; char fallback_buf[SECTOR_SIZE]; -@@ -1063,20 +1050,20 @@ if (image) { /* long section specific to +@@ -1085,22 +1072,19 @@ if (image) { /* long section specific to "read-write")) strcat(options,"rw "); if ((root = cfg_get_strg(cf_kernel,"root")) || (root = cfg_get_strg( cf_options,"root"))) { @@ -40,30 +41,31 @@ - if (stat("/",&st) < 0) pdie("stat /"); - sprintf(strchr(options,0),"root=%x ",(unsigned int) st.st_dev); - } +- else if (strlen(root)>12 && !strncmp(root,"/dev/mapper/",12)) { +- sprintf(strchr(options,0),"root=%s ", root); +- } - else if (strlen(root)>6 && !strncmp(root,"LABEL=",6)) { - sprintf(strchr(options,0),"root=%s ", root); - } -- else if (strlen(root)>5 && !strncmp(root,"UUID=",5)) { -- sprintf(strchr(options,0),"root=%s ", root); +- else if (strlen(root)>5 && !strncmp(root,"UUID=",5)) { +- sprintf(strchr(options,0),"root=%s ", root); - } - else { - sprintf(strchr(options,0),"root=%x ",dev_number(root)); - } -- } -+ /* root= is a property of either: -+ * prepare_namespace() -+ * or /init in initramfs -+ * or /linuxrc in a loopmounted initrd -+ * Its not a property of the bootloader or anything else -+ * related to loading the kernel/initrd into memory (or configuring -+ * that event) -+ * -+ * Pass root= via /proc/cmdline as configured in the config file -+ * If no root= is configured, initrd has a hardcoded value -+ * based on the '/' entry in /etc/fstab -+ */ -+ sprintf(strchr(options,0),"root=%s ", root); -+ } ++ /* root= is a property of either: ++ * prepare_namespace() ++ * or /init in initramfs ++ * or /linuxrc in a loopmounted initrd ++ * Its not a property of the bootloader or anything else ++ * related to loading the kernel/initrd into memory (or configuring ++ * that event) ++ * ++ * Pass root= via /proc/cmdline as configured in the config file ++ * If no root= is configured, initrd has a hardcoded value ++ * based on the '/' entry in /etc/fstab ++ */ ++ sprintf(strchr(options,0),"root=%s ", root); + } if ((ram_disk = cfg_get_strg(cf_kernel,"ramdisk")) || (ram_disk = cfg_get_strg(cf_options,"ramdisk"))) - sprintf(strchr(options,0),"ramdisk=%d ",to_number(ram_disk)); continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
