Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory checked in
at 2012-03-26 11:02:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-03-20
11:30:01.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2012-03-26
11:02:25.000000000 +0200
@@ -1,0 +2,49 @@
+Fri Mar 23 14:40:42 CET 2012 - m...@suse.de
+
+- v5.02.20 released
+
+-------------------------------------------------------------------
+Thu Mar 22 13:00:08 CET 2012 - m...@suse.de
+
+- arm: added support for optional ${append} bootargs variable (bnc #752623)
+
+-------------------------------------------------------------------
+Tue Mar 20 22:34:53 CET 2012 - m...@suse.de
+
+- make sure loader variable is initialized
+
+-------------------------------------------------------------------
+Mon Mar 19 17:29:44 CET 2012 - m...@suse.de
+
+- don't use -s option for losetup:
+ the option -s is in collision with the Loop-AES losetup dialect that
+ is used in some distributions. Use the long version (--show) only.
+
+-------------------------------------------------------------------
+Mon Mar 19 16:14:13 CET 2012 - m...@suse.de
+
+- changed repartition code for LVM concerning the use of
+ element '<oem-system-size>' and 'freespace=all' volume:
+ * if none of the two is specified, the root will be expanded to
+ occupy all available space
+ * if only oem-systemsize is specified, the root will be expanded
+ as much as specified
+ * if only freespace=all is specified (for non-root volume), then
+ the root will not be expanded and the other volume will take all
+ available space
+ * Finally, if both are specified, then the root will be expanded to
+ take as much as oem-systemsize requires and any remaining space is
+ assigned to the other volume.
+
+-------------------------------------------------------------------
+Sat Mar 17 14:52:00 CET 2012 - m...@suse.de
+
+- fixed compare of object addresses by using refaddr. This is
+ more robust because objects can overload operators like '!='
+
+-------------------------------------------------------------------
+Sat Mar 17 14:46:20 CET 2012 - m...@suse.de
+
+- fixed pattern names used in examples (bnc #752754)
+
+-------------------------------------------------------------------
@@ -17,0 +67,6 @@
+
+-------------------------------------------------------------------
+Fri Mar 16 13:42:24 CET 2012 - rjsch...@suse.de
+
+- only remove the KIWI created initrd and kernel if mkinitrd run was successful
+- remove unused variable haveVMX
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.972vgN/_old 2012-03-26 11:02:27.000000000 +0200
+++ /var/tmp/diff_new_pack.972vgN/_new 2012-03-26 11:02:27.000000000 +0200
@@ -22,7 +22,7 @@
Summary: OpenSuSE - KIWI Image System
License: GPL-2.0
Group: System/Management
-Version: 5.02.19
+Version: 5.02.20
Release: 0
# requirements to build packages
BuildRequires: gcc-c++
++++++ kiwi-docu.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/kiwi/kiwi-docu.tar.bz2
/work/SRC/openSUSE:Factory/.kiwi.new/kiwi-docu.tar.bz2 differ: char 11, line 1
++++++ kiwi.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision 2012-03-16 14:27:44.000000000 +0100
+++ new/kiwi/.revision 2012-03-16 14:27:44.000000000 +0100
@@ -1 +1 @@
-c96be4b3076b74e1d47b902aced3d44aec271672
+24ec0eed210a250738d298e186cc77ee07ba577e
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-03-16 14:27:57.000000000 +0100
+++ new/kiwi/modules/KIWIBoot.pm 2012-03-23 14:41:02.000000000 +0100
@@ -3972,9 +3972,9 @@
$kiwi -> failed ();
return;
} elsif (($type=~ /^KIWI USB/)||($imgtype=~ /vmx|oem|split/)) {
- print FD "setenv bootargs loader=$bloader
$cmdline;"."\n";
+ print FD "setenv bootargs loader=$bloader $cmdline
\${append}\n";
} else {
- print FD "setenv bootargs loader=$bloader
$cmdline;"."\n";
+ print FD "setenv bootargs loader=$bloader $cmdline
\${append}\n"
}
print FD 'boot'."\n";
close FD;
@@ -4610,7 +4610,7 @@
#==========================================
# bind file to loop device
#------------------------------------------
- $status = qxx ("/sbin/losetup -s -f $system 2>&1"); chomp $status;
+ $status = qxx ("/sbin/losetup -f --show $system 2>&1"); chomp $status;
$result = $? >> 8;
if ($result != 0) {
# /.../
@@ -4618,7 +4618,7 @@
# device manually even though it's most likely that this
# search will fail too. The following is only useful for
# older version of losetup which doesn't understand the
- # option combination -s -f
+ # option combination -f --show
# ----
my $loopfound = 0;
for (my $id=0;$id<=7;$id++) {
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-03-16 14:27:57.000000000 +0100
+++ new/kiwi/modules/KIWIGlobals.pm 2012-03-23 14:41:02.000000000 +0100
@@ -42,7 +42,7 @@
# Globals (generic)
#------------------------------------------
my %data;
- $data{Version} = "5.02.19";
+ $data{Version} = "5.02.20";
$data{Publisher} = "SUSE LINUX Products GmbH";
$data{Preparer} = "KIWI - http://kiwi.berlios.de";;
$data{ConfigName} = "config.xml";
@@ -329,7 +329,8 @@
);
$result= $? >> 8;
if ($result == 0) {
- $status = qxx ("/sbin/losetup -s -f $source 2>&1");
chomp $status;
+ $status = qxx ("/sbin/losetup -f --show $source 2>&1");
+ chomp $status;
$result = $? >> 8;
if ($result != 0) {
$kiwi -> error (
@@ -367,7 +368,8 @@
#------------------------------------------
if ($type eq "luks") {
if (-f $source) {
- $status = qxx ("/sbin/losetup -s -f $source 2>&1");
chomp $status;
+ $status = qxx ("/sbin/losetup -f --show $source 2>&1");
+ chomp $status;
$result = $? >> 8;
if ($result != 0) {
$kiwi -> error ("Couldn't loop bind logical
extend: $status");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWIImage.pm
new/kiwi/modules/KIWIImage.pm
--- old/kiwi/modules/KIWIImage.pm 2012-03-16 14:27:44.000000000 +0100
+++ new/kiwi/modules/KIWIImage.pm 2012-03-23 14:41:02.000000000 +0100
@@ -3278,7 +3278,7 @@
my $kiwi = $this->{kiwi};
my $data;
my $code;
- $data = qxx ("/sbin/losetup -s -f $out 2>&1"); chomp $data;
+ $data = qxx ("/sbin/losetup -f --show $out 2>&1"); chomp $data;
$code = $? >> 8;
if ($code != 0) {
$kiwi -> error ("Couldn't loop bind logical extend: $data");
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-03-16 14:27:44.000000000 +0100
+++ new/kiwi/modules/KIWILinuxRC.sh 2012-03-23 14:41:02.000000000 +0100
@@ -69,6 +69,17 @@
fi
#======================================
+# Exports (arch specific)
+#--------------------------------------
+if [ "$arch" = "ppc64" ];then
+ test -z "$loader" && export loader=yaboot
+elif [[ $arch =~ arm ]];then
+ test -z "$loader" && export loader=uboot
+else
+ test -z "$loader" && export loader=grub
+fi
+
+#======================================
# Dialog
#--------------------------------------
function Dialog {
@@ -918,7 +929,6 @@
local umountProc=0
local umountSys=0
local systemMap=0
- local haveVMX=0
local dracutExec=$(which dracut 2>/dev/null)
local mkinitrdExec=$(which mkinitrd 2>/dev/null)
local params
@@ -938,14 +948,7 @@
mount -t sysfs sysfs /sys
umountSys=1
fi
- if [ $bootLoaderOK = "1" ];then
- if [ -f /boot/initrd.vmx ];then
- rm -f /boot/initrd.vmx
- rm -f /boot/linux.vmx
- rm -f /boot/initrd-*.img ##remove the dist's
initrd image
- haveVMX=1
- fi
- fi
+ rm -f /boot/initrd-*.img ##remove the dist's initrd image
updateModuleDependencies
params=" -f /boot/initrd-$kernel_version $kernel_version"
if [ -x "$mkinitrdExec" ] ; then
@@ -965,6 +968,12 @@
systemIntegrity=unknown
bootLoaderOK=0
fi
+ if [ $bootLoaderOK = "1" ];then
+ if [ -f /boot/initrd.vmx ];then
+ rm -f /boot/initrd.vmx
+ rm -f /boot/linux.vmx
+ fi
+ fi
if [ $umountSys -eq 1 ];then
umount /sys
fi
@@ -990,7 +999,6 @@
local umountProc=0
local umountSys=0
local systemMap=0
- local haveVMX=0
local mkinitrdExec=$(which mkinitrd 2>/dev/null)
local params
local running
@@ -1015,18 +1023,17 @@
if grep -qi param_B $mkinitrdExec;then
params="-B"
fi
+ if ! $mkinitrdExec $params;then
+ Echo "Can't create initrd"
+ systemIntegrity=unknown
+ bootLoaderOK=0
+ fi
if [ $bootLoaderOK = "1" ];then
if [ -f /boot/initrd.vmx ];then
rm -f /boot/initrd.vmx
rm -f /boot/linux.vmx
- haveVMX=1
fi
fi
- if ! $mkinitrdExec $params;then
- Echo "Can't create initrd"
- systemIntegrity=unknown
- bootLoaderOK=0
- fi
if [ -f /etc/init.d/boot.device-mapper ];then
/etc/init.d/boot.device-mapper stop
fi
@@ -3154,7 +3161,7 @@
"Failed to mount ISO storage device !" \
"reboot"
fi
- biosBootDevice=$(losetup -s -f /mnt/$isofrom_system)
+ biosBootDevice=$(losetup -f --show /mnt/$isofrom_system)
if [ ! $? = 0 ];then
systemException \
"Failed to loop setup ISO system !" \
@@ -7807,7 +7814,7 @@
#======================================
# create root filesystem loop device
#--------------------------------------
- diskLoop=$(losetup -s -f $readOnlyRootImage)
+ diskLoop=$(losetup -f --show $readOnlyRootImage)
if [ ! $? = 0 ];then
# /.../
# old version of losetup doesn't know about
@@ -7842,7 +7849,7 @@
return
fi
echo "rm -f /tmp/cow" >> $reset
- snapLoop=$(losetup -s -f /tmp/cow)
+ snapLoop=$(losetup -f --show /tmp/cow)
if [ ! $? = 0 ];then
# /.../
# old version of losetup doesn't know about
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWIOverlay.pm
new/kiwi/modules/KIWIOverlay.pm
--- old/kiwi/modules/KIWIOverlay.pm 2012-03-16 14:27:44.000000000 +0100
+++ new/kiwi/modules/KIWIOverlay.pm 2012-03-23 14:41:02.000000000 +0100
@@ -247,7 +247,7 @@
#======================================
# create root filesystem loop device
#--------------------------------------
- $imageLoop = qxx ("losetup -s -f $readOnlyRootImage 2>&1");
+ $imageLoop = qxx ("losetup -f --show $readOnlyRootImage 2>&1");
$code = $? >> 8;
if ($code != 0) {
$result{stack} = \@releaseList;
@@ -268,7 +268,7 @@
return;
}
}
- $snapLoop = qxx ("losetup -s -f $cowfile");
+ $snapLoop = qxx ("losetup -f --show $cowfile");
$code = $? >> 8;
if ($code != 0) {
$result{stack} = \@releaseList;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWIXMLValidator.pm
new/kiwi/modules/KIWIXMLValidator.pm
--- old/kiwi/modules/KIWIXMLValidator.pm 2012-03-16 14:27:44.000000000
+0100
+++ new/kiwi/modules/KIWIXMLValidator.pm 2012-03-23 14:41:02.000000000
+0100
@@ -24,6 +24,7 @@
use KIWILocator;
use KIWILog;
use KIWIQX;
+use Scalar::Util 'refaddr';
#==========================================
# Exports
@@ -497,7 +498,7 @@
return 1;
}
for my $pkgs (@pkgsNodes) {
- if ($pkgs != $defPackSection) {
+ if (refaddr($pkgs) != refaddr($defPackSection)) {
my $patternType = $pkgs -> getAttribute( 'patternType'
);
if ($patternType && $patternType ne $defPatternTypeVal)
{
my $kiwi = $this->{kiwi};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-dump
new/kiwi/system/boot/armv7l/oemboot/suse-dump
--- old/kiwi/system/boot/armv7l/oemboot/suse-dump 2012-03-16
14:27:44.000000000 +0100
+++ new/kiwi/system/boot/armv7l/oemboot/suse-dump 2012-03-23
14:41:02.000000000 +0100
@@ -295,7 +295,7 @@
reqpart=1
info=/tmp/partinfo
wmrc=/wmrc
- loop=$(losetup -s -f $imageName)
+ loop=$(losetup -f --show $imageName)
if [ $? != 0 ];then
# /.../
# old version of losetup doesn't know about
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/rhel-dump
new/kiwi/system/boot/ix86/oemboot/rhel-dump
--- old/kiwi/system/boot/ix86/oemboot/rhel-dump 2012-03-16 14:27:44.000000000
+0100
+++ new/kiwi/system/boot/ix86/oemboot/rhel-dump 2012-03-23 14:41:02.000000000
+0100
@@ -291,7 +291,7 @@
reqpart=1
info=/tmp/partinfo
wmrc=/wmrc
- loop=$(losetup -s -f $imageName)
+ loop=$(losetup -f --show $imageName)
if [ $? != 0 ];then
# /.../
# old version of losetup doesn't know about
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-dump
new/kiwi/system/boot/ix86/oemboot/suse-dump
--- old/kiwi/system/boot/ix86/oemboot/suse-dump 2012-03-16 14:27:44.000000000
+0100
+++ new/kiwi/system/boot/ix86/oemboot/suse-dump 2012-03-23 14:41:02.000000000
+0100
@@ -295,7 +295,7 @@
reqpart=1
info=/tmp/partinfo
wmrc=/wmrc
- loop=$(losetup -s -f $imageName)
+ loop=$(losetup -f --show $imageName)
if [ $? != 0 ];then
# /.../
# old version of losetup doesn't know about
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-repart
new/kiwi/system/boot/ix86/oemboot/suse-repart
--- old/kiwi/system/boot/ix86/oemboot/suse-repart 2012-03-16
14:27:44.000000000 +0100
+++ new/kiwi/system/boot/ix86/oemboot/suse-repart 2012-03-23
14:41:02.000000000 +0100
@@ -383,12 +383,15 @@
swapParam=yes
fi
#======================================
- # Extend all free volume...
+ # Extend root + optional allFreeVolume
#--------------------------------------
if [ -z "$OEM_SYSTEMSIZE" ];then
lvextend -l +100%FREE /dev/$VGROUP/$allFreeVolume
else
- lvextend --size $OEM_SYSTEMSIZE"M"
/dev/$VGROUP/$allFreeVolume
+ lvextend --size $OEM_SYSTEMSIZE"M" /dev/$VGROUP/LVRoot
+ if [ "$allFreeVolume" != "LVRoot" ];then
+ lvextend -l +100%FREE
/dev/$VGROUP/$allFreeVolume
+ fi
fi
#======================================
# setup new device names
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-dump
new/kiwi/system/boot/ppc/oemboot/suse-dump
--- old/kiwi/system/boot/ppc/oemboot/suse-dump 2012-03-16 14:27:44.000000000
+0100
+++ new/kiwi/system/boot/ppc/oemboot/suse-dump 2012-03-23 14:41:02.000000000
+0100
@@ -295,7 +295,7 @@
reqpart=1
info=/tmp/partinfo
wmrc=/wmrc
- loop=$(losetup -s -f $imageName)
+ loop=$(losetup -f --show $imageName)
if [ $? != 0 ];then
# /.../
# old version of losetup doesn't know about
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-dump
new/kiwi/system/boot/s390/oemboot/suse-dump
--- old/kiwi/system/boot/s390/oemboot/suse-dump 2012-03-16 14:27:44.000000000
+0100
+++ new/kiwi/system/boot/s390/oemboot/suse-dump 2012-03-23 14:41:02.000000000
+0100
@@ -295,7 +295,7 @@
reqpart=1
info=/tmp/partinfo
wmrc=/wmrc
- loop=$(losetup -s -f $imageName)
+ loop=$(losetup -f --show $imageName)
if [ $? != 0 ];then
# /.../
# old version of losetup doesn't know about
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
