Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at Fri Mar 26 01:06:36 CET 2010. -------- --- mkinitrd/mkinitrd.changes 2010-03-16 13:25:53.000000000 +0100 +++ mkinitrd/mkinitrd.changes 2010-03-25 14:59:28.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Mar 25 14:35:24 CET 2010 - mmarek@suse.cz + +- setup-block: catch "(null)" in /sys/class/scsi_host/*/proc_name + (bnc#590918). + +------------------------------------------------------------------- +Wed Mar 17 13:18:03 CET 2010 - mmarek@suse.cz + +- setup-sharedlibs.sh: Do not run ldd on scripts (bnc#588609). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.z4HxLB/_old 2010-03-26 01:05:35.000000000 +0100 +++ /var/tmp/diff_new_pack.z4HxLB/_new 2010-03-26 01:05:35.000000000 +0100 @@ -31,7 +31,7 @@ %endif AutoReqProv: on Version: 2.5.10 -Release: 13 +Release: 14 Conflicts: udev < 118 Requires: dhcpcd Summary: Creates an Initial RAM Disk Image for Preloading Modules ++++++ mkinitrd.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/mkinitrd.changes new/mkinitrd-2.5.10/mkinitrd.changes --- old/mkinitrd-2.5.10/mkinitrd.changes 2010-03-16 13:24:46.000000000 +0100 +++ new/mkinitrd-2.5.10/mkinitrd.changes 2010-03-25 14:36:03.000000000 +0100 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Thu Mar 25 14:35:24 CET 2010 - mmarek@suse.cz + +- setup-block: catch "(null)" in /sys/class/scsi_host/*/proc_name + (bnc#590918). + +------------------------------------------------------------------- +Wed Mar 17 13:18:03 CET 2010 - mmarek@suse.cz + +- setup-sharedlibs.sh: Do not run ldd on scripts (bnc#588609). + +------------------------------------------------------------------- Fri Mar 12 12:07:11 CET 2010 - coolo@suse.de - support upstart in providing a file with the initrd exports. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/boot-killudev.sh new/mkinitrd-2.5.10/scripts/boot-killudev.sh --- old/mkinitrd-2.5.10/scripts/boot-killudev.sh 2010-03-16 13:24:46.000000000 +0100 +++ new/mkinitrd-2.5.10/scripts/boot-killudev.sh 2010-03-25 14:36:03.000000000 +0100 @@ -14,6 +14,6 @@ ## # kill udevd, we will run the one from the real root -/sbin/udevsettle +wait_for_events kill $(pidof udevd) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/setup-block.sh new/mkinitrd-2.5.10/scripts/setup-block.sh --- old/mkinitrd-2.5.10/scripts/setup-block.sh 2010-03-16 13:24:46.000000000 +0100 +++ new/mkinitrd-2.5.10/scripts/setup-block.sh 2010-03-25 14:36:03.000000000 +0100 @@ -42,10 +42,11 @@ fi procname=$(cat /sys/class/scsi_host/host$hostnum/proc_name) # some drivers do not include proc_name so we need a fallback - if [ "$procname" = "<NULL>" ] ; then + case "$procname" in + "<NULL>" | "(null)") procname="$(readlink /sys/class/scsi_host/host${hostnum}/device/../driver)" procname="${procname##*/}" - fi + esac # let's see if that driver is on libata if [ -L "/sys/module/libata/holders/$procname" ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/setup-sharedlibs.sh new/mkinitrd-2.5.10/scripts/setup-sharedlibs.sh --- old/mkinitrd-2.5.10/scripts/setup-sharedlibs.sh 2010-03-16 13:24:46.000000000 +0100 +++ new/mkinitrd-2.5.10/scripts/setup-sharedlibs.sh 2010-03-25 14:36:03.000000000 +0100 @@ -5,21 +5,30 @@ # # copy shared libraries to the initrd (dynamically resolved) -# Resolve dynamic library dependencies. Returns a list of symbolic links -# to shared objects and shared object files for the binaries in $*. -shared_object_files() { - local LDD CHROOT initrd_libs lib_files lib_links lib link +# helper +ldd_files() { + local LDD file LDD=/usr/bin/ldd if [ ! -x $LDD ]; then error 2 "I need $LDD." fi - initrd_libs=( $( - for i in "$@" ; do $LDD "$i" ; done \ - | sed -ne 's:\t\(.* => \)\?\(/.*\) (0x[0-9a-f]*):\2:p' \ - | sort | uniq - ) ) + for file; do + if file -b "$file" | grep -q ' script '; then + verbose "$file is a script" + continue + fi + $LDD "$file" + done | sed -ne 's:\t\(.* => \)\?\(/.*\) (0x[0-9a-f]*):\2:p' | sort -u +} + +# Resolve dynamic library dependencies. Returns a list of symbolic links +# to shared objects and shared object files for the binaries in $*. +shared_object_files() { + local CHROOT initrd_libs lib_files lib_links lib link + + initrd_libs=( $(ldd_files "$@") ) for lib in "${initrd_libs[@]}"; do case "$lib" in ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org