Hello community,
here is the log from the commit of package lilo
checked in at Fri Mar 14 18:06:23 CET 2008.
--------
--- arch/ppc/lilo/lilo.changes 2008-01-30 12:52:09.000000000 +0100
+++ /mounts/work_src_done/STABLE/lilo/lilo.changes 2008-03-14 17:40:54.000000000 +0100
@@ -1,0 +2,12 @@
+Fri Mar 14 17:38:51 CET 2008 - olh@suse.de
+
+- use udevsettle to wait for all pending background events
+ udev will remove and add identical device nodes at random times
+ (bnc#369834 - LTC43004)
+
+-------------------------------------------------------------------
+Thu Feb 14 11:18:47 CET 2008 - olh@suse.de
+
+- make dtc optional during build
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lilo.spec ++++++
--- /var/tmp/diff_new_pack.l15534/_old 2008-03-14 18:05:59.000000000 +0100
+++ /var/tmp/diff_new_pack.l15534/_new 2008-03-14 18:05:59.000000000 +0100
@@ -10,6 +10,7 @@
# norootforbuild
+
Name: lilo
%define yaboot_vers 10.1.22-r1034
Group: System/Boot
@@ -17,7 +18,9 @@
Summary: The Linux Loader, a Boot Menu
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Obsoletes: yaboot activate quik
+%if 0%{?suse_version} > 1020
BuildRequires: dtc
+%endif
Requires: hfsutils
Requires: dosfstools
Requires: gawk sed coreutils
@@ -25,10 +28,10 @@
Requires: binutils
Requires: parted
Version: 10.1.22
-Release: 94
+Release: 102
Source0: lilo-%{version}.tar.bz2
Source1: http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2
-# $Id: lilo.spec 1040 2008-01-30 08:49:00Z sassmann $
+# $Id: lilo.spec 1046 2008-02-14 10:21:43Z olh $
%description
LILO boots Linux from your hard drive. It can also boot other operating
@@ -157,6 +160,12 @@
%doc %{_docdir}/lilo
%doc %{_mandir}/*/*
%changelog
+* Fri Mar 14 2008 olh@suse.de
+- use udevsettle to wait for all pending background events
+ udev will remove and add identical device nodes at random times
+ (bnc#369834 - LTC43004)
+* Thu Feb 14 2008 olh@suse.de
+- make dtc optional during build
* Wed Jan 30 2008 sassmann@suse.de
- change MCONFIG to search for includes in local directory first
- add make_zimage_ps3.sh to build ps3 zImage
++++++ lilo-10.1.22.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.22/bootheader/ps3/Makefile new/lilo-10.1.22/bootheader/ps3/Makefile
--- old/lilo-10.1.22/bootheader/ps3/Makefile 2008-01-29 16:26:32.000000000 +0100
+++ new/lilo-10.1.22/bootheader/ps3/Makefile 2008-02-14 11:21:43.000000000 +0100
@@ -26,7 +26,13 @@
PS3 := ps3.a
PS3_DTB = ps3.dtb
$(PS3_DTB): ps3.dts
- dtc -O dtb -o ps3.dtb -b 0 -V 16 ps3.dts
+ set -x ; dtc="$$(type -p dtc)" ; \
+ if test "$$dtc" = "" ; then \
+ echo 'dtc was not available while building $@' > $@ ; \
+ else \
+ $$dtc -O dtb -o $@ -b 0 -V 16 $< ; \
+ fi
+
all: $(PS3) $(PS3_DTB)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.22/lilo-chrp.lib new/lilo-10.1.22/lilo-chrp.lib
--- old/lilo-10.1.22/lilo-chrp.lib 2007-07-30 11:09:22.000000000 +0200
+++ new/lilo-10.1.22/lilo-chrp.lib 2008-02-13 11:30:05.000000000 +0100
@@ -1,4 +1,4 @@
-# $Id: lilo-chrp.lib 1005 2007-07-30 09:09:22Z olh $
+# $Id: lilo-chrp.lib 1043 2008-02-13 10:30:05Z olh $
# vim: syntax=sh ts=4
#
# library for CHRP routines
@@ -424,9 +424,6 @@
))
done
- if [ "$fw_workaround" ]; then
- eval $fw_workaround || error "Workaround for broken firmware did not work"
- fi
MKDOSFS="-s $SECSPERCLUSTER -F 16"
if [ -f /etc/fstab ] ; then
# with many FAT partitions, add some hints where the bootloader came from
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.22/lilo.new new/lilo-10.1.22/lilo.new
--- old/lilo-10.1.22/lilo.new 2008-01-07 16:07:39.000000000 +0100
+++ new/lilo-10.1.22/lilo.new 2008-03-14 17:40:54.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/bash
# vim: syntax=sh ts=4
-# $Id: lilo.new 1029 2008-01-07 15:07:39Z olh $
+# $Id: lilo.new 1061 2008-03-14 16:40:54Z olh $
#
# a simple lilo to store the boot loader and the kernel images
# in bash2 ... Think different [tm]
@@ -183,60 +183,59 @@
# argument list consists of a list of msg numbers and custom strings
until [ "$#" = 0 ] ; do
case "$1" in
- 1)
- echo '************************************************************'
- echo '* You must create a PPC PReP Boot partition (type 0x41) or *'
- echo '* a FAT partition for the CHRP bootloader to be installed. *'
- echo '************************************************************'
- ;;
- 2)
- echo '************************************************************'
- echo '* There is more than one PPC PReP Boot (type 0x41) or FAT *'
- echo '* on this system. Please specify the boot partition NUMBER *'
- printf '* in boot= %-30s *\n' $err_var1
- echo '************************************************************'
+ 1)
+ echo '************************************************************'
+ echo '* You must create a PPC PReP Boot partition (type 0x41) or *'
+ echo '* a FAT partition for the CHRP bootloader to be installed. *'
+ echo '************************************************************'
+ ;;
+ 2)
+ echo '************************************************************'
+ echo '* There is more than one PPC PReP Boot (type 0x41) or FAT *'
+ echo '* on this system. Please specify the boot partition NUMBER *'
+ printf '* in boot= %-30s *\n' $err_var1
+ echo '************************************************************'
;;
- 3)
- echo '************************************************************'
+ 3)
+ echo '************************************************************'
echo '* You have to create a PPC PReP Boot partition (type 0x41) *'
echo '* for the kernel binary to be installed. *'
echo '************************************************************'
;;
- 4)
- echo '************************************************************'
- echo '* You have to create a PPC PReP Boot partition (type 0x41) *'
- echo '* for the CHRP bootloader to be installed. *'
- echo '************************************************************'
- ;;
- 5)
- echo '************************************************************'
- echo '* There is more than one PPC PReP Boot partition (type *'
- echo '* 0x41) on this system. Please specify the boot partition *'
- printf '* NUMBER in boot = %-30s *\n' $err_var1
- echo '************************************************************'
+ 4)
+ echo '************************************************************'
+ echo '* You have to create a PPC PReP Boot partition (type 0x41) *'
+ echo '* for the CHRP bootloader to be installed. *'
+ echo '************************************************************'
;;
- 6)
- echo "${_severity}: in config file, no label in section image/other = $err_var1"
+ 5)
+ echo '************************************************************'
+ echo '* There is more than one PPC PReP Boot partition (type *'
+ echo '* 0x41) on this system. Please specify the boot partition *'
+ printf '* NUMBER in boot = %-30s *\n' $err_var1
+ echo '************************************************************'
+ ;;
+ 6)
+ echo "${_severity}: in config file, no label in section image/other = $err_var1"
;;
- 7)
- echo "${_severity}: in config file, $option option must not be in an image/other section!"
+ 7)
+ echo "${_severity}: in config file, $option option must not be in an image/other section!"
;;
- 8)
+ 8)
echo "${_severity}: in config file, $option option has to be in an image/other section!"
;;
- 9)
- echo "${_severity}: in config file, boot = $err_var1 is not 41 PReP"
+ 9)
+ echo "${_severity}: in config file, boot = $err_var1 is not 41 PReP"
;;
- 10)
- echo "${_severity}: in config file, guessing of boot partition failed"
+ 10)
+ echo "${_severity}: in config file, guessing of boot partition failed"
;;
- 11)
+ 11)
echo "${_severity}: parted complains:"
cat $TEMP/parted.log
;;
-
- *) # plain custom string
- echo "${_severity}: $1"
+ *) # plain custom string
+ echo "${_severity}: $1"
;;
esac >&2
shift
@@ -329,11 +328,7 @@
local ret=$?
# wait for pending triggered udev events.
- # until we know how to do better, just wait for _all_ events to finish
- local loop=300 # wait for a maximum of 30sec
- while [ -d /dev/.udev/queue ] && (( loop-- > 0 )); do
- sleep 0.1
- done
+ /sbin/udevsettle --timeout=5
return $ret
}
@@ -865,61 +860,61 @@
}
function check_config_file () {
- local i
- if [ -z $OPTION_BOOT ]; then
- # only pegasos and PS3 do not need boot=
- if [[ "$MACHINE" != @(pegasos|ps3) ]]; then
- error "boot=<partition> is not specified!"
- fi
- else
- if [ "$MACHINE" != "iseries" -a "$MACHINE" != "pegasos" ]; then
- if [ ! -b $OPTION_BOOT ]; then
- error "boot = $OPTION_BOOT is not a valid block device"
- fi
- if [ $OPTION_BOOT_COUNT -ne 1 ]; then
- error "only one boot= line allowed here!"
- fi
- fi
- fi
- if [ "$CONFIG_IMAGE_COUNT" = 0 ] ; then
- error "no image section is specified"
- fi
-
- for (( i=1; i < CONFIG_IMAGE_COUNT; i++ )); do
- if [ -f "${CONFIG_IMAGE_FILE[$i]}" ] ; then
- CONFIG_IMAGE_FILE_DISK_DEVICE[$i]="`collect_path_info disk_name ${CONFIG_IMAGE_FILE[$i]}`"
- CONFIG_IMAGE_FILE_PARTITION_NUMBER[$i]="`collect_path_info partition_number ${CONFIG_IMAGE_FILE[$i]}`"
- CONFIG_IMAGE_FILE_PATH_ON_FILESYSTEM[$i]="`get_relative_path_on_filesystem ${CONFIG_IMAGE_FILE[$i]}`"
+ local i
+ if [ -z $OPTION_BOOT ] ; then
+ # only pegasos and PS3 do not need boot=
+ if [[ "$MACHINE" != @(pegasos|ps3) ]] ; then
+ error "boot=<partition> is not specified!"
+ fi
else
- if [ "${CONFIG_IMAGE_OPTIONAL[$i]}" = "no" -o "${CONFIG_IMAGE_LABEL[$i]}" = "$OPTION_DEFAULT" ] ; then
- error "${CONFIG_IMAGE_LABEL[$i]}: image = ${CONFIG_IMAGE_FILE[$i]}: No such file or directory"
- else
- warning "${CONFIG_IMAGE_LABEL[$i]}: image = ${CONFIG_IMAGE_FILE[$i]}: No such file or directory"
- CONFIG_IMAGE_OPTIONAL[$i]="skip"
- fi
+ if [ "$MACHINE" != "iseries" -a "$MACHINE" != "pegasos" ] ; then
+ if [ ! -b $OPTION_BOOT ] ; then
+ error "boot = $OPTION_BOOT is not a valid block device"
+ fi
+ if [ $OPTION_BOOT_COUNT -ne 1 ] ; then
+ error "only one boot= line allowed here!"
+ fi
+ fi
+ fi
+ if [ "$CONFIG_IMAGE_COUNT" = 0 ] ; then
+ error "no image section is specified"
fi
- if [ ! -z "${CONFIG_IMAGE_INITRD[$i]}" ] ; then
- if [ -f "${CONFIG_IMAGE_INITRD[$i]}" ] ; then
- CONFIG_IMAGE_INITRD_DISK_DEVICE[$i]="`collect_path_info disk_name ${CONFIG_IMAGE_INITRD[$i]}`"
- CONFIG_IMAGE_INITRD_PARTITION_NUMBER[$i]="`collect_path_info partition_number ${CONFIG_IMAGE_INITRD[$i]}`"
- CONFIG_IMAGE_INITRD_PATH_ON_FILESYSTEM[$i]="`get_relative_path_on_filesystem ${CONFIG_IMAGE_INITRD[$i]}`"
+
+ for (( i=1; i < CONFIG_IMAGE_COUNT; i++ )) ; do
+ if [ -f "${CONFIG_IMAGE_FILE[$i]}" ] ; then
+ CONFIG_IMAGE_FILE_DISK_DEVICE[$i]="`collect_path_info disk_name ${CONFIG_IMAGE_FILE[$i]}`"
+ CONFIG_IMAGE_FILE_PARTITION_NUMBER[$i]="`collect_path_info partition_number ${CONFIG_IMAGE_FILE[$i]}`"
+ CONFIG_IMAGE_FILE_PATH_ON_FILESYSTEM[$i]="`get_relative_path_on_filesystem ${CONFIG_IMAGE_FILE[$i]}`"
else
- if [ "${CONFIG_IMAGE_OPTIONAL[$i]}" = "no" -o "${CONFIG_IMAGE_LABEL[$i]}" = "$OPTION_DEFAULT" ] ; then
- error "${CONFIG_IMAGE_LABEL[$i]}: initrd = ${CONFIG_IMAGE_INITRD[$i]}: No such file or directory"
- else
- warning "${CONFIG_IMAGE_LABEL[$i]}: initrd = ${CONFIG_IMAGE_INITRD[$i]}: No such file or directory"
+ if [ "${CONFIG_IMAGE_OPTIONAL[$i]}" = "no" -o "${CONFIG_IMAGE_LABEL[$i]}" = "$OPTION_DEFAULT" ] ; then
+ error "${CONFIG_IMAGE_LABEL[$i]}: image = ${CONFIG_IMAGE_FILE[$i]}: No such file or directory"
+ else
+ warning "${CONFIG_IMAGE_LABEL[$i]}: image = ${CONFIG_IMAGE_FILE[$i]}: No such file or directory"
CONFIG_IMAGE_OPTIONAL[$i]="skip"
- fi
+ fi
fi
- fi
- done
+ if [ ! -z "${CONFIG_IMAGE_INITRD[$i]}" ] ; then
+ if [ -f "${CONFIG_IMAGE_INITRD[$i]}" ] ; then
+ CONFIG_IMAGE_INITRD_DISK_DEVICE[$i]="`collect_path_info disk_name ${CONFIG_IMAGE_INITRD[$i]}`"
+ CONFIG_IMAGE_INITRD_PARTITION_NUMBER[$i]="`collect_path_info partition_number ${CONFIG_IMAGE_INITRD[$i]}`"
+ CONFIG_IMAGE_INITRD_PATH_ON_FILESYSTEM[$i]="`get_relative_path_on_filesystem ${CONFIG_IMAGE_INITRD[$i]}`"
+ else
+ if [ "${CONFIG_IMAGE_OPTIONAL[$i]}" = "no" -o "${CONFIG_IMAGE_LABEL[$i]}" = "$OPTION_DEFAULT" ] ; then
+ error "${CONFIG_IMAGE_LABEL[$i]}: initrd = ${CONFIG_IMAGE_INITRD[$i]}: No such file or directory"
+ else
+ warning "${CONFIG_IMAGE_LABEL[$i]}: initrd = ${CONFIG_IMAGE_INITRD[$i]}: No such file or directory"
+ CONFIG_IMAGE_OPTIONAL[$i]="skip"
+ fi
+ fi
+ fi
+ done
#
# loop for multiple OPTION_BOOT entries
#
- for (( i=0; i