Hello community, here is the log from the commit of package installation-images checked in at Sat Nov 8 01:11:35 CET 2008. -------- --- installation-images/installation-images.changes 2008-11-07 11:29:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/installation-images/installation-images.changes 2008-11-07 18:25:22.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 7 18:20:49 CET 2008 - snwint@suse.de + +- adapt mkinstallinitrd to kernel split (bnc #442177) +- prepare for initrd branding +- undid last kernel-ppc64 changes (with ok from olh) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- installation-images-11.32.tar.bz2 New: ---- installation-images-11.33.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.i25753/_old 2008-11-08 01:10:38.000000000 +0100 +++ /var/tmp/diff_new_pack.i25753/_new 2008-11-08 01:10:38.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package installation-images (Version 11.32) +# spec file for package installation-images (Version 11.33) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,13 +30,6 @@ 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 sax2 sax2-ident sax2-tools -%ifarch ppc64 -# force until kernel-default is gone in kernel-source package -BuildRequires: -kernel-default -BuildRequires: -kernel-default-base -BuildRequires: -kernel-default-extra -BuildRequires: -ofed-kmp-default -%endif # kmps %ifarch %ix86 x86_64 BuildRequires: atmel-firmware ipw-firmware iwl3945-ucode iwl4965-ucode iwl5000-ucode ralink-firmware wireless-tools wpa_supplicant @@ -101,9 +94,9 @@ Obsoletes: y2image AutoReqProv: off Summary: Installation Image Files -Version: 11.32 -Release: 2 -Source: installation-images-11.32.tar.bz2 +Version: 11.33 +Release: 1 +Source: installation-images-11.33.tar.bz2 Patch: installation-images-no_tapeipl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -120,7 +113,7 @@ AutoReqProv: off Summary: Create initrd for Installation Version: 1.0 -Release: 484 +Release: 485 %description -n install-initrd You can create an initrd for installation. Useful, for example, to set @@ -145,20 +138,13 @@ # export instsys_complain_root=2 # beta only: ignore non-critical errors export debug=ignore -%ifarch ppc64 -# there is no 32bit kernel-default in dist ppc64 -# specify the standard kernel for make -# note the backslash at the end -image=initrd-ppc64 kernel=kernel-ppc64 MOD_CFG=ppc64 \ -%endif make %ifarch %ix86 x86_64 # build xen initrd & kernel image=initrd-xen kernel=kernel-xen MOD_CFG=xen make initrd+modules MOD_CFG=xen make kernel %endif -# create an additional 64bit boot kernel in openSuSE -%ifarch ppc +%ifarch ppc ppc64 image=initrd-ppc64 kernel=kernel-ppc64 MOD_CFG=ppc64 make initrd+modules+gefrickel %endif @@ -201,6 +187,10 @@ /usr/sbin/mkinstallinitrd %changelog +* Fri Nov 07 2008 snwint@suse.de +- adapt mkinstallinitrd to kernel split (bnc #442177) +- prepare for initrd branding +- undid last kernel-ppc64 changes (with ok from olh) * Fri Nov 07 2008 olh@suse.de - disable kernel-default in dist ppc64 because it is not built anymore in kernel-source ++++++ installation-images-11.32.tar.bz2 -> installation-images-11.33.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.32/brand-initrd new/installation-images-11.33/brand-initrd --- old/installation-images-11.32/brand-initrd 1970-01-01 01:00:00.000000000 +0100 +++ new/installation-images-11.33/brand-initrd 2008-11-07 17:38:54.000000000 +0100 @@ -0,0 +1,29 @@ +#! /bin/bash + +dir="$1" +theme="$2" +arch=`uname -m` +case $arch in i?86) arch=i386 ;; esac + +[ -f "$dir/linuxrc.config" ] || { + echo "$dir: not an initrd directory" + exit 1 +} + +case "$theme" in + openSUSE) product="openSUSE" dud=$arch-11.1 + ;; + SLES) product="SUSE Linux Enterprise Server 11" dud=$arch-sles11 + ;; + SLED) product="SUSE Linux Enterprise Desktop 11" dud=$arch-sled11 + ;; +esac + +[ -z "$product" ] && { + echo "$theme: unsupported theme" + exit 2 +} + +perl -pi -e "s#^(Product:\s*).*#\$1$product#" $dir/linuxrc.config +perl -pi -e "s#^(UpdateDir:\s*).*#\$1/linux/suse/$dud#" $dir/linuxrc.config + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.32/Changelog new/installation-images-11.33/Changelog --- old/installation-images-11.32/Changelog 2008-10-31 14:15:50.000000000 +0100 +++ new/installation-images-11.33/Changelog 2008-11-07 18:17:43.000000000 +0100 @@ -1,3 +1,7 @@ +7/11/2008: v11.33 + - adapt mkinstallinitrd to kernel split (bnc #442177) + - prepare for initrd branding + 31/10/2008: v11.32 - added gpg key for testing diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.32/etc/mkinstallinitrd new/installation-images-11.33/etc/mkinstallinitrd --- old/installation-images-11.32/etc/mkinstallinitrd 2008-08-01 13:05:42.000000000 +0200 +++ new/installation-images-11.33/etc/mkinstallinitrd 2008-11-07 18:15:08.000000000 +0100 @@ -48,10 +48,15 @@ my $kernel_dir = ""; if(defined $opt_kernel_rpm) { + my $opt_kernel_base = $opt_kernel_rpm; + $opt_kernel_base =~ s/\.rpm/-base.rpm/; + die "rpm not found: $opt_kernel_rpm\n" unless -f $opt_kernel_rpm; + die "rpm not found: $opt_kernel_base\n" unless -f $opt_kernel_base; mkdir "$tmp_dir/k", 0755; + system "cd $tmp_dir/k; rpm2cpio $opt_kernel_base | cpio --quiet --extract --unconditional --preserve-modification-time --make-directories"; system "cd $tmp_dir/k; rpm2cpio $opt_kernel_rpm | cpio --quiet --extract --unconditional --preserve-modification-time --make-directories"; $kernel_dir = "$tmp_dir/k"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.32/Makefile new/installation-images-11.33/Makefile --- old/installation-images-11.32/Makefile 2008-10-30 13:53:36.000000000 +0100 +++ new/installation-images-11.33/Makefile 2008-11-07 18:15:57.000000000 +0100 @@ -90,6 +90,13 @@ ls -I module.config tmp/initrd/modules | sed -e 's#.*/##' >images/module-config/$${MOD_CFG:-default}/module.list cp tmp/initrd/modules/module.config images/module-config/$${MOD_CFG:-default} +initrd+modules-themes: base + for theme in $(THEMES) ; do \ + ./brand-initrd tmp/initrd $$theme ; \ + make initrd+modules ; \ + mv images/initrd images/initrd-$$theme ; \ + done + initrd+modules+gefrickel: base image=modules-config src=initrd fs=none bin/mk_image bin/mlist1 @@ -104,6 +111,13 @@ ./gefrickel tmp/initrd_gefrickel mode=keep image=$${image:-initrd} tmpdir=initrd_gefrickel src=initrd filelist=initrd fs=cpio.gz bin/mk_image +initrd+modules+gefrickel-themes: base + for theme in $(THEMES) ; do \ + ./brand-initrd tmp/initrd $$theme ; \ + make initrd+modules+gefrickel ; \ + mv images/initrd images/initrd-$$theme ; \ + done + kernel: base image=vmlinuz-$${MOD_CFG:-default} src=initrd filelist=kernel kernel=kernel-$${MOD_CFG:-default} fs=dir bin/mk_image @@ -151,6 +165,11 @@ theme=$$theme image=root-$$theme src=root filelist=$$theme fs=squashfs disjunct=root bin/mk_image ; \ done +install-initrd-themes: base + for theme in $(THEMES) ; do \ + perl -p -e 's/^(theme=).*/$$1'"$$theme"/ brand-initrd > images/brand-initrd-$$theme ; \ + done + mboot: make -C src/mboot diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.32/VERSION new/installation-images-11.33/VERSION --- old/installation-images-11.32/VERSION 2008-10-30 18:50:24.000000000 +0100 +++ new/installation-images-11.33/VERSION 2008-11-07 18:16:34.000000000 +0100 @@ -1 +1 @@ -11.32 +11.33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org