Hello community, here is the log from the commit of package installation-images checked in at Mon Jul 2 17:59:42 CEST 2007. -------- --- installation-images/installation-images.changes 2007-07-02 14:51:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/installation-images/installation-images.changes 2007-07-02 17:51:18.000000000 +0200 @@ -1,0 +2,11 @@ +Mon Jul 2 17:51:14 CEST 2007 - snwint@suse.de + +- change cursor theme to DMZ + +------------------------------------------------------------------- +Mon Jul 2 16:20:49 CEST 2007 - snwint@suse.de + +- put xen initrd & kernel on install media (#284121) +- no longer build um-initrds + +------------------------------------------------------------------- Old: ---- installation-images-9.82.tar.bz2 New: ---- installation-images-9.83.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.e14827/_old 2007-07-02 17:59:32.000000000 +0200 +++ /var/tmp/diff_new_pack.e14827/_new 2007-07-02 17:59:32.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package installation-images (Version 9.82) +# spec file for package installation-images (Version 9.83) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,7 +11,7 @@ # needsrootforbuild Name: installation-images -BuildRequires: Crystalcursors IPAGothic KhmerOS-fonts adaptec-firmware ash autoyast2-installation baekmuk-ttf bc blueprint-cursor-theme bootsplash bootsplash-theme-SuSE bootsplash-theme-SuSE-SLES cifs-mount cron cups-libs ddrescue dhcpcd dmraid dump ed efont-unicode eject evms-gui fbiterm finger fonts-arabic fonts-config fonts-thai freefont gdb glibc-i18ndata hex icmpinfo indic-fonts initviocons iputils joe kdelibs3 krb5-devel libidn libjpeg-devel libpng-devel links linuxrc lvm2 mdadm mingetty mtools multipath-tools nasm netcat netpbm nfs-utils nscd ntfsprogs openslp-server openssh pcmciautils pcre-devel perl-Compress-Zlib popt-devel pothana2000 qlogic-firmware recode rsh rsync sbl screen scsi setserial smartmontools socat sysconfig syslogd tcpd-devel telnet telnet-server termcap terminfo ttf-founder-simplified usbutils wget xfsdump +BuildRequires: IPAGothic KhmerOS-fonts adaptec-firmware ash autoyast2-installation baekmuk-ttf bc blueprint-cursor-theme bootsplash bootsplash-theme-SuSE bootsplash-theme-SuSE-SLES cifs-mount cron cups-libs ddrescue dhcpcd dmraid dump ed efont-unicode eject evms-gui fbiterm finger fonts-arabic fonts-config fonts-thai freefont gdb glibc-i18ndata hex icmpinfo indic-fonts initviocons iputils joe kdelibs3 krb5-devel libidn libjpeg-devel libpng-devel links linuxrc lvm2 mdadm mingetty mtools multipath-tools nasm netcat netpbm nfs-utils nscd ntfsprogs openslp-server openssh pcmciautils pcre-devel perl-Compress-Zlib popt-devel pothana2000 qlogic-firmware recode rsh rsync sbl screen scsi setserial smartmontools socat sysconfig syslogd tcpd-devel telnet telnet-server termcap terminfo ttf-founder-simplified usbutils wget xfsdump BuildRequires: yast2-add-on yast2-mouse yast2-network yast2-qt yast2-repair yast2-runlevel yast2-slp yast2-storage-evms yast2-trans-allpacks yast2-trans-stats yast2-tune yast2-update BuildRequires: aaa_base audit-libs boost busybox checkmedia cryptsetup dejavu dmapi dosfstools ethtool evms fvwm2 hfsutils kernel-binary-packages libelf libicu libzypp open-iscsi openct pciutils pcsc-lite perl-HTML-Parser resmgr sqlite util-linux BuildRequires: bootsplash-theme-SuSE-NLD gpg2 jfsutils sax2-tools suse-build-key yast2-iscsi-client yast2-ncurses @@ -67,9 +67,9 @@ Obsoletes: y2image Autoreqprov: off Summary: Installation Image Files -Version: 9.82 +Version: 9.83 Release: 1 -Source: installation-images-9.82.tar.bz2 +Source: installation-images-9.83.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -123,6 +123,26 @@ export debug=ignore for theme in $themes ; do +# +# Because we really need the initrds for x86, we have to build them per +# theme. For other archs, theme does not matter. +# +%ifarch %ix86 x86_64 +# cleanup from last theme +rm -rf tmp/base +# we need real xen initrd & kernel +for flavor in xen xenpae ; do + if rpm --quiet -q kernel-$flavor ; then + kernel=kernel-$flavor make bootcd + mv images/initrd images/initrd-$flavor-$theme + mv images/boot.isolinux/linux images/vmlinuz-$flavor-$theme + if [ "$theme" = "$firsttheme" ] ; then + save_initrd_config $flavor + fi + rm -rf tmp/base + fi +done +%else if [ "$theme" = "$firsttheme" ] ; then # save module config for specific kernels for flavor in xen xenpae ; do @@ -134,7 +154,7 @@ fi done fi - +%endif %ifarch %ix86 # build special 1.44MB boot image for CD2 make bootcd2 @@ -199,7 +219,7 @@ if [ "$theme" = "$firsttheme" ] ; then mkdir -p %{buildroot}/SuSE/install-initrd - for i in default um xen xenpae ; do + for i in default xen xenpae ; do [ -d images/$i ] && cp -a images/$i %{buildroot}/SuSE/install-initrd done [ -f images/initrd-base.gz ] && cp images/initrd-base.gz %{buildroot}/SuSE/install-initrd @@ -216,10 +236,12 @@ install -m 755 etc/mkbootdisk %{buildroot}/SuSE/$theme/CD1/boot/$boot_arch [ -d images/boot ] && cp -a images/boot %{buildroot}/SuSE/$theme/CD1/boot/$boot_arch/loader [ -f images/boot ] && install -m 644 images/boot %{buildroot}/SuSE/$theme/CD1/boot/$boot_arch/image -if [ -d images/floppy ] ; then - mkdir -p %{buildroot}/SuSE/$theme/FTP/boot/$boot_arch - cp -a images/floppy %{buildroot}/SuSE/$theme/FTP/boot/$boot_arch -fi +for flavor in xen xenpae ; do + if [ -f images/initrd-$flavor-$theme ] ; then + install -m 644 images/initrd-$flavor-$theme %{buildroot}/SuSE/$theme/CD1/boot/$boot_arch/initrd-$flavor + install -m 644 images/vmlinuz-$flavor-$theme %{buildroot}/SuSE/$theme/CD1/boot/$boot_arch/vmlinuz-$flavor + fi +done %endif %ifarch sparc @@ -324,6 +346,11 @@ %changelog * Mon Jul 02 2007 - snwint@suse.de +- change cursor theme to DMZ +* Mon Jul 02 2007 - snwint@suse.de +- put xen initrd & kernel on install media (#284121) +- no longer build um-initrds +* Mon Jul 02 2007 - snwint@suse.de - added socat, wget to rescue (#288734) - gpg -> gpg2 * Thu Jun 21 2007 - snwint@suse.de ++++++ installation-images-9.82.tar.bz2 -> installation-images-9.83.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.82/Changelog new/installation-images-9.83/Changelog --- old/installation-images-9.82/Changelog 2007-07-02 14:44:33.000000000 +0200 +++ new/installation-images-9.83/Changelog 2007-07-02 17:50:43.000000000 +0200 @@ -1,3 +1,6 @@ +2/7/2007: v9.83 + - change cursor theme to DMZ + 2/7/2007: v9.82 - added socat, wget to rescue (#288734) - gpg -> gpg2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.82/data/root/etc/inst_setup new/installation-images-9.83/data/root/etc/inst_setup --- old/installation-images-9.82/data/root/etc/inst_setup 2007-03-13 15:05:25.000000000 +0100 +++ new/installation-images-9.83/data/root/etc/inst_setup 2007-07-02 17:03:29.000000000 +0200 @@ -184,7 +184,7 @@ test -d $INSTSYS/root/.yast2 && cp -a $INSTSYS/root/.yast2 /root fi -export XCURSOR_THEME=crystalwhite +export XCURSOR_THEME=DMZ grep -qwi start_shell /proc/cmdline && START_SHELL=1 grep -qi "^StartShell:.*1" /etc/install.inf && START_SHELL=1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.82/data/root/machbunt.file_list new/installation-images-9.83/data/root/machbunt.file_list --- old/installation-images-9.82/data/root/machbunt.file_list 2007-06-13 11:42:32.000000000 +0200 +++ new/installation-images-9.83/data/root/machbunt.file_list 2007-07-02 17:01:35.000000000 +0200 @@ -367,8 +367,8 @@ efont-unicode: /usr/share/fonts/misc/b16.pcf.gz -Crystalcursors: - /usr/share/icons/crystalwhite +desktop-data-SuSE: + /usr/share/icons/DMZ multipath-tools: /sbin diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.82/VERSION new/installation-images-9.83/VERSION --- old/installation-images-9.82/VERSION 2007-07-02 14:44:37.000000000 +0200 +++ new/installation-images-9.83/VERSION 2007-07-02 17:04:01.000000000 +0200 @@ -1 +1 @@ -9.82 +9.83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org