Mailinglist Archive: opensuse-commit (769 mails)

< Previous Next >
commit installation-images for openSUSE:Factory
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Tue, 09 Jun 2009 14:01:18 +0200
  • Message-id: <20090609120119.18F6B678161@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package installation-images for
openSUSE:Factory
checked in at Tue Jun 9 14:01:18 CEST 2009.



--------
--- installation-images/installation-images.changes 2009-06-02
17:23:39.000000000 +0200
+++
/mounts/work_src_done/STABLE/installation-images/installation-images.changes
2009-06-09 12:36:02.000000000 +0200
@@ -1,0 +2,12 @@
+Tue Jun 9 12:35:38 CEST 2009 - ro@xxxxxxx
+
+- really adjust buildrequires for pmtools split
+
+-------------------------------------------------------------------
+Wed Jun 3 14:48:41 CEST 2009 - snwint@xxxxxxx
+
+- handle firmware files automatically
+- yast2-storage-lib is now libstorage
+- fix Zen theme, enable it for x86_64 (bnc #476443)
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
installation-images-12.5.tar.bz2
needed_space_in_mb

New:
----
installation-images-12.6.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.v29009/_old 2009-06-09 14:01:09.000000000 +0200
+++ /var/tmp/diff_new_pack.v29009/_new 2009-06-09 14:01:09.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package installation-images (Version 12.5)
+# spec file for package installation-images (Version 12.6)
#
# Copyright (c) 2009 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 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: graphviz kernel-default-extra sax2 sax2-ident sax2-tools
yast2-qt-graph
+BuildRequires: graphviz kernel-default-extra kernel-firmware sax2 sax2-ident
sax2-tools yast2-qt-graph
# kmps
%ifarch %ix86 x86_64
BuildRequires: atmel-firmware ipw-firmware iwl3945-ucode iwl4965-ucode
iwl5000-ucode ralink-firmware wireless-tools wpa_supplicant
@@ -53,7 +53,7 @@
BuildRequires: kernel-ppc64-extra powerpc-utils
%endif
%ifarch %ix86 x86_64
-BuildRequires: dhcp-client elilo firmwarekit grub libsmbios2 libunwind lilo
memtest86+ pmtools syslinux virtualbox-ose-kmp-default
xorg-x11-driver-virtualbox-ose yast2-vm
+BuildRequires: acpica dhcp-client dmidecode elilo firmwarekit grub libsmbios2
libunwind lilo memtest86+ syslinux virtualbox-ose-kmp-default
xorg-x11-driver-virtualbox-ose yast2-vm
%endif
%ifarch %ix86
BuildRequires: dos2unix ftp ncpfs tftp
@@ -62,7 +62,7 @@
BuildRequires: glibc-32bit libncurses5-32bit
%endif
%ifarch ia64
-BuildRequires: efibootmgr elilo fpswa ia32el pmtools
+BuildRequires: acpica dmidecode efibootmgr elilo fpswa ia32el
%endif
%ifarch s390 s390x
BuildRequires: kernel-installation-tapeipl yast2-reipl
@@ -99,9 +99,9 @@
Obsoletes: y2image
AutoReqProv: off
Summary: Installation Image Files
-Version: 12.5
+Version: 12.6
Release: 1
-Source: installation-images-12.5.tar.bz2
+Source: installation-images-12.6.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _binary_payload w.ufdio

@@ -118,7 +118,7 @@
AutoReqProv: off
Summary: Create initrd for Installation
Version: 1.0
-Release: 539
+Release: 540
PreReq: /bin/ln

%description -n install-initrd
@@ -264,6 +264,12 @@
%ghost /usr/lib/install-initrd/branding

%changelog
+* Tue Jun 09 2009 ro@xxxxxxx
+- really adjust buildrequires for pmtools split
+* Wed Jun 03 2009 snwint@xxxxxxx
+- handle firmware files automatically
+- yast2-storage-lib is now libstorage
+- fix Zen theme, enable it for x86_64 (bnc #476443)
* Tue Jun 02 2009 snwint@xxxxxxx
- pmtools gets split into dmidecode and acpica -> adjust BuildRequires
and whatever else is needed

++++++ installation-images-12.5.tar.bz2 -> installation-images-12.6.tar.bz2
++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/installation-images-12.5/Changelog
new/installation-images-12.6/Changelog
--- old/installation-images-12.5/Changelog 2009-06-02 17:20:04.000000000
+0200
+++ new/installation-images-12.6/Changelog 2009-06-03 14:23:53.000000000
+0200
@@ -1,3 +1,8 @@
+3/6/2009: v12.6
+ - handle firmware files automatically
+ - yast2-storage-lib is now libstorage
+ - fix Zen theme, enable it for x86_64 (bnc #476443)
+
2/6/2009: v12.5
- take gcc44 libraries
- pmtools gets split into dmidecode and acpica -> adjust BuildRequires
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/installation-images-12.5/data/base/base.file_list
new/installation-images-12.6/data/base/base.file_list
--- old/installation-images-12.5/data/base/base.file_list 2009-06-02
15:22:55.000000000 +0200
+++ new/installation-images-12.6/data/base/base.file_list 2009-06-03
12:30:06.000000000 +0200
@@ -88,7 +88,7 @@

module-init-tools:
/etc
- /sbin/depmod
+ /sbin

procps:
/bin/ps
@@ -314,6 +314,7 @@
x save_cfg bin/save_cfg
x restore_cfg bin/restore_cfg
x unused_mos bin/unused_mos
+x mlist3 bin/mlist3

# run depmod
#E /sbin/depmod -a -F /System.map <kernel_ver> || true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/installation-images-12.5/data/base/mlist3
new/installation-images-12.6/data/base/mlist3
--- old/installation-images-12.5/data/base/mlist3 1970-01-01
01:00:00.000000000 +0100
+++ new/installation-images-12.6/data/base/mlist3 2009-06-03
12:29:46.000000000 +0200
@@ -0,0 +1,43 @@
+#! /usr/bin/perl
+
+$modules_dir = "modules";
+$fw_list = "/tmp/module_firmware";
+
+$kv = shift;
+$fw_dir = shift;
+
+$err = 0;
+
+for $m (<$modules_dir/*>) {
+ chomp $m;
+
+ chomp(@l = `modinfo -F firmware $m`);
+
+ $m =~ s#.*/##;
+ $m =~ s#.ko$##;
+
+ $fw{$m} = [ @l ] if @l;
+}
+
+open F, ">$fw_list";
+print F "$_: ", join(' ', @{$fw{$_}}), "\n" for (sort keys %fw);
+close F;
+
+for $m (sort keys %fw) {
+ for $fw (@{$fw{$m}}) {
+ $f = undef;
+ $f = "$fw" if -f "$fw_dir/$fw";
+ $f = "$kv/$fw" if -f "$fw_dir/$kv/$fw";
+
+ if($f) {
+ system "install -m 644 -D $fw_dir/$f lib/firmware/$f\n";
+ }
+ else {
+ $err = 1;
+ print "missing firmware: $fw ($m.ko)\n";
+ }
+ }
+}
+
+exit $err;
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/installation-images-12.5/data/boot/Zen.file_list
new/installation-images-12.6/data/boot/Zen.file_list
--- old/installation-images-12.5/data/boot/Zen.file_list 1970-01-01
01:00:00.000000000 +0100
+++ new/installation-images-12.6/data/boot/Zen.file_list 2009-06-03
10:04:15.000000000 +0200
@@ -0,0 +1,29 @@
+if arch eq 'i386' || arch eq 'x86_64'
+
+ d loader
+
+ x mk_splash .
+
+ gfxboot-branding-SLES:
+ /
+ e cp -a etc/bootsplash/themes/SLES/cdrom/* loader
+ # e gfxboot --config-file=loader/gfxboot.cfg --change-config
install::dud.url=http://download.opensuse.org/update/11.1/driverupdate
+
+ # mk_splash dst_dir theme config spl_name
+ e ./mk_splash loader SLES 800x600 08000600
+ e ./mk_splash loader SLES 1024x600 10240600
+ e ./mk_splash loader SLES 1024x768 10240768
+ e ./mk_splash loader SLES 1280x800 12800800
+ e ./mk_splash loader SLES 1280x1024 12801024
+ e ./mk_splash loader SLES 1400x1050 14001050
+ e ./mk_splash loader SLES 1680x1050 16801050
+ e ./mk_splash loader SLES 1600x1200 16001200
+ e ./mk_splash loader SLES 1920x1200 19201200
+
+ r mk_splash etc var
+
+ x message-zen loader/message
+ x syslinux-zen.cfg loader/isolinux.cfg
+ R s/product_name/<product_name>/ loader/message
+
+endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/installation-images-12.5/data/initrd/initrd.file_list
new/installation-images-12.6/data/initrd/initrd.file_list
--- old/installation-images-12.5/data/initrd/initrd.file_list 2009-06-02
15:22:55.000000000 +0200
+++ new/installation-images-12.6/data/initrd/initrd.file_list 2009-06-03
14:38:16.000000000 +0200
@@ -374,25 +374,6 @@
bootsplash:
/sbin/splash

- # wlan
- ipw-firmware:
- /lib/firmware
-
- iwl3945-ucode:
- /lib/firmware/iwlwifi-*
-
- iwl4965-ucode:
- /lib/firmware/iwlwifi-*
-
- iwl5000-ucode:
- /lib/firmware/iwlwifi-*
-
- atmel-firmware:
- /lib/firmware
-
- ralink-firmware:
- /lib/firmware
-
wpa_supplicant:
/usr/sbin

@@ -503,17 +484,6 @@
ethtool:
/sbin/ethtool

-qlogic-firmware:
- /lib/firmware
-
-adaptec-firmware:
- /lib/firmware
-
-if exists(cxgb3-firmware)
- cxgb3-firmware:
- /lib/firmware
-endif
-
open-iscsi:
# must be writable
/etc/iscsi/iscsid.conf
@@ -669,6 +639,9 @@
/bin/gzip
/bin/gunzip

+pcre:
+ /lib*/libpcre.so.*
+
if 0
if exists(xen-kmp-default)
xen-kmp-default:
@@ -706,9 +679,6 @@
libgthread-2_0-0:
/

-pcre:
- /usr/lib*/libpcre.so.*
-
dotconf-devel:
/usr/lib*/libdotconf-1.0.so.*

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/installation-images-12.5/data/initrd/modules.file_list
new/installation-images-12.6/data/initrd/modules.file_list
--- old/installation-images-12.5/data/initrd/modules.file_list 2009-06-02
15:22:55.000000000 +0200
+++ new/installation-images-12.6/data/initrd/modules.file_list 2009-06-03
12:31:15.000000000 +0200
@@ -4,6 +4,9 @@

<kernel_rpm>:

+ # temporary
+ L lib/firmware fw
+
/lib/modules/<kernel_ver>/modules.order
e perl -pi -e "s#.*/#initrd/#" lib/modules/<kernel_ver>/modules.order

@@ -68,3 +71,10 @@
e /sbin/depmod -a -b . -F System.map <kernel_ver>
r System.map

+# copy needed firmware files
+d lib/firmware
+e mlist3 <kernel_ver> fw || true
+
+# remove temp firmware dir
+r fw
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/installation-images-12.5/data/initrd/Zen.file_list
new/installation-images-12.6/data/initrd/Zen.file_list
--- old/installation-images-12.5/data/initrd/Zen.file_list 1970-01-01
01:00:00.000000000 +0100
+++ new/installation-images-12.6/data/initrd/Zen.file_list 2009-06-03
10:05:03.000000000 +0200
@@ -0,0 +1,71 @@
+util-linux:
+ /etc
+ r /etc/init.d/nfsboot
+ /usr/{bin,sbin}
+ c 755 0 0 /usr/sbin/klogconsole
+
+gpm:
+ /etc
+ /usr/bin
+ /usr/sbin
+ /usr/lib*
+
+# setup linuxrc.config
+
+e echo "Zen: 2" >>linuxrc.config
+e echo "SetupCmd: "\""setctsid \`showconsole\` /bin/bash -c zenworks.s"\"
linuxrc.config
+
+e echo "KernelPCMCIA: 1" >>linuxrc.config
+
+e echo "UseUSBSCSI: 1" >>linuxrc.config
+e echo "Product: <product_name>" >>linuxrc.config
+e echo "UpdateDir: <update_dir>" >>linuxrc.config
+
+if load_image
+ if arch eq 'i386'
+ e echo "MemLoadImage: 327680" >>linuxrc.config
+ else
+ e echo "MemLoadImage: <load_image>" >>linuxrc.config
+ endif
+endif
+
+if min_memory
+ e echo "MinMemory: <min_memory>" >>linuxrc.config
+endif
+
+if lang
+ e echo "Language: <lang>" >>linuxrc.config
+endif
+
+if liveeval
+ e echo "UseIDESCSI: 1" >>linuxrc.config
+ e echo "LiveConfig: suselive.900" >>linuxrc.config
+endif
+
+if arch eq 'ppc' || arch eq 'ppc64' || arch eq 's390' || arch eq 's390x'
+ e echo "Linemode: 1" >>linuxrc.config
+endif
+
+# min. free kB for YaST (below swap will be activated)
+if arch eq 'i386'
+ # so that 200MB won't get swap
+ e echo "MemYaST: 170000" >>linuxrc.config
+else
+ e echo "MemYaST: 123456" >>linuxrc.config
+endif
+
+if instsys_complain
+ e echo "InstsysComplain: <instsys_complain>" >>linuxrc.config
+endif
+
+if instsys_build_id
+ e echo "InitrdID: <instsys_build_id>" >>linuxrc.config
+endif
+
+# look for driver updates on usb media (bnc #363650)
+e echo "dud: disk:/?device=*usb*" >>linuxrc.config
+
+e echo "KexecReboot: 0" >>linuxrc.config
+
+e echo "Insecure: 1" >>linuxrc.config
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/installation-images-12.5/data/rescue/rescue.file_list
new/installation-images-12.6/data/rescue/rescue.file_list
--- old/installation-images-12.5/data/rescue/rescue.file_list 2009-06-02
15:22:55.000000000 +0200
+++ new/installation-images-12.6/data/rescue/rescue.file_list 2009-06-03
14:36:59.000000000 +0200
@@ -587,7 +587,7 @@
/usr/lib*/libgobject-2.0.so.*

pcre:
- /usr/lib*/libpcre*.so.*
+ /lib*/libpcre*.so.*

sysconfig: postin
/etc
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/installation-images-12.5/data/root/root.file_list
new/installation-images-12.6/data/root/root.file_list
--- old/installation-images-12.5/data/root/root.file_list 2009-06-02
15:22:55.000000000 +0200
+++ new/installation-images-12.6/data/root/root.file_list 2009-06-03
14:44:04.000000000 +0200
@@ -454,7 +454,11 @@
yast2-storage: postin
/
E postin
+if exists(libstorage)
+ libstorage:
+else
yast2-storage-lib:
+endif
/
yast2-transfer:
/
@@ -512,7 +516,7 @@
/usr/lib*/libblocxx.so.*

pcre:
- /usr/lib*/libpcre.so.*
+ /lib*/libpcre.so.*

limal:
/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/installation-images-12.5/data/root/zenroot.file_list
new/installation-images-12.6/data/root/zenroot.file_list
--- old/installation-images-12.5/data/root/zenroot.file_list 2009-06-02
15:22:55.000000000 +0200
+++ new/installation-images-12.6/data/root/zenroot.file_list 2009-06-03
14:38:22.000000000 +0200
@@ -147,9 +147,6 @@
libsepol1:
/

-pcre:
- /usr/lib*/libpcre*.so.*
-
libncurses5:
/lib*/libncurses.so.5*
/lib*/libncursesw.so.5*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/installation-images-12.5/etc/config
new/installation-images-12.6/etc/config
--- old/installation-images-12.5/etc/config 2009-06-02 15:22:55.000000000
+0200
+++ new/installation-images-12.6/etc/config 2009-06-03 12:33:53.000000000
+0200
@@ -40,6 +40,7 @@
default = kernel-default
s390 = kernel-s390

+
; extra kmps we need (',' separated list)
[KMP]
default =
@@ -50,6 +51,13 @@
ppc64 = ofed,enic,fnic


+; extra firmware packages
+[Firmware]
+default = kernel-firmware,qlogic-firmware,adaptec-firmware,cxgb3-firmware
+i386 =
kernel-firmware,qlogic-firmware,adaptec-firmware,cxgb3-firmware,ipw-firmware,iwl3945-ucode,iwl4965-ucode,iwl5000-ucode,atmel-firmware,ralink-firmware
+x86_64 =
kernel-firmware,qlogic-firmware,adaptec-firmware,cxgb3-firmware,ipw-firmware,iwl3945-ucode,iwl4965-ucode,iwl5000-ucode,atmel-firmware,ralink-firmware
+
+
; lib directory
[lib]
default = lib
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/installation-images-12.5/lib/AddFiles.pm
new/installation-images-12.6/lib/AddFiles.pm
--- old/installation-images-12.5/lib/AddFiles.pm 2009-06-02
15:22:55.000000000 +0200
+++ new/installation-images-12.6/lib/AddFiles.pm 2009-06-03
10:43:27.000000000 +0200
@@ -402,9 +402,20 @@
($kmp_name = $p) =~ s/^kernel/$kmp-kmp/;
my $r2 = RPMFileName "$kmp_name";
(print STDERR "$Script: no such package: ${kmp_name}.rpm\n"),
next unless $r2 && -f $r2;
+ print "adding kmp $kmp_name\n";
SUSystem "sh -c 'cd $tdir ; rpm2cpio $r2 | cpio --quiet --sparse
-dimu --no-absolute-filenames'" and
warn "$Script: failed to extract $r2";
}
+
+ my $fw;
+ for $fw (split(',', $ConfigData{fw_list})) {
+ my $r2 = RPMFileName $fw;
+ if($r2 && -f $r2) {
+ print "adding firmware $fw\n";
+ SUSystem "sh -c 'cd $tdir ; rpm2cpio $r2 | cpio --quiet
--sparse -dimu --no-absolute-filenames'" and
+ warn "$Script: failed to extract $r2";
+ }
+ }
}
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/installation-images-12.5/lib/ReadConfig.pm
new/installation-images-12.6/lib/ReadConfig.pm
--- old/installation-images-12.5/lib/ReadConfig.pm 2009-06-02
15:22:55.000000000 +0200
+++ new/installation-images-12.6/lib/ReadConfig.pm 2009-06-03
10:34:16.000000000 +0200
@@ -510,6 +510,15 @@


# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# firmware list
+#
+
+$ConfigData{fw_list} = "";
+$ConfigData{fw_list} = $ConfigData{ini}{Firmware}{default} if
$ConfigData{ini}{Firmware}{default};
+$ConfigData{fw_list} = $ConfigData{ini}{Firmware}{$arch} if
$ConfigData{ini}{Firmware}{$arch};
+
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -


# print STDERR "kernel_rpm = $ConfigData{kernel_rpm}, kernel_img =
$ConfigData{kernel_img}\n";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/installation-images-12.5/Makefile
new/installation-images-12.6/Makefile
--- old/installation-images-12.5/Makefile 2009-06-02 15:22:55.000000000
+0200
+++ new/installation-images-12.6/Makefile 2009-06-03 10:06:48.000000000
+0200
@@ -39,7 +39,7 @@
THEMES := openSUSE SLES SLED
DESTDIR := images/instsys

-ifneq ($(filter i386, $(ARCH)),)
+ifneq ($(filter i386 x86_64, $(ARCH)),)
THEMES += Zen
endif

@@ -172,7 +172,7 @@
for theme in $(THEMES) ; do \
theme=$$theme image=$$theme/$$theme tmpdir=root-$$theme src=root
filelist=$$theme fs=squashfs disjunct=root bin/mk_image ; \
done
-ifneq ($(filter i386, $(ARCH)),)
+ifneq ($(filter Zen, $(THEMES)),)
libdeps=zenroot image=Zen/root tmpdir=zenroot src=root filelist=zenroot
fs=squashfs bin/mk_image
endif

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/installation-images-12.5/VERSION
new/installation-images-12.6/VERSION
--- old/installation-images-12.5/VERSION 2009-06-02 15:22:55.000000000
+0200
+++ new/installation-images-12.6/VERSION 2009-06-03 10:07:21.000000000
+0200
@@ -1 +1 @@
-12.5
+12.6


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >