Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at Tue Nov 23 14:35:15 CET 2010. -------- --- installation-images/installation-images.changes 2010-11-22 17:55:43.000000000 +0100 +++ installation-images/installation-images.changes 2010-11-23 11:02:27.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 23 11:02:11 CET 2010 - snwint@suse.de + +- fix xen build in spec file + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- needed_space_in_mb ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.8c9vc8/_old 2010-11-23 14:34:50.000000000 +0100 +++ /var/tmp/diff_new_pack.8c9vc8/_new 2010-11-23 14:34:50.000000000 +0100 @@ -21,7 +21,7 @@ Name: installation-images %define has_sles 0 -%define build_xen 1 +%define build_xen 0 %define has_vnc 0 BuildRequires: PolicyKit adaptec-firmware ash autoyast2-installation bc blueprint-cursor-theme cifs-utils 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-runlevel yast2-slp yast2-trans-allpacks yast2-trans-stats yast2-tune yast2-update yast2-users @@ -107,7 +107,7 @@ AutoReqProv: off Summary: Installation Image Files Version: 12.69 -Release: 1 +Release: 2 Source: installation-images-12.69.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -199,6 +199,7 @@ make THEMES=openSUSE %endif %ifarch %ix86 x86_64 +%if %{build_xen} # build xen initrd & kernel %if %has_sles image=initrd-xen kernel=kernel-xen MOD_CFG=xen make initrd+modules @@ -207,6 +208,7 @@ %endif MOD_CFG=xen make kernel %endif +%endif %ifarch ppc ppc64 %if %has_sles image=initrd-ppc64 kernel=kernel-ppc64 MOD_CFG=ppc64 make initrd+modules+gefrickel @@ -234,6 +236,7 @@ install -d -m 755 %{buildroot}/usr/sbin install -m 755 etc/mkinstallinitrd %{buildroot}/usr/sbin %ifarch %ix86 +%if %{build_xen} # xenpae compat gefrickel (bnc #397065) for i in %{buildroot}/branding/*/CD1/boot/i386/initrd-xen ; do [ -f "$i" ] && ln -s initrd-xen ${i}pae @@ -242,6 +245,7 @@ [ -f "$i" ] && ln -s vmlinuz-xen ${i}pae done %endif +%endif # get rid of /usr/lib/rpm/brp-strip-debug # strip kills the zImage.chrp-rs6k export NO_BRP_STRIP_DEBUG=true ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org