Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory checked in
at 2012-09-26 16:20:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi (Old)
and /work/SRC/openSUSE:Factory/.kiwi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi", Maintainer is "m...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2012-09-25
10:40:37.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2012-09-26
16:20:20.000000000 +0200
@@ -1,0 +2,25 @@
+Tue Sep 25 17:07:14 CEST 2012 - m...@suse.de
+
+- v5.04.13 released
+
+-------------------------------------------------------------------
+Tue Sep 25 17:06:33 CEST 2012 - m...@suse.de
+
+- cleanup spec file, correctly set Requires for kiwi-desc-*boot
+
+-------------------------------------------------------------------
+Tue Sep 25 15:39:43 CEST 2012 - m...@suse.de
+
+- make check for duplicate volume group name more robust
+
+-------------------------------------------------------------------
+Tue Sep 25 15:30:49 CEST 2012 - m...@suse.de
+
+- v5.04.12 released
+
+-------------------------------------------------------------------
+Tue Sep 25 15:29:19 CEST 2012 - m...@suse.de
+
+- fixed check for duplicate volume group name
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.3ATTNw/_old 2012-09-26 16:20:23.000000000 +0200
+++ /var/tmp/diff_new_pack.3ATTNw/_new 2012-09-26 16:20:23.000000000 +0200
@@ -21,7 +21,7 @@
Summary: openSUSE - KIWI Image System
License: GPL-2.0
Group: System/Management
-Version: 5.04.11
+Version: 5.04.13
Release: 0
# requirements to build packages
BuildRequires: gcc-c++
@@ -208,17 +208,12 @@
Requires: e2fsprogs
Requires: kiwi = %{version}
Requires: syslinux
-%if %{suse_version} > 1010
+%if 0%{?suse_version}
Requires: genisoimage
-%else
-Requires: mkisofs
-%endif
-%ifarch ppc ppc64 s390 s390x
-Requires: virt-utils
-%else
-%if 0%{?suse_version} >= 1130
Requires: virt-utils
%endif
+%if 0%{?rhel_version}
+Requires: qemu-img
%endif
Summary: openSUSE - KIWI Image System ISO boot
License: GPL-2.0+
@@ -250,13 +245,14 @@
%package -n kiwi-desc-vmxboot
Requires: kiwi = %{version}
+Requires: parted
%if 0%{?suse_version}
Requires: multipath-tools
-Requires: parted
+Requires: virt-utils
%endif
%if 0%{?rhel_version}
Requires: device-mapper-multipath
-Requires: parted
+Requires: qemu-img
%endif
%ifarch %ix86 x86_64
%if 0%{?suse_version} >= 1220
@@ -265,19 +261,6 @@
Requires: grub
%endif
%endif
-%ifarch ppc ppc64 s390 s390x
-Requires: virt-utils
-%else
-%if 0%{?suse_version} >= 1130
-Requires: virt-utils
-%endif
-%if 0%{?suse_version} < 1130
-Requires: qemu
-%endif
-%if 0%{?rhel_version}
-Requires: qemu-img
-%endif
-%endif
Summary: openSUSE - KIWI Image System Virtual Machine boot
License: GPL-2.0+
Group: System/Management
@@ -345,37 +328,25 @@
%package -n kiwi-desc-oemboot
Requires: kiwi = %{version}
-%ifarch %arm
-Requires: u-boot-tools
-%endif
-%ifarch ppc ppc64 s390 s390x
-Requires: virt-utils
-%else
-%if 0%{?suse_version} >= 1130
-Requires: virt-utils
-%endif
-%if 0%{?suse_version} < 1130
-Requires: qemu
-%endif
-%if 0%{?rhel_version}
-Requires: qemu-img
-%endif
-%endif
+Requires: parted
%if 0%{?suse_version}
+Requires: genisoimage
Requires: multipath-tools
-Requires: parted
+Requires: virt-utils
%endif
%if 0%{?rhel_version}
Requires: device-mapper-multipath
-Requires: parted
+Requires: qemu-img
%endif
%ifarch %ix86 x86_64
+%if 0%{?suse_version} >= 1220
+Requires: grub2
+%else
Requires: grub
%endif
-%if %{suse_version} > 1010
-Requires: genisoimage
-%else
-Requires: mkisofs
+%endif
+%ifarch %arm
+Requires: u-boot-tools
%endif
Summary: openSUSE - KIWI image descriptions
License: GPL-2.0
++++++ kiwi.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision 2012-09-21 14:54:59.000000000 +0200
+++ new/kiwi/.revision 2012-09-21 14:54:59.000000000 +0200
@@ -1 +1 @@
-28d1a4d4cb433e8ad21ddaa25da49614e00df537
+358990c0c4f7ad3b23cb540a6ed1f2859a4dc2b0
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-09-21 14:54:59.000000000 +0200
+++ new/kiwi/modules/KIWIGlobals.pm 2012-09-25 17:07:45.000000000 +0200
@@ -50,7 +50,7 @@
# Globals (generic)
#------------------------------------------
my %data;
- $data{Version} = "5.04.11";
+ $data{Version} = "5.04.13";
$data{Publisher} = "SUSE LINUX Products GmbH";
$data{Preparer} = "KIWI - http://kiwi.berlios.de";;
$data{ConfigName} = "config.xml";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh
new/kiwi/modules/KIWILinuxRC.sh
--- old/kiwi/modules/KIWILinuxRC.sh 2012-09-21 14:54:59.000000000 +0200
+++ new/kiwi/modules/KIWILinuxRC.sh 2012-09-25 17:07:45.000000000 +0200
@@ -3577,11 +3577,17 @@
# /dev/$VGROUP/LVRoot and/or /dev/$VGROUP/LVComp
# return zero on success
# ----
- local vg_count
+ local vg_count=0
+ local vg_found
if [ ! "$kiwi_lvm" = "true" ];then
return 1
fi
- vg_count=$(vgs --noheadings -o vg_name 2>/dev/null | wc -l)
+ for i in $(vgs --noheadings -o vg_name 2>/dev/null);do
+ vg_found=$(echo $i)
+ if [ "$vg_found" = "$VGROUP" ];then
+ vg_count=$((vg_count + 1))
+ fi
+ done
if [ $vg_count -gt 1 ];then
Echo "Duplicate VolumeGroup name $VGROUP found !"
Echo "$vg_count versions of this volume group exists"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
