Hello community, here is the log from the commit of package installation-images checked in at Tue Sep 30 15:31:53 CEST 2008. -------- --- installation-images/installation-images.changes 2008-09-30 11:26:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/installation-images/installation-images.changes 2008-09-30 15:25:45.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 30 15:25:41 CEST 2008 - snwint@suse.de + +- yast2-theme-SLED -> *-SLE +- adapt to split kernel package + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- installation-images-11.19.dif installation-images-11.19.tar.bz2 New: ---- installation-images-11.20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.W17495/_old 2008-09-30 15:30:47.000000000 +0200 +++ /var/tmp/diff_new_pack.W17495/_new 2008-09-30 15:30:47.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package installation-images (Version 11.19) +# spec file for package installation-images (Version 11.20) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,6 +29,7 @@ BuildRequires: Mesa tightvnc xkeyboard-config xmset xorg-x11 xorg-x11-Xnest xorg-x11-Xvfb xorg-x11-fonts xorg-x11-fonts-core xorg-x11-libICE xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau xorg-x11-libXdmcp xorg-x11-libXext xorg-x11-libXfixes xorg-x11-libXmu xorg-x11-libXp xorg-x11-libXpm xorg-x11-libXrender xorg-x11-libXt xorg-x11-libfontenc xorg-x11-libxcb xorg-x11-libxkbfile xorg-x11-server xterm BuildRequires: bzip2 cracklib cracklib-dict-full curl libcap libexpat1 libfuse2 libreiserfs libreiserfs-devel lzma module-init-tools nfs-client ntfs-3g parted procinfo procps psmisc satsolver-tools squashfs strace vim xntp 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: kernel-default-extra # kmps %ifarch %ix86 x86_64 BuildRequires: atmel-firmware ipw-firmware iwl3945-ucode iwl4965-ucode iwl5000-ucode ralink-firmware wireless-tools wpa_supplicant @@ -45,7 +46,7 @@ %endif %ifarch ppc ppc64 BuildRequires: librtas lilo pdisk powerpc-utils -BuildRequires: petitboot +BuildRequires: kernel-ppc64-extra petitboot %endif %ifarch %ix86 x86_64 BuildRequires: dhcp-client elilo firmwarekit grub libsmbios2 libunwind lilo memtest86+ pmtools syslinux xorg-x11-driver-virtualbox-ose yast2-vm @@ -89,12 +90,11 @@ Obsoletes: y2image AutoReqProv: off Summary: Installation Image Files -Version: 11.19 -Release: 2 -Source: installation-images-11.19.tar.bz2 +Version: 11.20 +Release: 1 +Source: installation-images-11.20.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio -Patch: installation-images-11.19.dif %description Installation image files (boot and module disks, root image, and @@ -108,7 +108,7 @@ AutoReqProv: off Summary: Create initrd for Installation Version: 1.0 -Release: 462 +Release: 463 %description -n install-initrd You can create an initrd for installation. Useful, for example, to set @@ -173,6 +173,9 @@ /usr/sbin/mkinstallinitrd %changelog +* Tue Sep 30 2008 snwint@suse.de +- yast2-theme-SLED -> *-SLE +- adapt to split kernel package * Tue Sep 30 2008 kukuk@suse.de - yast2-theme-SLED -> yast2-theme-SLE * Mon Sep 29 2008 snwint@suse.de ++++++ installation-images-11.19.tar.bz2 -> installation-images-11.20.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.19/Changelog new/installation-images-11.20/Changelog --- old/installation-images-11.19/Changelog 2008-09-29 16:59:14.000000000 +0200 +++ new/installation-images-11.20/Changelog 2008-09-30 14:54:34.000000000 +0200 @@ -1,3 +1,7 @@ +30/9/2008: v11.20 + - yast2-theme-SLED -> *-SLE + - adapt to split kernel package + 29/9/2008: v11.19 - added uname (bnc #429917) - look for driver updates on usb media (bnc #363650) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.19/data/initrd/initrd.file_list new/installation-images-11.20/data/initrd/initrd.file_list --- old/installation-images-11.19/data/initrd/initrd.file_list 2008-09-29 16:38:35.000000000 +0200 +++ new/installation-images-11.20/data/initrd/initrd.file_list 2008-09-30 15:00:53.000000000 +0200 @@ -443,7 +443,7 @@ pcmciautils: /etc/udev/rules.d/60-pcmcia.rules /etc/pcmcia/config.opts - /sbin/pcmcia-socket-startup + /lib/udev/pcmcia-socket-startup bash: /bin/{sh,bash} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.19/data/rescue/rescue.file_list new/installation-images-11.20/data/rescue/rescue.file_list --- old/installation-images-11.19/data/rescue/rescue.file_list 2008-09-29 16:13:02.000000000 +0200 +++ new/installation-images-11.20/data/rescue/rescue.file_list 2008-09-30 15:09:06.000000000 +0200 @@ -545,7 +545,7 @@ /etc /lib*/libgssglue.so.* -libevent: +libevent-1_4-2: /usr/lib*/libevent-*.so.* if arch eq 'ppc' || arch eq 'ppc64' diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.19/data/root/SLED.file_list new/installation-images-11.20/data/root/SLED.file_list --- old/installation-images-11.19/data/root/SLED.file_list 2008-09-29 16:57:17.000000000 +0200 +++ new/installation-images-11.20/data/root/SLED.file_list 2008-09-30 12:40:35.000000000 +0200 @@ -2,9 +2,9 @@ desktop-data-openSUSE: /usr/share/desktop-data/qtrc -yast2-theme-SLED: +yast2-theme-SLE: / - s SLED usr/share/YaST2/theme/current + s SLE usr/share/YaST2/theme/current include texts.file_list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.19/data/root/SLES.file_list new/installation-images-11.20/data/root/SLES.file_list --- old/installation-images-11.19/data/root/SLES.file_list 2008-09-29 16:58:27.000000000 +0200 +++ new/installation-images-11.20/data/root/SLES.file_list 2008-09-30 12:40:35.000000000 +0200 @@ -2,9 +2,9 @@ desktop-data-openSUSE: /usr/share/desktop-data/qtrc -yast2-theme-SLED: +yast2-theme-SLE: / - s SLED usr/share/YaST2/theme/current + s SLE usr/share/YaST2/theme/current include texts.file_list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.19/data/root/texts.file_list new/installation-images-11.20/data/root/texts.file_list --- old/installation-images-11.19/data/root/texts.file_list 2008-09-16 17:23:59.000000000 +0200 +++ new/installation-images-11.20/data/root/texts.file_list 2008-09-30 15:22:53.000000000 +0200 @@ -1,10 +1,3 @@ -desktop-data-openSUSE: - /usr/share/desktop-data/qtrc - -yast2-theme-openSUSE: - / - s openSUSE usr/share/YaST2/theme/current - d etc x /etc/motd /etc x /etc/issue /etc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.19/etc/module.config new/installation-images-11.20/etc/module.config --- old/installation-images-11.19/etc/module.config 2008-09-19 15:08:54.000000000 +0200 +++ new/installation-images-11.20/etc/module.config 2008-09-30 15:05:13.000000000 +0200 @@ -1143,3 +1143,6 @@ mbp_nvidia_bl platform_lcd vgg2432a4 +fcoe +libfc + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.19/lib/AddFiles.pm new/installation-images-11.20/lib/AddFiles.pm --- old/installation-images-11.19/lib/AddFiles.pm 2008-09-19 12:35:10.000000000 +0200 +++ new/installation-images-11.20/lib/AddFiles.pm 2008-09-30 14:53:13.000000000 +0200 @@ -379,6 +379,24 @@ warn "$Script: failed to extract $r"; if($p eq $ConfigData{kernel_rpm}) { + my $r2 = RPMFileName "$p-base"; + if($r2 && -f $r2) { + SUSystem "sh -c 'cd $tdir ; rpm2cpio $r2 | cpio --quiet --sparse -dimu --no-absolute-filenames'" and + warn "$Script: failed to extract $r2"; + } + else { + print STDERR "$Script: no such package: ${p}-base.rpm\n"; + } + + $r2 = RPMFileName "$p-extra"; + if($r2 && -f $r2) { + SUSystem "sh -c 'cd $tdir ; rpm2cpio $r2 | cpio --quiet --sparse -dimu --no-absolute-filenames'" and + warn "$Script: failed to extract $r2"; + } + else { + print STDERR "$Script: no such package: ${p}-extra.rpm\n"; + } + my ($kmp, $kmp_name); for $kmp (split(',', $ConfigData{kmp_list})) { ($kmp_name = $p) =~ s/^kernel/$kmp-kmp/; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.19/lib/ReadConfig.pm new/installation-images-11.20/lib/ReadConfig.pm --- old/installation-images-11.19/lib/ReadConfig.pm 2008-09-22 16:40:03.000000000 +0200 +++ new/installation-images-11.20/lib/ReadConfig.pm 2008-09-30 14:51:41.000000000 +0200 @@ -625,6 +625,7 @@ $j = `rpm $i -qf /boot/$_ | head -n 1 | sed 's/-[^-]*-[^-]*\$//'` if -f "$ConfigData{buildroot}/boot/$_"; chomp $j; undef $j if $j =~ /^file /; # avoid "file ... not owned by any package" + $j =~ s/\-base$//; $k_rpms{$_} = $j if $j; if($j && $j eq $ConfigData{kernel_rpm}) { push @k_images2, $_; @@ -651,7 +652,7 @@ $kv = `rpm $i -ql $ConfigData{kernel_rpm} 2>/dev/null | grep -m 1 modules | cut -d / -f 4`; } else { - $i = RPMFileName $ConfigData{kernel_rpm}; + $i = RPMFileName "$ConfigData{kernel_rpm}-base"; my @k_images = KernelImg $ConfigData{kernel_img}, (`rpm -qlp $i 2>/dev/null | grep ^/boot`); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.19/VERSION new/installation-images-11.20/VERSION --- old/installation-images-11.19/VERSION 2008-09-29 15:39:40.000000000 +0200 +++ new/installation-images-11.20/VERSION 2008-09-30 12:40:56.000000000 +0200 @@ -1 +1 @@ -11.19 +11.20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de