Hello community, here is the log from the commit of package installation-images checked in at Tue Nov 18 13:27:31 CET 2008. -------- --- installation-images/installation-images.changes 2008-11-14 17:26:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/installation-images/installation-images.changes 2008-11-18 12:40:02.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Nov 18 12:39:58 CET 2008 - snwint@suse.de + +- fixed mkbootdisk to work with > 16 floppies (bnc #445946) + +------------------------------------------------------------------- +Mon Nov 17 17:39:51 CET 2008 - snwint@suse.de + +- added branding to install-initrd +- removed references to at76_usb & wlan-ng kmps + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- installation-images-11.39.tar.bz2 New: ---- installation-images-11.41.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.pn4982/_old 2008-11-18 13:22:19.000000000 +0100 +++ /var/tmp/diff_new_pack.pn4982/_new 2008-11-18 13:22:19.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package installation-images (Version 11.39) +# spec file for package installation-images (Version 11.41) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,7 +24,7 @@ %define build_xen 1 BuildRequires: adaptec-firmware ash autoyast2-installation bc blueprint-cursor-theme cifs-mount cron cups-libs ddrescue dhcpcd dhcpv6 dmraid dump ed efont-unicode eject fbiterm finger fonts-config gdb glibc-i18ndata hex icmpinfo initviocons iputils joe kdelibs3 krb5-devel libidn libjpeg-devel libpng-devel links linuxrc lklug lvm2 mdadm mingetty mtools multipath-tools nasm netcat netpbm nfs-utils nscd ntfsprogs openslp-server openssh pcmciautils pcre-devel popt-devel pothana2000 qlogic-firmware recode rsh rsync sbl screen setserial sg3_utils smartmontools socat sysconfig syslogd tcpd-devel telnet telnet-server termcap terminfo usbutils wget xfsdump BuildRequires: e2fsprogs ncurses-utils yast2-add-on yast2-kdump yast2-mouse yast2-ncurses-pkg yast2-network yast2-nfs-client yast2-ntp-client yast2-qt yast2-qt-pkg yast2-repair yast2-runlevel yast2-slp yast2-trans-allpacks yast2-trans-stats yast2-tune yast2-update yast2-users -BuildRequires: aaa_base audit-libs boost busybox checkmedia cryptsetup dejavu dmapi dosfstools ethtool fvwm2 gpm hfsutils icewm-lite kernel-binary-packages libelf0 libzypp open-iscsi openct pciutils pcsc-lite perl-HTML-Parser sqlite3 util-linux +BuildRequires: aaa_base audit-libs boost busybox checkmedia cryptsetup dejavu dmapi dosfstools ethtool fvwm2 gpm hfsutils icewm-lite kernel-binary-packages libelf0 libzypp open-iscsi openct pciutils pciutils-ids pcsc-lite perl-HTML-Parser sqlite3 util-linux BuildRequires: build-key gpg2 jfsutils kexec-tools limal limal-perl perl-XML-Bare perl-XML-NamespaceSupport perl-XML-Parser perl-XML-Simple yast2-iscsi-client yast2-ncurses 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 @@ -93,9 +93,9 @@ Obsoletes: y2image AutoReqProv: off Summary: Installation Image Files -Version: 11.39 +Version: 11.41 Release: 1 -Source: installation-images-11.39.tar.bz2 +Source: installation-images-11.41.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -108,10 +108,11 @@ %package -n install-initrd License: GPL v2 or later Group: System/Kernel +Recommends: install-initrd-branding AutoReqProv: off Summary: Create initrd for Installation Version: 1.0 -Release: 490 +Release: 491 %description -n install-initrd You can create an initrd for installation. Useful, for example, to set @@ -119,6 +120,48 @@ +%package -n install-initrd-branding-openSUSE +License: GPL v2 or later +Supplements: branding-openSUSE +Provides: install-initrd-branding +Requires: install-initrd +Summary: openSUSE theme for install-initrd +AutoReqProv: on +Group: System/Kernel + +%description -n install-initrd-branding-openSUSE +openSUSE theme for install-initrd package. + + + +%package -n install-initrd-branding-SLED +License: GPL v2 or later +Supplements: branding-SLED +Provides: install-initrd-branding +Requires: install-initrd +Summary: SLED theme for install-initrd +AutoReqProv: on +Group: System/Kernel + +%description -n install-initrd-branding-SLED +SLED theme for install-initrd package. + + + +%package -n install-initrd-branding-SLES +License: GPL v2 or later +Supplements: branding-SLES +Provides: install-initrd-branding +Requires: install-initrd +Summary: SLES theme for install-initrd +AutoReqProv: on +Group: System/Kernel + +%description -n install-initrd-branding-SLES +SLES theme for install-initrd package. + + + %prep %setup rm -f /usr/lib/build/checks/04-check-filelist @@ -152,6 +195,7 @@ make install DESTDIR=%{buildroot} # make debuginfo DESTDIR=%{buildroot} make install-initrd DESTDIR=%{buildroot}/usr/lib/install-initrd +ln -s openSUSE %{buildroot}/usr/lib/install-initrd/branding install -d -m 755 %{buildroot}/usr/sbin install -m 755 etc/mkinstallinitrd %{buildroot}/usr/sbin %ifarch %ix86 @@ -169,6 +213,23 @@ export NO_DEBUGINFO_STRIP_DEBUG=true # for compatibility mv %{buildroot}/branding %{buildroot}/SuSE +# file list for install-initrd +echo '%defattr(-,root,root)' >install-initrd.files +( cd %{buildroot}/usr/lib/install-initrd ; find -maxdepth 1 | sed -e '/\.$/d ; /\.\/branding/d ; s#\.#/usr/lib/install-initrd#' ) >>install-initrd.files +echo '%ghost' /usr/lib/install-initrd/branding >>install-initrd.files +echo /usr/sbin/mkinstallinitrd >>install-initrd.files + +%post -n install-initrd +ln -snf openSUSE /usr/lib/install-initrd/branding + +%post -n install-initrd-branding-openSUSE +ln -snf openSUSE /usr/lib/install-initrd/branding + +%post -n install-initrd-branding-SLED +ln -snf SLED /usr/lib/install-initrd/branding + +%post -n install-initrd-branding-SLES +ln -snf SLES /usr/lib/install-initrd/branding %clean rm -rf %{buildroot} @@ -179,12 +240,26 @@ /SuSE /usr/share -%files -n install-initrd +%files -n install-initrd -f install-initrd.files + +%files -n install-initrd-branding-openSUSE +%defattr(-,root,root) +%ghost /usr/lib/install-initrd/branding + +%files -n install-initrd-branding-SLED +%defattr(-,root,root) +%ghost /usr/lib/install-initrd/branding + +%files -n install-initrd-branding-SLES %defattr(-,root,root) -/usr/lib/install-initrd -/usr/sbin/mkinstallinitrd +%ghost /usr/lib/install-initrd/branding %changelog +* Tue Nov 18 2008 snwint@suse.de +- fixed mkbootdisk to work with > 16 floppies (bnc #445946) +* Mon Nov 17 2008 snwint@suse.de +- added branding to install-initrd +- removed references to at76_usb & wlan-ng kmps * Fri Nov 14 2008 snwint@suse.de - fix mkbootdisk (bnc #444861) * Fri Nov 14 2008 snwint@suse.de ++++++ installation-images-11.39.tar.bz2 -> installation-images-11.41.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.39/brand-initrd new/installation-images-11.41/brand-initrd --- old/installation-images-11.39/brand-initrd 2008-11-07 17:38:54.000000000 +0100 +++ new/installation-images-11.41/brand-initrd 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ -#! /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.39/Changelog new/installation-images-11.41/Changelog --- old/installation-images-11.39/Changelog 2008-11-14 17:26:21.000000000 +0100 +++ new/installation-images-11.41/Changelog 2008-11-18 12:35:17.000000000 +0100 @@ -1,3 +1,10 @@ +18/11/2008: v11.41 + - fixed mkbootdisk to work with > 16 floppies (bnc #445946) + +17/11/2008: v11.40 + - added branding to install-initrd + - removed references to at76_usb & wlan-ng kmps + 14/11/2008: v11.39 - fix mkbootdisk (bnc #444861) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.39/etc/config new/installation-images-11.41/etc/config --- old/installation-images-11.39/etc/config 2008-11-07 16:51:53.000000000 +0100 +++ new/installation-images-11.41/etc/config 2008-11-17 15:34:38.000000000 +0100 @@ -41,8 +41,8 @@ ; extra kmps we need (',' separated list) [KMP] default = -i386 = at76_usb,wlan-ng,ofed -x86_64 = at76_usb,wlan-ng,ofed +i386 = ofed +x86_64 = ofed ppc = ofed ppc64 = ofed diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.39/etc/mkbootdisk new/installation-images-11.41/etc/mkbootdisk --- old/installation-images-11.39/etc/mkbootdisk 2008-11-14 17:17:55.000000000 +0100 +++ new/installation-images-11.41/etc/mkbootdisk 2008-11-18 12:28:34.000000000 +0100 @@ -793,7 +793,7 @@ $fat->drive_id(0x00); $fat->serial($serial + 0); - $fat->volume_id("BOOTDISK1"); + $fat->volume_id("BOOTDISK01"); $fat->manuf_id("SUSE"); $fat->fs_date(time); @@ -831,11 +831,11 @@ $fat->media_id(0xf0); $fat->drive_id(0x00); - $fat->serial($serial + ($disk & 0xf)); + $fat->serial($serial + $disk); $dsk = $disk + 1; - $fat->volume_id("BOOTDISK$dsk"); + $fat->volume_id(sprintf "BOOTDISK%02u", $dsk); $fat->manuf_id("SUSE"); $i = $boot_msg; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.39/etc/mkinstallinitrd new/installation-images-11.41/etc/mkinstallinitrd --- old/installation-images-11.39/etc/mkinstallinitrd 2008-11-07 18:15:08.000000000 +0100 +++ new/installation-images-11.41/etc/mkinstallinitrd 2008-11-17 19:42:11.000000000 +0100 @@ -83,7 +83,7 @@ $opt_style = "default"; } -die "style $opt_style not supported\n" unless $opt_style ne "" && -d "$lib_dir/$opt_style"; +die "style $opt_style not supported\n" unless $opt_style ne "" && -f "$lib_dir/$opt_style/module.list"; (my $override = $opt_kernel) =~ s/\-.*//; $override .= "-override-$opt_kernel_style"; @@ -120,6 +120,9 @@ system "cp $lib_dir/$opt_style/module.config $tmp_dir/i/modules"; +# add branding +system "cp -a $lib_dir/branding/* $tmp_dir/i" if -d "$lib_dir/branding"; + system "gunzip -c $lib_dir/$opt_base.gz >$tmp_dir/initrd"; system "cd $tmp_dir/i ; find . | cpio --quiet -o -H newc -A -F $tmp_dir/initrd"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.39/etc/module.config new/installation-images-11.41/etc/module.config --- old/installation-images-11.39/etc/module.config 2008-11-12 16:38:12.000000000 +0100 +++ new/installation-images-11.41/etc/module.config 2008-11-17 15:37:57.000000000 +0100 @@ -53,7 +53,7 @@ dm-log dm-mem-cache dm-message -dm-raid4-5 +dm-raid45 dm-region_hash dmapi,-,- edd,-BIOS EDD information,- diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.39/Makefile new/installation-images-11.41/Makefile --- old/installation-images-11.39/Makefile 2008-11-14 15:41:00.000000000 +0100 +++ new/installation-images-11.41/Makefile 2008-11-17 17:48:41.000000000 +0100 @@ -44,7 +44,7 @@ .PHONY: all dirs base zeninitrd zenboot zenroot biostest initrd \ boot boot-efi root rescue root+rescue sax2 gdb bind clean \ boot-themes initrd-themes root-themes install \ - install-initrd install-initrd-themes mini-iso-rmlist debuginfo + install-initrd mini-iso-rmlist debuginfo all: $(ALL_TARGETS) @rm images/*.log @@ -71,9 +71,7 @@ libdeps=initrd,biostest image=biostest src=initrd fs=cpio.gz disjunct=initrd bin/mk_image initrd: base - libdeps=initrd image=initrd-base tmpdir=initrd src=initrd filelist=initrd fs=cpio bin/mk_image - i=`pwd` ; ( cd tmp/initrd-openSUSE ; find . | cpio --quiet -o -H newc -A -F $$i/images/initrd-base ) - gzip -9 images/initrd-base + libdeps=initrd image=initrd-base.gz tmpdir=initrd src=initrd filelist=initrd fs=cpio.gz bin/mk_image modules: base image=modules-config src=initrd fs=none bin/mk_image @@ -97,7 +95,7 @@ for theme in $(THEMES) ; do \ cp images/$${image:-initrd} images/$$theme/$${image:-initrd} ; \ i=`pwd` ; ( cd tmp/initrd-$$theme ; find . | cpio --quiet -o -H newc -A -F $$i/images/$$theme/$${image:-initrd} ) ; \ - gzip -9 images/$$theme/$${image:-initrd} ; mv images/$$theme/$${image:-initrd}.gz images/$$theme/$${image:-initrd} ; \ + gzip -9f images/$$theme/$${image:-initrd} ; mv images/$$theme/$${image:-initrd}.gz images/$$theme/$${image:-initrd} ; \ done rm -f images/$${image:-initrd} @@ -118,7 +116,7 @@ for theme in $(THEMES) ; do \ cp images/$${image:-initrd} images/$$theme/$${image:-initrd} ; \ i=`pwd` ; ( cd tmp/initrd-$$theme ; find . | cpio --quiet -o -H newc -A -F $$i/images/$$theme/$${image:-initrd} ) ; \ - gzip -9 images/$$theme/$${image:-initrd} ; mv images/$$theme/$${image:-initrd}.gz images/$$theme/$${image:-initrd} ; \ + gzip -9f images/$$theme/$${image:-initrd} ; mv images/$$theme/$${image:-initrd}.gz images/$$theme/$${image:-initrd} ; \ done rm -f images/$${image:-initrd} @@ -167,7 +165,7 @@ initrd-themes: base for theme in $(THEMES) ; do \ - theme=$$theme image=$$theme/initrd tmpdir=initrd-$$theme src=initrd filelist=$$theme fs=none bin/mk_image ; \ + theme=$$theme image=$$theme/install-initrd tmpdir=initrd-$$theme src=initrd filelist=$$theme fs=dir bin/mk_image ; \ done root-themes: base @@ -175,11 +173,6 @@ theme=$$theme image=$$theme/$$theme tmpdir=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 - mini-iso-rmlist: base rm -f images/$@ for i in \ @@ -216,4 +209,7 @@ @mkdir -p $(DESTDIR)/default cp images/initrd-base.gz $(DESTDIR) cp -a images/module-config/* $(DESTDIR) + for theme in $(THEMES) ; do \ + cp -a images/$$theme/install-initrd $(DESTDIR)/$$theme ; \ + done diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.39/VERSION new/installation-images-11.41/VERSION --- old/installation-images-11.39/VERSION 2008-11-14 17:25:52.000000000 +0100 +++ new/installation-images-11.41/VERSION 2008-11-18 12:34:34.000000000 +0100 @@ -1 +1 @@ -11.39 +11.41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org