Hello community, here is the log from the commit of package lilo checked in at Fri Jul 25 16:56:34 CEST 2008. -------- --- arch/i386/lilo/lilo.changes 2008-07-18 16:04:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/lilo/lilo.changes 2008-07-25 10:53:11.000000000 +0200 @@ -1,0 +2,21 @@ +Fri Jul 25 10:52:16 CEST 2008 - olh@suse.de + +- use correct udevadm option for settle + +------------------------------------------------------------------- +Tue Jul 22 16:40:33 CEST 2008 - olh@suse.de + +- fix incorrect variable size in iseries-addRamDisk + +------------------------------------------------------------------- +Tue Jul 22 15:16:34 CEST 2008 - olh@suse.de + +- look also for CAS bootp reply if there are no device options + in the bootpath + +------------------------------------------------------------------- +Tue Jul 22 13:29:09 CEST 2008 - olh@suse.de + +- print tftp download rate, because CAS has a slow tftp client + +------------------------------------------------------------------- @@ -30 +51 @@ -- use either udevtrigger or udevadm trigger, or sleep +- use either udevsettle or udevadm settle, or sleep Old: ---- yaboot-22.8-r1090.tar.bz2 New: ---- yaboot-22.8-r1092.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lilo.spec ++++++ --- /var/tmp/diff_new_pack.Q12338/_old 2008-07-25 16:52:55.000000000 +0200 +++ /var/tmp/diff_new_pack.Q12338/_new 2008-07-25 16:52:55.000000000 +0200 @@ -14,7 +14,7 @@ Name: lilo ExclusiveArch: ppc ppc64 %ix86 x86_64 -%define yaboot_vers 22.8-r1090 +%define yaboot_vers 22.8-r1092 Group: System/Boot License: BSD 3-Clause Summary: The Linux Loader, a Boot Menu @@ -38,7 +38,7 @@ BuildRequires: gcc-32bit glibc-devel-32bit libgcc42-32bit libmudflap42-32bit %endif Version: 22.8 -Release: 1 +Release: 3 Source0: lilo-ppc-%{version}.tar.bz2 Source1: http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2 Source86: lilo-%{version}.src.tar.bz2 @@ -200,6 +200,15 @@ %endif %doc %{_mandir}/*/* %changelog +* Fri Jul 25 2008 olh@suse.de +- use correct udevadm option for settle +* Tue Jul 22 2008 olh@suse.de +- fix incorrect variable size in iseries-addRamDisk +* Tue Jul 22 2008 olh@suse.de +- look also for CAS bootp reply if there are no device options + in the bootpath +* Tue Jul 22 2008 olh@suse.de +- print tftp download rate, because CAS has a slow tftp client * Fri Jul 18 2008 olh@suse.de - fix a parser bug in CAS tftp options, use full options even if the firmware provided not all options @@ -215,7 +224,7 @@ * Fri Jul 04 2008 olh@suse.de - handle new obp-tftp interface in pSeries CAS firmware in yaboot * Fri Jul 04 2008 olh@suse.de -- use either udevtrigger or udevadm trigger, or sleep +- use either udevsettle or udevadm settle, or sleep * Thu Jul 03 2008 olh@suse.de - add md5sum check for vmlinuz/initrd to bootheader openfirmware truncates large bootfiles if real-base is at 32MB ++++++ lilo-ppc-22.8.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-ppc-22.8/bootheader/utils/iseries-addRamDisk.c new/lilo-ppc-22.8/bootheader/utils/iseries-addRamDisk.c --- old/lilo-ppc-22.8/bootheader/utils/iseries-addRamDisk.c 2008-06-24 17:10:19.000000000 +0200 +++ new/lilo-ppc-22.8/bootheader/utils/iseries-addRamDisk.c 2008-07-22 16:44:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* $Id: iseries-addRamDisk.c 1070 2008-06-24 15:10:19Z olh $ */ +/* $Id: iseries-addRamDisk.c 1093 2008-07-22 14:44:11Z olh $ */ #include <stdio.h> #include <stdlib.h> #include <netinet/in.h> @@ -74,7 +74,7 @@ void death(const char *msg, FILE *fdesc, const char *fname) { - fprintf(stderr, msg); + fprintf(stderr, "ERROR: %s", msg); fclose(fdesc); unlink(fname); exit(1); @@ -100,14 +100,14 @@ unsigned long actualKernelLen; unsigned long round; unsigned long roundedKernelLen; - unsigned long ramStartOffs; - unsigned long ramPages; + u_int32_t ramStartOffs; + u_int32_t ramPages; unsigned long roundedKernelPages; u_int32_t hvReleaseData; u_int32_t eyeCatcher = 0xc8a5d9c4; - unsigned long naca; - unsigned long xRamDisk; - unsigned long xRamDiskSize; + u_int32_t naca; + u_int32_t xRamDisk; + u_int32_t xRamDiskSize; long padPages; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-ppc-22.8/lilo.new new/lilo-ppc-22.8/lilo.new --- old/lilo-ppc-22.8/lilo.new 2008-07-04 09:19:44.000000000 +0200 +++ new/lilo-ppc-22.8/lilo.new 2008-07-25 10:53:11.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/bash # vim: syntax=sh ts=4 -# $Id: lilo.new 1082 2008-07-04 07:19:44Z olh $ +# $Id: lilo.new 1094 2008-07-25 08:53:11Z olh $ # # a simple lilo to store the boot loader and the kernel images # in bash2 ... Think different [tm] @@ -331,7 +331,7 @@ # wait for pending triggered udev events. /sbin/udevsettle --timeout=$timeout elif test -x /sbin/udevadm ; then - /sbin/udevadm trigger --timeout=$timeout + /sbin/udevadm settle --timeout=$timeout else sleep $timeout fi ++++++ yaboot-22.8-r1090.tar.bz2 -> yaboot-22.8-r1092.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-22.8-r1090/Changelog.SuSE new/yaboot-22.8-r1092/Changelog.SuSE --- old/yaboot-22.8-r1090/Changelog.SuSE 2008-07-18 16:05:25.000000000 +0200 +++ new/yaboot-22.8-r1092/Changelog.SuSE 2008-07-25 10:53:42.000000000 +0200 @@ -1,4 +1,21 @@ ------------------------------------------------------------------------ +r1092 | olh | 2008-07-22 13:17:16 +0000 (Tue, 22 Jul 2008) | 3 lines +Changed paths: + M /trunk/lilo.changes + M /trunk/yaboot/second/parse_device_path.c + ++- look also for CAS bootp reply if there are no device options ++ in the bootpath + +------------------------------------------------------------------------ +r1091 | olh | 2008-07-22 11:29:51 +0000 (Tue, 22 Jul 2008) | 2 lines +Changed paths: + M /trunk/lilo.changes + M /trunk/yaboot/second/fs_of.c + ++- print tftp download rate, because CAS has a slow tftp client + +------------------------------------------------------------------------ r1090 | olh | 2008-07-18 14:04:38 +0000 (Fri, 18 Jul 2008) | 3 lines Changed paths: M /trunk/lilo.changes diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-22.8-r1090/Makefile new/yaboot-22.8-r1092/Makefile --- old/yaboot-22.8-r1090/Makefile 2008-07-18 16:05:25.000000000 +0200 +++ new/yaboot-22.8-r1092/Makefile 2008-07-25 10:53:42.000000000 +0200 @@ -6,7 +6,7 @@ include Config -VERSION = 22.8-r1090 +VERSION = 22.8-r1092 # Debug mode (spam/verbose) DEBUG = 0 # make install vars diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-22.8-r1090/second/fs_of.c new/yaboot-22.8-r1092/second/fs_of.c --- old/yaboot-22.8-r1090/second/fs_of.c 2008-07-07 15:26:09.000000000 +0200 +++ new/yaboot-22.8-r1092/second/fs_of.c 2008-07-22 13:29:51.000000000 +0200 @@ -97,6 +97,7 @@ static int of_net_download(unsigned char **buffer, ihandle of_device) { + int ms; int ret = LOAD_BUFFER_TRIES; unsigned char *p, *mem = (unsigned char *)LOAD_BUFFER_BASE; @@ -115,12 +116,25 @@ goto out; } memset(p, 0, LOAD_BUFFER_SIZE); + ms = prom_getms(); DEBUG_F("TFTP...\n"); ret = prom_loadmethod(of_device, p); DEBUG_F("result: %d\n", ret); if (ret > 0) { *buffer = p; - prom_printf("yaboot downloaded %08x bytes via network\n", ret); + ms = prom_getms() - ms; + if (ms < 1000) { + ms = 1000 / ms; + ms *= ret; + } else { + ms /= 1000; + ms = ret / ms; + } + ms /= 1000; + prom_printf("yaboot downloaded %08x bytes via network, download rate %d KB/s.\n", ret, ms); + if (ms > 42 && ms < 666) + prom_printf("\n A download rate of %d KB/s is really slow, isn't it? \n\n", ms); + } else prom_release(p, LOAD_BUFFER_SIZE); out: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-22.8-r1090/second/parse_device_path.c new/yaboot-22.8-r1092/second/parse_device_path.c --- old/yaboot-22.8-r1090/second/parse_device_path.c 2008-07-18 16:04:38.000000000 +0200 +++ new/yaboot-22.8-r1092/second/parse_device_path.c 2008-07-22 15:17:16.000000000 +0200 @@ -1,4 +1,4 @@ -/* $Id: parse_device_path.c 1090 2008-07-18 14:04:38Z olh $ */ +/* $Id: parse_device_path.c 1092 2008-07-22 13:17:16Z olh $ */ #ifndef DEVPATH_TEST #include <errors.h> #include <file.h> @@ -303,7 +303,7 @@ prom_printf("%s\n", __FUNCTION__); #endif if (!result->u.n.ip_before_filename) - return; + goto out; p = result->u.n.ip_before_filename; @@ -345,9 +345,9 @@ *p = '\0'; p++; result->u.n.ip_after_filename = p; - hack_boot_path_for_CAS(result); } out: + hack_boot_path_for_CAS(result); return; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org