Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at Fri May 14 00:55:10 CEST 2010. -------- --- installation-images/installation-images.changes 2010-05-07 13:37:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/installation-images/installation-images.changes 2010-05-11 12:22:15.000000000 +0200 @@ -1,0 +2,18 @@ +Tue May 11 12:21:36 CEST 2010 - snwint@suse.de + +- added xkbctrl (bnc #601587) + +------------------------------------------------------------------- +Mon May 10 18:37:11 CEST 2010 - snwint@suse.de + +- audit-libs is now libaudit1 +- new kernel modules +- vbox adjustments (bnc #593326) +- removed hal +- allow kmps to have a different version than kernel +- removed brocade-bfa kmp +- moved all udev rules to initrd (bnc #592378) +- moved some packages from instsys to initrd +- rpm2cpio now needs rc file + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- installation-images-12.51.tar.bz2 needed_space_in_mb new.patch New: ---- installation-images-12.53.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.9r6DBI/_old 2010-05-14 00:54:44.000000000 +0200 +++ /var/tmp/diff_new_pack.9r6DBI/_new 2010-05-14 00:54:44.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package installation-images (Version 12.51) +# spec file for package installation-images (Version 12.53) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,7 +30,7 @@ #BuildRequires: tightvnc BuildRequires: bzip2 cracklib cracklib-dict-full curl libcap libexpat1 libfuse2 libreiserfs libreiserfs-devel librpcsecgss module-init-tools nfs-client ntfs-3g parted procinfo procps psmisc satsolver-tools squashfs strace vim xntp xz yast2-devtools BuildRequires: alsa alsa-utils bind-libs bind-utils chkrootkit espeak lsscsi openldap2-client portaudio portmap python rpcbind sdparm smp_utils uuid-runtime xorg-x11-xauth yast2-multipath -BuildRequires: btrfsprogs cairo graphviz graphviz-gnome kernel-default kernel-firmware libiw30 pango sax2-tools unscd valgrind wireless-tools wpa_supplicant yast2-qt-graph +BuildRequires: btrfsprogs cairo graphviz graphviz-gnome kernel-default kernel-firmware libiw30 pango sax2-ident sax2-tools unscd valgrind wireless-tools wpa_supplicant yast2-qt-graph # kmps %ifarch %ix86 x86_64 BuildRequires: atmel-firmware dos2unix ftp ipw-firmware ncpfs opensc tftp @@ -58,7 +58,7 @@ BuildRequires: kernel-ppc64 %endif %ifarch %ix86 x86_64 -BuildRequires: acpica dhcp-client dmidecode elilo firmwarekit grub libsmbios2 libunwind lilo memtest86+ syslinux virtualbox-ose-guest-kmp-default xorg-x11-driver-virtualbox-ose yast2-vm +BuildRequires: acpica dhcp-client dmidecode elilo firmwarekit grub libsmbios2 libunwind lilo memtest86+ syslinux virtualbox-ose-guest-kmp-default virtualbox-ose-guest-tools xorg-x11-driver-virtualbox-ose yast2-vm %endif %ifarch %ix86 BuildRequires: dos2unix ftp ncpfs tftp @@ -103,10 +103,9 @@ Obsoletes: y2image AutoReqProv: off Summary: Installation Image Files -Version: 12.51 -Release: 2 -Source: installation-images-12.51.tar.bz2 -Patch0: new.patch +Version: 12.53 +Release: 1 +Source: installation-images-12.53.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -176,7 +175,6 @@ %prep %setup -%patch0 -p1 rm -f /usr/lib/build/checks/04-check-filelist %build ++++++ installation-images-12.51.tar.bz2 -> installation-images-12.53.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.51/VERSION new/installation-images-12.53/VERSION --- old/installation-images-12.51/VERSION 2010-04-27 16:54:13.000000000 +0200 +++ new/installation-images-12.53/VERSION 2010-05-11 12:21:32.000000000 +0200 @@ -1 +1 @@ -12.51 +12.53 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.51/changelog new/installation-images-12.53/changelog --- old/installation-images-12.51/changelog 2010-04-27 16:54:16.000000000 +0200 +++ new/installation-images-12.53/changelog 2010-05-11 12:21:35.000000000 +0200 @@ -1,4 +1,18 @@ -2010-04-27: HEAD +2010-05-11: 12.53 + - added xkbctrl (bnc #601587) + +2010-05-10: 12.52 + - audit-libs is now libaudit1 + - new kernel modules + - vbox adjustments (bnc #593326) + - removed hal + - allow kmps to have a different version than kernel + - removed brocade-bfa kmp + - moved all udev rules to initrd (bnc #592378) + - moved some packages from instsys to initrd + - rpm2cpio now needs rc file + +2010-04-27: 12.51 - get cache directory working again - mdadm has udev rules now (bnc #599209) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.51/data/base/base.file_list new/installation-images-12.53/data/base/base.file_list --- old/installation-images-12.51/data/base/base.file_list 2010-04-27 12:43:23.000000000 +0200 +++ new/installation-images-12.53/data/base/base.file_list 2010-05-10 12:42:59.000000000 +0200 @@ -267,7 +267,7 @@ pam: /{etc,lib*,sbin} -audit-libs: +libaudit*: /lib*/libaudit.so.* libldap-2_4-2: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.51/data/initrd/biostest.file_list new/installation-images-12.53/data/initrd/biostest.file_list --- old/installation-images-12.51/data/initrd/biostest.file_list 2010-04-27 12:43:23.000000000 +0200 +++ new/installation-images-12.53/data/initrd/biostest.file_list 2010-05-10 12:45:10.000000000 +0200 @@ -56,13 +56,6 @@ /usr/lib*/libopensc.so.* /usr/lib*/libscconf.so.* -# FIXME -if exists(libopenssl*~) - libopenssl*~: - /usr/lib*/libcrypto.so.* - /usr/lib*/libssl.so.* -endif - krb5: /etc /usr/lib*/libkrb5.so.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.51/data/initrd/initrd.file_list new/installation-images-12.53/data/initrd/initrd.file_list --- old/installation-images-12.51/data/initrd/initrd.file_list 2010-04-27 12:43:23.000000000 +0200 +++ new/installation-images-12.53/data/initrd/initrd.file_list 2010-05-10 16:00:27.000000000 +0200 @@ -1,7 +1,7 @@ d bin dev etc mnt proc sys tmp d var/run var/spool var/lock/libstorage var/tmp var/log/YaST2 var/adm/mount d var/lib/YaST2 var/lib/dhcpcd var/lib/hardware/unique-keys var/lib/autoinstall -d var/run/dbus var/run/hal var/run/hotplug var/cache/fontconfig +d var/run/dbus var/run/hotplug var/cache/fontconfig d var/lib/sshd var/lib/empty var/run/ntp var/lib/rpcbind d var/cache/sax/files var/cache/sax/sysp/rdbms var/cache/xfine var/lib/sax @@ -68,11 +68,6 @@ e prein e restore_cfg etc/passwd etc/shadow etc/group -hal: prein - e save_cfg etc/passwd etc/shadow etc/group - e prein - e restore_cfg etc/passwd etc/shadow etc/group - openssh: prein e save_cfg etc/passwd etc/shadow etc/group e prein @@ -227,7 +222,7 @@ pam: /lib*/libpam.so.* - audit-libs: + libaudit*: /lib*/libaudit.so.* cups-libs: @@ -370,10 +365,6 @@ dbus-1: /lib*/libdbus-1.so.* -hal: - /usr/lib*/libhal.so.* - /var/cache/hald - libusb-0_1-4: /usr/lib* @@ -479,9 +470,7 @@ /bin/uname pcmciautils: - /etc/udev/rules.d/60-pcmcia.rules - /etc/pcmcia/config.opts - /lib/udev/pcmcia-socket-startup + / bash: /bin/{sh,bash} @@ -596,7 +585,6 @@ /lib/udev /sbin x etc/myudevstart /bin -r /etc/init.d # add some md devices statically b 9 0 /lib/udev/devices/md0 b 9 1 /lib/udev/devices/md1 @@ -616,7 +604,6 @@ b 9 15 /lib/udev/devices/md15 # our own rules file which loads only pnp subsystem mods -# r /etc/udev/rules.d/*-drivers.rules x etc/80-drivers.rules /lib/udev/80-drivers.rules.no_modprobe sysconfig: @@ -645,6 +632,7 @@ rpm: /usr/bin/rpm2cpio /usr/lib*/librpm{,io}.so.* + /usr/lib/rpm/rpmrc liblzma0: /lib*/liblzma.so.* @@ -705,6 +693,11 @@ # remaining files are in root image /var/run/nscd +if exists(virtualbox-ose-guest-tools) + virtualbox-ose-guest-tools: + /etc/udev/rules.d +endif + if exists(xorg-x11-driver-input) xorg-x11-driver-input: /lib/udev/rules.d @@ -723,8 +716,17 @@ endif mdadm: - /sbin - /lib/udev + / + +kpartx: + / + +device-mapper: + / + +multipath-tools: + /etc/udev/rules.d + /var/cache/multipath if 0 @@ -765,52 +767,11 @@ endif -# add hal & dbus -if 0 - - glibc: - /lib*/libpthread{.,-}* - - libxml2: - /usr/lib*/libxml2.so.* - - libexpat1: - /lib*/libexpat.so.* - - glib2: - /usr/lib*/libglib-2.0.so.* - /usr/lib*/libgobject-2.0.so.* - - dbus-1-glib: - /lib*/libdbus-glib-1.so.* - /bin/dbus-monitor - - e cp /etc/{passwd,shadow,group} etc - dbus-1: prein - /etc - /usr/bin/dbus-daemon - - e save_cfg etc/passwd etc/shadow etc/group - e prein - e restore_cfg etc/passwd etc/shadow etc/group - - hal: prein - /etc - /usr/bin/lshal - /usr/sbin/hald* - - e save_cfg etc/passwd etc/shadow etc/group - e prein - e restore_cfg etc/passwd etc/shadow etc/group - - - # + bash for testing - -endif - - : +# remove, ehm, things... +r /usr/share/doc /usr/share/man /var/adm/fillup-templates + x etc/prepare_rescue bin # busybox is mostly broken diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.51/data/rescue/rescue.file_list new/installation-images-12.53/data/rescue/rescue.file_list --- old/installation-images-12.51/data/rescue/rescue.file_list 2010-04-27 12:43:24.000000000 +0200 +++ new/installation-images-12.53/data/rescue/rescue.file_list 2010-05-10 12:42:59.000000000 +0200 @@ -347,7 +347,7 @@ /{etc,lib*,sbin} R s/(pam_unix2.so)\s*$/$1 nullok\n/ /etc/pam.d/common-auth -audit-libs: +libaudit*: /lib*/libaudit.so.* pam-modules: @@ -471,13 +471,6 @@ /usr/lib*/libcrypto.so.* /usr/lib*/libssl.so.* -# FIXME -if exists(libopenssl*~) - libopenssl*~: - /usr/lib*/libcrypto.so.* - /usr/lib*/libssl.so.* -endif - cyrus-sasl: /usr/lib*/libsasl2.so.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.51/data/root/etc/inst_setup new/installation-images-12.53/data/root/etc/inst_setup --- old/installation-images-12.51/data/root/etc/inst_setup 2010-04-27 12:43:24.000000000 +0200 +++ new/installation-images-12.53/data/root/etc/inst_setup 2010-05-10 15:51:48.000000000 +0200 @@ -105,11 +105,11 @@ ldconfig -# start dbus & hal -if [ -x /bin/dbus-daemon -a -x /usr/sbin/hald ] ; then - rm -f /var/run/dbus/pid /var/run/hal/haldaemon.pid - echo -n "starting hald..." - if /bin/dbus-daemon --system && /usr/sbin/hald ; then +# start dbus +if [ -x /bin/dbus-daemon ] ; then + rm -f /var/run/dbus/pid + echo -n "starting dbus..." + if /bin/dbus-daemon --system ; then echo " ok" else echo " failed" @@ -259,7 +259,6 @@ rcnscd stop # stop various daemons -killall hald >/dev/null 2>&1 killall dbus-daemon >/dev/null 2>&1 killall slpd >/dev/null 2>&1 killall Xvnc >/dev/null 2>&1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.51/data/root/machbunt.file_list new/installation-images-12.53/data/root/machbunt.file_list --- old/installation-images-12.51/data/root/machbunt.file_list 2010-04-27 12:43:24.000000000 +0200 +++ new/installation-images-12.53/data/root/machbunt.file_list 2010-05-11 11:44:01.000000000 +0200 @@ -312,6 +312,10 @@ sax2-tools: /usr/sbin/testX + /usr/sbin/xkbctrl + +sax2-ident: + /usr/share/sax/sysp/maps/Keyboard.map vim: m /bin/vim-normal /bin/vim diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.51/data/root/root.file_list new/installation-images-12.53/data/root/root.file_list --- old/installation-images-12.51/data/root/root.file_list 2010-04-27 12:43:24.000000000 +0200 +++ new/installation-images-12.53/data/root/root.file_list 2010-05-10 16:08:21.000000000 +0200 @@ -110,10 +110,6 @@ libudev0: /lib* -udev: - /etc - /sbin - sysfsutils: /lib*/libsysfs.so* @@ -137,12 +133,6 @@ e prein e restore_cfg etc/passwd etc/shadow etc/group -hal: prein - / - e save_cfg etc/passwd etc/shadow etc/group - e prein - e restore_cfg etc/passwd etc/shadow etc/group - if arch eq 'i386' || arch eq 'x86_64' || arch eq 'ia64' libsmbios2: /usr/lib*/libsmbios.so.* @@ -573,8 +563,7 @@ /sbin/vg* device-mapper: - /lib* - /sbin + /<lib> reiserfs: /sbin @@ -697,7 +686,7 @@ /lib* /sbin -audit-libs: +libaudit*: /lib*/libaudit.so.* pam-modules: @@ -756,12 +745,6 @@ libopenssl*: /usr/lib* -# FIXME -if exists(libopenssl*~) - libopenssl*~: - /usr/lib* -endif - openssl: /usr/share/ssl @@ -783,9 +766,6 @@ liblzma0: /lib*/liblzma.so.* -mdadm: - /sbin - iproute2: /sbin/ip @@ -969,9 +949,6 @@ perl-XML-Bare: /usr/lib -pcmciautils: - / - open-iscsi: /sbin /etc/iscsi/iscsid.conf @@ -1004,12 +981,6 @@ libaio: /lib*/libaio.so.* -kpartx: - /etc/udev - /lib/udev - /sbin/kpartx* - /sbin/activate_dm_linear - cryptsetup: /sbin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.51/etc/config new/installation-images-12.53/etc/config --- old/installation-images-12.51/etc/config 2010-04-27 12:43:24.000000000 +0200 +++ new/installation-images-12.53/etc/config 2010-05-10 14:40:32.000000000 +0200 @@ -45,9 +45,8 @@ ; extra kmps we need (',' separated list) [KMP] default = -i386 = brocade-bfa,virtualbox-ose-guest -x86_64 = brocade-bfa,virtualbox-ose-guest -ia64 = brocade-bfa +i386 = virtualbox-ose-guest +x86_64 = virtualbox-ose-guest ; extra firmware packages diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.51/etc/module.config new/installation-images-12.53/etc/module.config --- old/installation-images-12.51/etc/module.config 2010-04-27 12:43:24.000000000 +0200 +++ new/installation-images-12.53/etc/module.config 2010-05-10 14:47:48.000000000 +0200 @@ -307,7 +307,7 @@ eseqiv,-,- krng,-,- md5,-,- -vboxadd,-,- +vboxguest,-,- vboxvideo,-,- async_pq,-,- async_raid6_recov,-,- @@ -1050,6 +1050,7 @@ rtl8150,"RTL8150 USB Ethernet" dm9601,"Davicom DM9601 USB 1.1 Ethernet" smsc95xx,"SMSC95XX USB 2.0 Ethernet" +ipheth,Apple iPhone USB Ethernet gl620a,"GL620-USB-A Host-to-Host Link" net1080,"NetChip 1080 USB Host-to-Host Link" plusb,"Prolific PL-2301/2302 USB Host-to-Host Link" @@ -1106,6 +1107,7 @@ qcaux vivopay-serial,"ViVOpay USB Serial Driver" smsc75xx,"SMSC75XX USB 2.0 Gigabit Ethernet" +sierra_net,USB-to-WWAN Driver for Sierra Wireless modems [FireWire] @@ -1553,11 +1555,7 @@ cdc-phonet phonet ; -vboxdrv -vboxnetadp -vboxnetflt vboxvfs -vboxguest ; ts_bm ts_fsm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.51/lib/ReadConfig.pm new/installation-images-12.53/lib/ReadConfig.pm --- old/installation-images-12.51/lib/ReadConfig.pm 2010-04-27 12:43:24.000000000 +0200 +++ new/installation-images-12.53/lib/ReadConfig.pm 2010-05-10 16:40:50.000000000 +0200 @@ -327,14 +327,21 @@ if(!$err && $rpm->{name} eq $ConfigData{kernel_rpm}) { SUSystem "find $tdir -type d -exec chmod a+rx '{}' \;"; - $_ = <$tdir/lib/modules/*>; - if(-d) { - s#.*/##; + my $kv; + + $kv = <$tdir/lib/modules/*>; + + if(-d $kv) { + $kv =~ s#.*/##; open $f, ">$dir/kernel"; - print $f $_; + print $f $kv; close $f; } - + else { + $err = 1; + undef $kv; + } + UnpackRPM RealRPM("$rpm-base"), $tdir; UnpackRPM RealRPM("$rpm-extra"), $tdir; @@ -352,6 +359,15 @@ # keep it readable SUSystem "find $tdir -type d -exec chmod a+rx '{}' \;"; + + # if kmp version differs, copy files to real kernel tree + for (<$tdir/lib/modules/*>) { + s#.*/##; + next if $_ eq $kv; + print "warning: kmp/firmware version mismatch: $_\n"; + SUSystem "sh -c 'tar -C $tdir/lib/modules/$_ -cf - . | tar -C $tdir/lib/modules/$kv -xf -'"; + } + } return $err ? undef : $dir; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org