Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at 2012-03-15 15:58:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/installation-images (Old) and /work/SRC/openSUSE:Factory/.installation-images.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes 2012-03-08 19:44:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes 2012-03-15 15:58:40.000000000 +0100 @@ -1,0 +2,22 @@ +Thu Mar 15 14:42:55 UTC 2012 - [email protected] + +- make it build for i586 too, so we can have it in M2 + +------------------------------------------------------------------- +Thu Mar 15 13:54:04 CET 2012 - [email protected] + +- make vbox package optional +- add yast.ssh link (bnc #745340) + +------------------------------------------------------------------- +Thu Mar 15 12:29:24 CET 2012 - [email protected] + +- disable vbox + +------------------------------------------------------------------- +Wed Mar 14 15:35:12 CET 2012 - [email protected] + +- build fails on dangling symlinks +- adjust to package changes + +------------------------------------------------------------------- Old: ---- installation-images-13.32.tar.bz2 New: ---- installation-images-13.34.tar.bz2 new.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.q5NzVV/_old 2012-03-15 15:58:42.000000000 +0100 +++ /var/tmp/diff_new_pack.q5NzVV/_new 2012-03-15 15:58:42.000000000 +0100 @@ -19,9 +19,10 @@ Name: installation-images -%define has_sles 0 -%define build_xen 1 -%define has_vnc 1 +%define with_sles 0 +%define with_xen 1 +%define with_vnc 1 +%define with_vbox 0 BuildRequires: Mesa BuildRequires: Mesa-libEGL1 BuildRequires: aaa_base @@ -214,7 +215,7 @@ BuildRequires: yast2-tune BuildRequires: yast2-update BuildRequires: yast2-users -%if %has_vnc +%if %with_vnc BuildRequires: xorg-x11-Xvnc %endif # kmps @@ -224,7 +225,7 @@ BuildRequires: ftp BuildRequires: ipw-firmware BuildRequires: tftp -%if %{build_xen} +%if %with_xen BuildRequires: kernel-xen BuildRequires: xen-kmp-default %else @@ -240,7 +241,7 @@ BuildRequires: xorg-x11-driver-input BuildRequires: xorg-x11-driver-video BuildRequires: xorg-x11-driver-video-unichrome -%if %has_vnc +%if %with_vnc BuildRequires: tightvnc %endif %endif @@ -249,10 +250,10 @@ BuildRequires: xorg-x11-driver-video-radeonhd %endif %ifarch ppc ppc64 +BuildRequires: kernel-ppc64 BuildRequires: lilo BuildRequires: pdisk BuildRequires: powerpc-utils -BuildRequires: kernel-ppc64 %endif %ifarch %ix86 x86_64 BuildRequires: acpica @@ -268,9 +269,10 @@ BuildRequires: lilo BuildRequires: memtest86+ BuildRequires: syslinux +%if %with_vbox BuildRequires: virtualbox-guest-kmp-default -BuildRequires: virtualbox-guest-tools BuildRequires: virtualbox-guest-x11 +%endif BuildRequires: yast2-vm %endif %ifarch %ix86 @@ -300,14 +302,14 @@ %endif %ifarch %ix86 x86_64 BuildRequires: bootsplash +BuildRequires: bootsplash-branding-openSUSE BuildRequires: gfxboot-branding-openSUSE BuildRequires: yast2-qt-branding-openSUSE -BuildRequires: bootsplash-branding-openSUSE -%if %has_sles -BuildRequires: gfxboot-branding-SLED -BuildRequires: gfxboot-branding-SLES +%if %with_sles BuildRequires: bootsplash-branding-SLED BuildRequires: bootsplash-branding-SLES +BuildRequires: gfxboot-branding-SLED +BuildRequires: gfxboot-branding-SLES %endif %endif %ifnarch s390 s390x @@ -316,7 +318,7 @@ %ifarch %ix86 x86_64 ia64 #BuildRequires: brocade-bfa-kmp-default %endif -%if %has_sles +%if %with_sles BuildRequires: yast2-theme-SLE %endif BuildRequires: desktop-data-openSUSE @@ -333,9 +335,10 @@ Summary: Installation Image Files License: GPL-2.0+ Group: Metapackages -Version: 13.32 +Version: 13.34 Release: 0 -Source: installation-images-13.32.tar.bz2 +Source: installation-images-13.34.tar.bz2 +Patch0: new.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -398,6 +401,7 @@ %prep %setup +%patch0 -p1 rm -f /usr/lib/build/checks/04-check-filelist %build @@ -413,15 +417,15 @@ # export instsys_complain_root=2 # beta only: ignore non-critical errors # export debug=ignore -%if %has_sles +%if %with_sles make %else make THEMES=openSUSE %endif %ifarch %ix86 x86_64 -%if %{build_xen} +%if %with_xen # build xen initrd & kernel -%if %has_sles +%if %with_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 @@ -430,7 +434,7 @@ %endif %endif %ifarch ppc ppc64 -%if %has_sles +%if %with_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 @@ -441,13 +445,13 @@ BUILD_DISTRIBUTION_NAME="%distribution" export BUILD_DISTRIBUTION_NAME test ! -z "$BUILD_DISTRIBUTION_NAME" -%if %has_sles +%if %with_sles make install DESTDIR=%{buildroot} %else make install DESTDIR=%{buildroot} THEMES=openSUSE %endif # make debuginfo DESTDIR=%{buildroot} -%if %has_sles +%if %with_sles make install-initrd DESTDIR=%{buildroot}/usr/lib/install-initrd %else make install-initrd DESTDIR=%{buildroot}/usr/lib/install-initrd THEMES=openSUSE @@ -456,7 +460,7 @@ install -d -m 755 %{buildroot}/usr/sbin install -m 755 etc/mkinstallinitrd %{buildroot}/usr/sbin %ifarch %ix86 -%if %{build_xen} +%if %with_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 ++++++ installation-images-13.32.tar.bz2 -> installation-images-13.34.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.32/VERSION new/installation-images-13.34/VERSION --- old/installation-images-13.32/VERSION 2012-02-27 13:11:46.000000000 +0100 +++ new/installation-images-13.34/VERSION 2012-03-15 13:53:59.000000000 +0100 @@ -1 +1 @@ -13.32 +13.34 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.32/bin/mk_image new/installation-images-13.34/bin/mk_image --- old/installation-images-13.32/bin/mk_image 2012-02-09 14:33:06.000000000 +0100 +++ new/installation-images-13.34/bin/mk_image 2012-03-14 13:56:59.000000000 +0100 @@ -92,7 +92,7 @@ if(!$ENV{nolinkcheck}) { print "checking for dangling symlinks...\n"; if(check_link $tmpdir) { - if(1 || $debug =~ /\bignore\b/) { + if($debug =~ /\bignore\b/) { warn "$Script: please fix symlinks\n"; } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.32/changelog new/installation-images-13.34/changelog --- old/installation-images-13.32/changelog 2012-02-27 13:11:50.000000000 +0100 +++ new/installation-images-13.34/changelog 2012-03-15 13:54:03.000000000 +0100 @@ -1,4 +1,12 @@ -2012-02-27: HEAD +2012-03-15: HEAD + - make vbox package optional + - add yast.ssh link (bnc #745340) + +2012-03-14: 13.33 + - build fails on dangling symlinks + - adjust to package changes + +2012-02-27: 13.32 - adjust to package changes 2012-02-22: 13.31 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.32/data/initrd/initrd.file_list new/installation-images-13.34/data/initrd/initrd.file_list --- old/installation-images-13.32/data/initrd/initrd.file_list 2012-02-22 14:31:36.000000000 +0100 +++ new/installation-images-13.34/data/initrd/initrd.file_list 2012-03-14 13:59:21.000000000 +0100 @@ -270,7 +270,7 @@ /lib*/libwrap.so.* dhcpcd: - /sbin/dhcpcd + / libnl-1_1: /lib*/libnl.so.* @@ -284,7 +284,7 @@ /sbin/route iproute2: - /sbin/ip + /usr/sbin/ip ethtool: /usr/sbin/ethtool diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.32/data/root/etc/inst_setup new/installation-images-13.34/data/root/etc/inst_setup --- old/installation-images-13.32/data/root/etc/inst_setup 2012-02-09 10:24:01.000000000 +0100 +++ new/installation-images-13.34/data/root/etc/inst_setup 2012-03-15 10:16:11.000000000 +0100 @@ -224,7 +224,7 @@ cat <<EOF *** login using 'ssh -X root@${hostname}' *** - *** run '$yast' to start the installation *** + *** run '${yast}.ssh' to start the installation *** EOF while true ; do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.32/data/root/root.file_list new/installation-images-13.34/data/root/root.file_list --- old/installation-images-13.32/data/root/root.file_list 2012-02-27 12:58:21.000000000 +0100 +++ new/installation-images-13.34/data/root/root.file_list 2012-03-15 13:53:04.000000000 +0100 @@ -214,7 +214,7 @@ / ?hdparm: - /sbin/hdparm + /usr/sbin/hdparm smartmontools: /usr/sbin/smartctl @@ -323,6 +323,7 @@ /var r /usr/lib/YaST2/servers_non_y2/ag_cron s /usr/lib/YaST2/startup/YaST2.First-Stage /sbin/yast + s /usr/lib/YaST2/startup/YaST2.First-Stage /sbin/yast.ssh r /usr/lib/YaST2/bin/yast2 yast2-add-on: @@ -670,9 +671,6 @@ liblzma*: / -iproute2: - /sbin/ip - libnscd: / @@ -1008,11 +1006,9 @@ /usr/lib*/xorg/modules/*.uc endif - if arch eq 'i386' || arch eq 'x86_64' - virtualbox-guest-x11: - /etc - /usr/lib*/xorg/modules - endif + ?virtualbox-guest-x11: + /etc + /usr/lib*/xorg/modules xterm: /usr/share/X11/app-defaults/XTerm @@ -1200,6 +1196,8 @@ Mesa: /usr/lib*/dri/swrast_dri.so + /usr/lib*/dri/libdricore.so + /usr/lib*/dri/libglsl.so Mesa-libEGL*: / @@ -1318,8 +1316,11 @@ libgmodule-2_0-*: / -#libxcb-render*: -# / +libxcb-render*: + / + +libxcb-shape*: + / libltdl*: / diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.32/etc/module.config new/installation-images-13.34/etc/module.config --- old/installation-images-13.32/etc/module.config 2012-02-15 11:28:16.000000000 +0100 +++ new/installation-images-13.34/etc/module.config 2012-03-14 14:04:00.000000000 +0100 @@ -244,6 +244,8 @@ vmxnet3,VMware vmxnet3 virtual NIC xen-vnif,"Xen Network" +kernel/drivers/net/hyperv/.* +kernel/drivers/net/team/.* kernel/drivers/net/ethernet/.* kernel/drivers/net/fddi/.* kernel/drivers/net/tokenring/.* ++++++ new.patch ++++++ Index: installation-images-13.34/data/root/root.file_list =================================================================== --- installation-images-13.34.orig/data/root/root.file_list 2012-03-15 13:53:04.000000000 +0100 +++ installation-images-13.34/data/root/root.file_list 2012-03-15 15:30:44.866629201 +0100 @@ -45,8 +45,11 @@ r /etc/issue libelf0: / +libkmod*: + / + systemd: - /usr/<lib> + / libdb-*: / Index: installation-images-13.34/bin/mk_image =================================================================== --- installation-images-13.34.orig/bin/mk_image 2012-03-14 13:56:59.000000000 +0100 +++ installation-images-13.34/bin/mk_image 2012-03-15 15:22:10.443928444 +0100 @@ -179,6 +179,7 @@ sub check_link if($x =~ /^\//) { next if $x =~ m#^/lbin/#; next if $x =~ m#^/proc/#; + next if $x =~ m#^/dev/#; next if -e "$dir$x"; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
