Hello community, here is the log from the commit of package kiwi for openSUSE:12.2 checked in at 2012-07-14 09:51:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/kiwi (Old) and /work/SRC/openSUSE:12.2/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi", Maintainer is "m...@suse.com" Changes: -------- --- /work/SRC/openSUSE:12.2/kiwi/kiwi.changes 2012-07-09 08:01:34.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.kiwi.new/kiwi.changes 2012-07-14 11:50:43.000000000 +0200 @@ -1,0 +2,69 @@ +Fri Jul 13 12:41:12 CEST 2012 - m...@suse.de + +- v5.03.37 released + +------------------------------------------------------------------- +Fri Jul 13 12:39:13 CEST 2012 - m...@suse.de + +- fixed spec file to write openSUSE instead of OpenSuSE (bnc #770825) + +------------------------------------------------------------------- +Fri Jul 13 09:54:21 CEST 2012 - m...@suse.de + +- v5.03.36 released + +------------------------------------------------------------------- +Fri Jul 13 09:30:57 CEST 2012 - adr...@suse.de + +- map openSUSE 12.3 to 12.2 configs for now +- reformated spec file by current spec_file_formater + +------------------------------------------------------------------- +Thu Jul 12 13:03:46 CEST 2012 - m...@suse.de + +- v5.03.35 released + +------------------------------------------------------------------- +Thu Jul 12 12:59:51 CEST 2012 - m...@suse.de + +- fixed use of grub2, with version 2.x there is no grub2-setup + anymore but a grub2-bios-setup. This change was introduced + with openSUSE 12.2 RC1 + +------------------------------------------------------------------- +Thu Jul 12 10:33:54 CEST 2012 - m...@suse.de + +- v5.03.34 released + +------------------------------------------------------------------- +Thu Jul 12 10:32:41 CEST 2012 - m...@suse.de + +- follow up spec file fix, list grub2-branding-openSUSE only + for suse version > 12.1 in the media requires + +------------------------------------------------------------------- +Thu Jul 12 10:25:10 CEST 2012 - m...@suse.de + +- v5.03.33 released + +------------------------------------------------------------------- +Thu Jul 12 09:57:26 CEST 2012 - m...@suse.de + +- fixed spec file to write openSUSE instead of openSuSE (bnc #770825) + +------------------------------------------------------------------- +Thu Jul 12 09:48:02 CEST 2012 - m...@suse.de + +- added grub2-branding-openSUSE to the media requires + +------------------------------------------------------------------- +Tue Jul 10 16:52:09 CEST 2012 - m...@suse.de + +- v5.03.32 released + +------------------------------------------------------------------- +Mon Jul 9 15:03:26 CEST 2012 - adr...@suse.de + +- fix dependencies on SLES 11 (sed does not support -E, use perl instead) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.lE2lDn/_old 2012-07-14 11:50:44.000000000 +0200 +++ /var/tmp/diff_new_pack.lE2lDn/_new 2012-07-14 11:50:44.000000000 +0200 @@ -18,10 +18,10 @@ Url: http://github.com/openSUSE/kiwi Name: kiwi -Summary: OpenSuSE - KIWI Image System +Summary: openSUSE - KIWI Image System License: GPL-2.0 Group: System/Management -Version: 5.03.31 +Version: 5.03.37 Release: 0 # requirements to build packages BuildRequires: gcc-c++ @@ -104,7 +104,7 @@ %if 0%{?sles_version} %define mysystems suse-SLES%{sles_version} suse-SLED%{sles_version} %else -%define mysystems %(echo `export VER=%{suse_version}; echo "suse-${VER:0:2}.${VER:2:1}"`) +%define mysystems %(echo `export VER=%{suse_version}; [ "$VER" == "1230" ] && VER="1220"; echo "suse-${VER:0:2}.${VER:2:1}"`) %endif %endif %if 0%{?rhel_version} @@ -120,7 +120,7 @@ %endif %description -The OpenSuSE KIWI Image System provides a complete operating system +The openSUSE KIWI Image System provides a complete operating system image solution for Linux supported hardware platforms as well as for virtualization systems like Xen. @@ -153,7 +153,7 @@ Jan Bornschlegel <jcb...@suse.com> %package -n kiwi-doc -Summary: OpenSuSE - KIWI Image System Documentation +Summary: openSUSE - KIWI Image System Documentation License: LGPL-2.0+ Group: Documentation/Howto %if 0%{?suse_version} > 1120 @@ -170,12 +170,12 @@ Marcus Schaefer %package -n kiwi-tools -Summary: OpenSuSE - KIWI tools collection +Summary: openSUSE - KIWI tools collection License: GPL-2.0+ Group: System/Management %description -n kiwi-tools -This package contains the OpenSuSE - KIWI tools set usable in and +This package contains the openSUSE - KIWI tools set usable in and outside of operating system images Authors: @@ -186,7 +186,7 @@ %package -n kiwi-pxeboot Requires: syslinux -Summary: OpenSuSE - KIWI Image System PXE boot structure +Summary: openSUSE - KIWI Image System PXE boot structure License: GPL-2.0+ Group: System/Management %if 0%{?suse_version} > 1120 @@ -219,7 +219,7 @@ Requires: virt-utils %endif %endif -Summary: OpenSuSE - KIWI Image System ISO boot +Summary: openSUSE - KIWI Image System ISO boot License: GPL-2.0+ Group: System/Management %if 0%{?suse_version} > 1120 @@ -236,7 +236,7 @@ %package -n kiwi-desc-isoboot-requires Requires: kiwi-desc-isoboot = %{version} Requires: %(echo `bash %{S:4} %{S:0} isoboot %{myarch} %{mysystems}`) -Summary: OpenSuSE - KIWI Image System ISO boot required packages +Summary: openSUSE - KIWI Image System ISO boot required packages License: GPL-2.0+ Group: System/Management @@ -277,7 +277,7 @@ Requires: qemu-img %endif %endif -Summary: OpenSuSE - KIWI Image System Virtual Machine boot +Summary: openSUSE - KIWI Image System Virtual Machine boot License: GPL-2.0+ Group: System/Management %if 0%{?suse_version} > 1120 @@ -294,7 +294,7 @@ %package -n kiwi-desc-vmxboot-requires Requires: kiwi-desc-vmxboot = %{version} Requires: %(echo `bash %{S:4} %{S:0} vmxboot %{myarch} %{mysystems}`) -Summary: OpenSuSE - KIWI Image System VMX boot required packages +Summary: openSUSE - KIWI Image System VMX boot required packages License: GPL-2.0+ Group: System/Management @@ -307,7 +307,7 @@ %package -n kiwi-desc-netboot Requires: kiwi = %{version} -Summary: OpenSuSE - KIWI Image System PXE network boot +Summary: openSUSE - KIWI Image System PXE network boot License: GPL-2.0+ Group: System/Management %ifarch ppc ppc64 s390 s390x @@ -331,7 +331,7 @@ %package -n kiwi-desc-netboot-requires Requires: kiwi-desc-netboot = %{version} Requires: %(echo `bash %{S:4} %{S:0} netboot %{myarch} %{mysystems}`) -Summary: OpenSuSE - KIWI Image System NET boot required packages +Summary: openSUSE - KIWI Image System NET boot required packages License: GPL-2.0+ Group: System/Management @@ -376,7 +376,7 @@ %else Requires: mkisofs %endif -Summary: OpenSuSE - KIWI image descriptions +Summary: openSUSE - KIWI image descriptions License: GPL-2.0 Group: System/Management %if 0%{?suse_version} > 1120 @@ -384,7 +384,7 @@ %endif %description -n kiwi-desc-oemboot -This package contains the OpenSuSE - KIWI image descriptions. Each +This package contains the openSUSE - KIWI image descriptions. Each image description exists in a single directory and contains an oemboot image description @@ -395,7 +395,7 @@ %package -n kiwi-desc-oemboot-requires Requires: kiwi-desc-oemboot = %{version} Requires: %(echo `bash %{S:4} %{S:0} oemboot %{myarch} %{mysystems}`) -Summary: OpenSuSE - KIWI Image System oem boot required packages +Summary: openSUSE - KIWI Image System oem boot required packages License: GPL-2.0+ Group: System/Management @@ -408,7 +408,7 @@ %package -n kiwi-templates Requires: kiwi-desc-vmxboot = %{version} -Summary: OpenSuSE - KIWI JeOS system image templates +Summary: openSUSE - KIWI JeOS system image templates License: GPL-2.0+ Group: System/Management %if 0%{?suse_version} > 1120 @@ -427,7 +427,7 @@ %ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm %package -n kiwi-media-requires -Summary: OpenSuSE - packages which should be part of the DVD +Summary: openSUSE - packages which should be part of the DVD License: GPL-2.0+ Group: System/Management %if 0%{?suse_version} > 1120 @@ -439,6 +439,9 @@ Recommends: gfxboot Recommends: memtest86+ Recommends: lxc +%if 0%{?suse_version} > 1210 +Recommends: grub2-branding-openSUSE +%endif %endif %description -n kiwi-media-requires ++++++ kiwi-docu.tar.bz2 ++++++ /work/SRC/openSUSE:12.2/kiwi/kiwi-docu.tar.bz2 /work/SRC/openSUSE:12.2/.kiwi.new/kiwi-docu.tar.bz2 differ: char 11, line 1 ++++++ kiwi-find-boot-requires.sh ++++++ --- /var/tmp/diff_new_pack.lE2lDn/_old 2012-07-14 11:50:44.000000000 +0200 +++ /var/tmp/diff_new_pack.lE2lDn/_new 2012-07-14 11:50:44.000000000 +0200 @@ -26,7 +26,8 @@ echo -n "$package " unset MISSING fi - done < <( sed '/<packages type="delete">/,/<\/packages>/d' "$file" | sed -En 's,.*package name="([^"]*)"( arch="([^"]*)")?.*,\1 \3,p' ) + done < <( sed '/<packages type="delete">/,/<\/packages>/d' "$file" | perl -e 'while (<STDIN>) { if ($_ =~ /.*package name="([^"]*)"( arch="([^"]*)")?.*/ ) { print $1." ".$3."\n"; }; }' + ) done [ -z "$MISSING" ] || echo "ERROR_NO_DEPENDENCIES_FOUND" ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2012-07-06 14:52:10.000000000 +0200 +++ new/kiwi/.revision 2012-07-12 13:04:20.000000000 +0200 @@ -1 +1 @@ -5e8f9f8529826337770066ad11e72c4590bb65f6 +b9036be6baf1717dd00de2dafe75bab772fc9af9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm --- old/kiwi/modules/KIWIBoot.pm 2012-07-06 14:52:10.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2012-07-12 13:04:32.000000000 +0200 @@ -2815,9 +2815,12 @@ #------------------------------------------ $kiwi -> info ("Creating grub2 core boot image"); my $core = "$tmpdir/boot/grub2/core.img"; - my $modules = "biosdisk part_msdos part_gpt ext2 iso9660 chain"; + my @modules = ( + 'biosdisk','part_msdos','part_gpt','ext2', + 'iso9660','chain','normal','linux','echo' + ); $status = qxx ( - "grub2-mkimage -O i386-pc -v -o $core -c $bootfile $modules 2>&1" + "grub2-mkimage -O i386-pc -v -o $core -c $bootfile @modules 2>&1" ); $result = $? >> 8; if ($result != 0) { @@ -4173,7 +4176,7 @@ # install grub2 into MBR #------------------------------------------ $status = qxx ( - "grub2-setup -vr '(hd0)' -d $stages -m $dmfile $diskname 2>&1" + "grub2-bios-setup -v -d $stages -m $dmfile $diskname 2>&1" ); $result = $? >> 8; } else { @@ -4184,7 +4187,7 @@ $rdev = readlink ($rdev); $rdev =~ s/\.\./\/dev/; $status = qxx ( - "grub2-setup -vfr '(hd0,1)' -d $stages -m $dmfile $rdev 2>&1" + "grub2-bios-setup -vf -d $stages -m $dmfile $rdev 2>&1" ); $result = $? >> 8; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2012-07-06 15:04:25.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2012-07-13 12:41:46.000000000 +0200 @@ -50,7 +50,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "5.03.31"; + $data{Version} = "5.03.37"; $data{Publisher} = "SUSE LINUX Products GmbH"; $data{Preparer} = "KIWI - http://kiwi.berlios.de";; $data{ConfigName} = "config.xml"; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
