Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at Mon Sep 28 16:24:40 CEST 2009. -------- --- installation-images/installation-images.changes 2009-09-24 13:04:32.000000000 +0200 +++ installation-images/installation-images.changes 2009-09-28 14:42:20.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 28 12:19:56 CEST 2009 - snwint@suse.de + +- don't depend on all branding files + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- installation-images-12.28.tar.bz2 needed_space_in_mb New: ---- installation-images-12.29.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.77o19t/_old 2009-09-28 16:23:02.000000000 +0200 +++ /var/tmp/diff_new_pack.77o19t/_new 2009-09-28 16:23:02.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package installation-images (Version 12.28) +# spec file for package installation-images (Version 12.29) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: installation-images -%define has_sles 1 +%define has_sles 0 %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 krb5-devel libidn libjpeg-devel libpng-devel links linuxrc lklug lvm2 mdadm mingetty mtools multipath-tools nasm netcat netpbm nfs-utils ntfsprogs openslp-server openssh pcmciautils pcre-devel popt-devel pothana2000 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 @@ -98,9 +98,9 @@ Obsoletes: y2image AutoReqProv: off Summary: Installation Image Files -Version: 12.28 +Version: 12.29 Release: 1 -Source: installation-images-12.28.tar.bz2 +Source: installation-images-12.29.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -117,7 +117,7 @@ AutoReqProv: off Summary: Create initrd for Installation Version: 1.0 -Release: 566 +Release: 567 PreReq: /bin/ln %description -n install-initrd @@ -187,23 +187,43 @@ # export instsys_complain_root=2 # beta only: ignore non-critical errors # export debug=ignore +%if %has_sles make +%else +make THEMES=openSUSE +%endif %ifarch %ix86 x86_64 # build xen initrd & kernel +%if %has_sles image=initrd-xen kernel=kernel-xen MOD_CFG=xen make initrd+modules +%else +image=initrd-xen kernel=kernel-xen MOD_CFG=xen make initrd+modules THEMES=openSUSE +%endif MOD_CFG=xen make kernel %endif %ifarch ppc ppc64 +%if %has_sles image=initrd-ppc64 kernel=kernel-ppc64 MOD_CFG=ppc64 make initrd+modules+gefrickel +%else +image=initrd-ppc64 kernel=kernel-ppc64 MOD_CFG=ppc64 make initrd+modules+gefrickel THEMES=openSUSE +%endif %endif %install BUILD_DISTRIBUTION_NAME="%distribution" export BUILD_DISTRIBUTION_NAME test ! -z "$BUILD_DISTRIBUTION_NAME" +%if %has_sles make install DESTDIR=%{buildroot} +%else +make install DESTDIR=%{buildroot} THEMES=openSUSE +%endif # make debuginfo DESTDIR=%{buildroot} +%if %has_sles make install-initrd DESTDIR=%{buildroot}/usr/lib/install-initrd +%else +make install-initrd DESTDIR=%{buildroot}/usr/lib/install-initrd THEMES=openSUSE +%endif ln -s openSUSE %{buildroot}/usr/lib/install-initrd/branding install -d -m 755 %{buildroot}/usr/sbin install -m 755 etc/mkinstallinitrd %{buildroot}/usr/sbin ++++++ installation-images-12.28.tar.bz2 -> installation-images-12.29.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.28/Changelog new/installation-images-12.29/Changelog --- old/installation-images-12.28/Changelog 2009-09-24 13:03:27.000000000 +0200 +++ new/installation-images-12.29/Changelog 2009-09-28 12:19:20.000000000 +0200 @@ -1,3 +1,6 @@ +28/9/2009: v12.29 + - don't depend on all branding files + 24/9/2009: v12.28 - we need more perl modules diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.28/VERSION new/installation-images-12.29/VERSION --- old/installation-images-12.28/VERSION 2009-09-24 13:03:31.000000000 +0200 +++ new/installation-images-12.29/VERSION 2009-09-28 12:18:50.000000000 +0200 @@ -1 +1 @@ -12.28 +12.29 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.28/data/base/base.file_list new/installation-images-12.29/data/base/base.file_list --- old/installation-images-12.28/data/base/base.file_list 2009-09-17 11:48:48.000000000 +0200 +++ new/installation-images-12.29/data/base/base.file_list 2009-09-28 12:16:58.000000000 +0200 @@ -307,12 +307,21 @@ # create splash #x mk_splash /mk_splash #include gen/splash - bootsplash-branding-openSUSE: - / - bootsplash-branding-SLES: - / - bootsplash-branding-SLED: + + if exists(bootsplash-branding-openSUSE) + bootsplash-branding-openSUSE: / + endif + + if exists(bootsplash-branding-SLES) + bootsplash-branding-SLES: + / + endif + + if exists(bootsplash-branding-SLED) + bootsplash-branding-SLED: + / + endif endif : ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org