Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at Thu Feb 4 09:11:29 CET 2010. -------- --- mkinitrd/mkinitrd.changes 2010-01-25 16:20:53.000000000 +0100 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2010-01-27 15:20:50.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Jan 27 14:59:02 CET 2010 - mmarek@suse.cz + +- scripts/setup-modules.sh: fix for module options in /proc/cmdline + (bnc#567868, bnc#574261). + +------------------------------------------------------------------- +Tue Jan 26 16:58:03 CET 2010 - eich@freedesktop.org + +- Bail out of kms setup if no pci devices can be found (bnc#573454). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.tQ8sa9/_old 2010-02-04 09:11:08.000000000 +0100 +++ /var/tmp/diff_new_pack.tQ8sa9/_new 2010-02-04 09:11:08.000000000 +0100 @@ -26,7 +26,7 @@ Requires: coreutils modutils util-linux grep gzip sed cpio udev sysvinit file perl-Bootloader AutoReqProv: on Version: 2.5.10 -Release: 8 +Release: 9 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/build_rpm new/mkinitrd-2.5.10/build_rpm --- old/mkinitrd-2.5.10/build_rpm 2010-01-25 16:06:10.000000000 +0100 +++ new/mkinitrd-2.5.10/build_rpm 2010-01-27 15:19:31.000000000 +0100 @@ -3,7 +3,7 @@ # Build a mkinitrd source rpm # -DESTDIR="/tmp/mkinitrd" +DESTDIR="mkinitrd" uncommitted_changes=0 while [ $# -gt 0 ] ; do @@ -12,7 +12,7 @@ DESTDIR=$2; shift 2; ;; - --destdir) + --destdir=*) DESTDIR=${$1#*=}; shift; ;; @@ -49,30 +49,19 @@ fi if [ -z "$BRANCH" ] ; then - BRANCH="master" - echo "Branch is not set, checking out from $BRANCH" -fi - -if [ -d "$DESTDIR" ] ; then - if [ -z "$force" ] ; then - echo "directory $DESTDIR exists, cannot continue" - exit 1 - else - if ! rm -rf "$DESTDIR" ; then - echo "Cannot remove directory $DESTDIR" - exit 1 - fi + BRANCH=$(sed -n 's|^ref: refs/heads/||p' .git/HEAD) + if test -z "$BRANCH"; then + BRANCH=HEAD fi + echo "Branch is not set, checking out from $BRANCH" fi - -if ! git branch | grep -q "$BRANCH" ; then +if ! git rev-parse "$BRANCH" >/dev/null; then echo "Branch "$BRANCH" does not exist" exit 1 -else - echo "Checking out from $BRANCH" fi -if ! mkdir $DESTDIR ; then +rm -f "$DESTDIR"/* +if ! mkdir -p $DESTDIR ; then echo "Cannot create directory $DESTDIR" exit 1 fi 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-01-25 16:06:10.000000000 +0100 +++ new/mkinitrd-2.5.10/mkinitrd.changes 2010-01-27 15:19:31.000000000 +0100 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Wed Jan 27 14:59:02 CET 2010 - mmarek@suse.cz + +- scripts/setup-modules.sh: fix for module options in /proc/cmdline + (bnc#567868, bnc#574261). + +------------------------------------------------------------------- +Tue Jan 26 16:58:03 CET 2010 - eich@freedesktop.org + +- Bail out of kms setup if no pci devices can be found (bnc#573454). + +------------------------------------------------------------------- Mon Jan 25 16:03:04 CET 2010 - eich@freedesktop.org - Add support for KMS. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/setup-kms.sh new/mkinitrd-2.5.10/scripts/setup-kms.sh --- old/mkinitrd-2.5.10/scripts/setup-kms.sh 2010-01-25 16:06:10.000000000 +0100 +++ new/mkinitrd-2.5.10/scripts/setup-kms.sh 2010-01-27 15:19:31.000000000 +0100 @@ -71,14 +71,18 @@ local line local n tmp local ct=0 + local ret=1 declare -a entries OFS=$IFS IFS=" " - for line in $(lspci -mn) + [ -d /sys/bus/pci ] && [ -x /sbin/lspci ] || return 1 + + for line in $(/sbin/lspci -mn 2>/dev/null) do unset entries + ret=0 m_if[$ct]=00 n=0 IFS=$OFS @@ -104,6 +108,7 @@ ct=$(( $ct + 1 )) done IFS=$OFS + return $ret } # @@ -186,7 +191,8 @@ for i in /lib/modules/$kver/kernel/drivers/char/agp/*.ko do i=${i##*/} - agps="$agps ${i%.ko}" + i=${i%.ko} + [ "$i" != "*" ] && agps="$agps $i" done echo "$agps" } @@ -238,9 +244,8 @@ ################## end of functions ###################### -if [ "$NO_KMS_IN_INITRD" != "yes" ] +if [ "$NO_KMS_IN_INITRD" != "yes" ] && pciids_on_system then - pciids_on_system gfx_modules=$(class_drivers $kernel_version $supported_classes) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/setup-modules.sh new/mkinitrd-2.5.10/scripts/setup-modules.sh --- old/mkinitrd-2.5.10/scripts/setup-modules.sh 2010-01-25 16:06:10.000000000 +0100 +++ new/mkinitrd-2.5.10/scripts/setup-modules.sh 2010-01-27 15:19:31.000000000 +0100 @@ -256,7 +256,7 @@ echo \ "WARNING: no dependencies for kernel module '$module' found." >&2 fi - module_list=$(echo "$module_list" | sed -rn 's/^insmod +//p') + module_list=$(echo "$module_list" | sed -rn 's/^insmod +([^ ]+).*/\1/p') for mod in $module_list ; do if ! $(echo $resolved_modules | grep -q $mod) ; then resolved_modules="$resolved_modules $mod" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org