commit kiwi for openSUSE:Factory

27 Jan 2011

Hello community,

here is the log from the commit of package kiwi for openSUSE:Factory
checked in at Thu Jan 27 12:33:11 CET 2011.



--------

--- kiwi/kiwi.changes	2011-01-25 11:14:58.000000000 +0100
+++ kiwi/kiwi.changes	2011-01-27 12:25:41.000000000 +0100
@@ -1,0 +2,43 @@
+Thu Jan 27 12:20:21 CET 2011 - ms@suse.de
+  
+- fixed build for 11.4
+  
+-------------------------------------------------------------------
+Thu Jan 27 10:03:21 CET 2011 - ms@suse.de
+  
+- added filesystem mktool vs. kernel module version check for the
+  squashfs filesystem. The check has been added in the checkType()
+  function
+  
+-------------------------------------------------------------------
+Thu Jan 27 08:46:33 CET 2011 - ms@suse.de
+  
+- add support for smb:// type urls by supporting cifs mount
+  
+-------------------------------------------------------------------
+Wed Jan 26 16:36:00 CET 2011 - ms@suse.de
+  
+- DB: fixed typo
+  
+-------------------------------------------------------------------
+Wed Jan 26 15:47:05 CET 2011 - ms@suse.de
+  
+- DB: added patch from Franz Leitl, fixing some typos
+  
+-------------------------------------------------------------------
+Wed Jan 26 12:55:42 CET 2011 - ms@suse.de
+  
+- added partition ID information into progress information when
+  installing the system in partition install mode
+  
+-------------------------------------------------------------------
+Wed Jan 26 11:08:42 CET 2011 - ms@suse.de
+  
+- fixed lvresize calls in kiwi which are all missing the '+' prefix
+- fixed createSnapshotMap() to know about LVM volumes
+- fixed partition based installation with LVM image. The dialog for
+  boot and root partition selection was broken and there is also a
+  small fix improving the progress information when installing the
+  image partitions to the disk partitions
+  
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.gKbwTr/_old	2011-01-27 12:32:51.000000000 +0100
+++ /var/tmp/diff_new_pack.gKbwTr/_new	2011-01-27 12:32:51.000000000 +0100
@@ -66,7 +66,7 @@
 %endif
 Summary:        OpenSuSE - KIWI Image System
 Version:        4.71
-Release:        2
+Release:        3
 Group:          System/Management
 License:        GPLv2
 Source:         %{name}.tar.bz2
@@ -394,9 +394,9 @@
 %{_datadir}/kiwi/tests
 %{_datadir}/kiwi/xsl
 %{_sbindir}/kiwi
+%if 0%{?suse_version} < 1140
 %{perl_vendorarch}/KIWI
 %{perl_vendorarch}/auto/KIWI
-%if 0%{?suse_version} < 1140
 /var/adm/perl-modules/kiwi
 %endif
 #=================================================

++++++ kiwi-docu.tar.bz2 ++++++
kiwi/kiwi-docu.tar.bz2 kiwi/kiwi-docu.tar.bz2 differ: char 123488, line 583

++++++ kiwi.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision	2011-01-25 11:11:07.000000000 +0100
+++ new/kiwi/.revision	2011-01-27 12:18:29.000000000 +0100
@@ -1 +1 @@
-d3846132b7353b1c93229c87447a6085c7ead466
+c05818d3faedb0110f8dfa66f445a747934683bb
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl
--- old/kiwi/kiwi.pl	2011-01-25 11:11:07.000000000 +0100
+++ new/kiwi/kiwi.pl	2011-01-27 12:18:29.000000000 +0100
@@ -623,7 +623,7 @@
 		#==========================================
 		# Check tool set
 		#------------------------------------------
-		my $para = checkType ( \%attr );
+		my $para = checkType ( \%attr,$Create );
 		if (! defined $para) {
 			my $code = kiwiExit (1); return $code;
 		}
@@ -2418,6 +2418,7 @@
 #------------------------------------------
 sub checkType {
 	my (%type) = %{$_[0]};
+	my $root   = $_[1];
 	my $para   = "ok";
 	#==========================================
 	# check for required filesystem tool(s)
@@ -2450,6 +2451,48 @@
 		}
 	}
 	#==========================================
+	# check tool/driver compatibility
+	#------------------------------------------
+	my $check_mksquashfs = 0;
+	if ($type{type} eq "squashfs") {
+		$check_mksquashfs = 1;
+	}
+	if (($type{installiso}) || ($type{installstick})) {
+		$check_mksquashfs = 1;
+	}
+	if (($fs) && ($fs =~ /squashfs/)) {
+		$check_mksquashfs = 1;
+	}
+	if (($flags) && ($flags =~ /compressed|unified/)) {
+		$check_mksquashfs = 1;
+	}
+	#==========================================
+	# squashfs...
+	#------------------------------------------
+	if ($check_mksquashfs) {
+		my $km = glob ("$root/lib/modules/*/kernel/fs/squashfs/squashfs.ko");
+		my $mktool_vs = qxx ("mksquashfs -version 2>&1 | head -n 1");
+		my $module_vs = qxx ("modinfo -d $km 2>&1");
+		my $error = 0;
+		if ($mktool_vs =~ /^mksquashfs version (.*) \(/) {
+			$mktool_vs = $1;
+			$error++;
+		}
+		if ($module_vs =~ /^squashfs (.*),/) {
+			$module_vs = $1;
+			$error++;
+		}
+		$kiwi -> loginfo ("squashfs mktool version: $mktool_vs\n");
+		$kiwi -> loginfo ("squashfs module version: $module_vs\n");
+		if (($error == 2) && ($mktool_vs ne $module_vs)) {
+			$kiwi -> error (
+				"--> squashfs tool/driver mismatch: $mktool_vs vs $module_vs"
+			);
+			$kiwi -> failed ();
+			return undef;
+		}
+	}
+	#==========================================
 	# build and check KIWIImage method params
 	#------------------------------------------
 	SWITCH: for ($type{type}) {
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	2011-01-25 11:11:07.000000000 +0100
+++ new/kiwi/modules/KIWIBoot.pm	2011-01-27 12:18:29.000000000 +0100
@@ -4348,7 +4348,7 @@
 	if (($syszip) || ($haveSplit)) {
 		$status = qxx ("lvcreate -L $syszip -n LVComp $VGroup 2>&1");
 		$result = $? >> 8;
-		$status.= qxx ("lvcreate -l 100%FREE -n LVRoot $VGroup 2>&1");
+		$status.= qxx ("lvcreate -l +100%FREE -n LVRoot $VGroup 2>&1");
 		$result+= $? >> 8;
 		if ($result != 0) {
 			$kiwi -> failed ();
@@ -4377,7 +4377,7 @@
 			$this->{deviceinodes} = \%ihash;
 		}
 		if ($result == 0) {
-			$status = qxx ("lvcreate -l 100%FREE -n LVRoot $VGroup 2>&1");
+			$status = qxx ("lvcreate -l +100%FREE -n LVRoot $VGroup 2>&1");
 			$result = $? >> 8;
 		}
 		if ($result != 0) {
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	2011-01-25 11:11:07.000000000 +0100
+++ new/kiwi/modules/KIWILinuxRC.sh	2011-01-27 12:18:29.000000000 +0100
@@ -6707,8 +6707,13 @@
 		return
 	fi
 	echo "kpartx -d $diskLoop" >> $reset
-	diskLoop=$(echo $diskLoop | cut -f3 -d '/')
-	diskLoop=/dev/mapper/${diskLoop}p1
+	if searchVolumeGroup; then
+		diskLoop=/dev/$VGROUP/LVRoot
+		echo "vgchange -an" >> $reset
+	else
+		diskLoop=$(echo $diskLoop | cut -f3 -d '/')
+		diskLoop=/dev/mapper/${diskLoop}p1
+	fi
 	#======================================
 	# create snapshot loop device
 	#--------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIURL.pm new/kiwi/modules/KIWIURL.pm
--- old/kiwi/modules/KIWIURL.pm	2010-12-03 16:08:51.000000000 +0100
+++ new/kiwi/modules/KIWIURL.pm	2011-01-27 12:18:29.000000000 +0100
@@ -100,6 +100,10 @@
 	if (defined $path) {
 		return $path;
 	}
+	$path = $this -> smbPath ($module);
+	if (defined $path) {
+		return $path;
+	}
 	$path = $this -> dirPath ($module);
 	if (defined $path) {
 		return $path;
@@ -262,6 +266,59 @@
 }
 
 #==========================================
+# smbPath
+#------------------------------------------
+sub smbPath {
+	# ...
+	# This method pass along the smb mount path to the
+	# packagemanager. The smb prefix will only work for
+	# zypper at the moment
+	# ---
+	my $this   = shift;
+	my $module = shift;
+	my $kiwi   = $this->{kiwi};
+	my $root   = $this->{root};
+	my $result;
+	my $status;
+	my $name;
+	my $tmpdir;
+	#==========================================
+	# normalize URL data
+	#------------------------------------------
+	if ((! defined $module) || ($module !~ /^smb:\/\//)) {
+		return undef;
+	}
+	$module =~ s/^smb:\/\///;
+	$name   = basename ($module);
+	$tmpdir = "/tmp/kiwimount-$name";
+	#==========================================
+	# create SMB mount point and perform mount
+	#------------------------------------------
+	if (! defined $root) {
+		return $tmpdir;
+	}
+	$status = qxx ("mkdir -p $tmpdir 2>&1");
+	$result = $? >> 8;
+	if ($result != 0) {
+		$kiwi -> warning ("Couldn't create tmp dir for smb mount: $status: $!");
+		$kiwi -> skipped ();
+		return undef;
+	}
+	$status = qxx ("mount -t cifs $module $tmpdir 2>&1");
+	$result = $? >> 8;
+	if ($result != 0) {
+		$kiwi -> warning ("Failed to mount share $module: $status");
+		$kiwi -> skipped ();
+		return undef;
+	}
+	#==========================================
+	# add mount to mount list of root obj
+	#------------------------------------------
+	$root -> addToMountList ($tmpdir);
+	return $tmpdir;
+}
+
+#==========================================
 # obsPath
 #------------------------------------------
 sub obsPath {
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	2011-01-23 21:31:24.000000000 +0100
+++ new/kiwi/system/boot/ix86/oemboot/suse-dump	2011-01-27 12:18:29.000000000 +0100
@@ -332,14 +332,12 @@
 				for i in /dev/mapper/${loop}*;do
 					psize=`partitionSize $i`
 					partid=$(partitionID /dev/$loop $(nd $i))
-					if [ $count = 0 ];then
-						echo "* Root partition requires at least $psize KB" \
-							>> $info
-					fi
-					if [ $count = 1 ];then
-						echo "* Boot partition requires at least $psize KB" \
-							>> $info
+					partname=Root
+					if [ $reqpart -eq 2 ] && [ $count = 0 ];then
+						partname=Boot
 					fi
+					echo "* $partname partition requires at least $psize KB" \
+						>> $info
 					echo "  Partition Type: 0x$partid" >> $info
 					count=$((count + 1))
 				done
@@ -433,9 +431,9 @@
 			#--------------------------------------
 			for p in /dev/mapper/${loop}*;do
 				if [ $p = /dev/mapper/${loop}p1 ];then
-					select="root"
-				elif [ $p = /dev/mapper/${loop}p2 ];then
 					select="boot"
+				elif [ $p = /dev/mapper/${loop}p2 ];then
+					select="root"
 				fi
 				TEXT_SELECT=$(
 					getText "Select %1 partition for installation:" $select)
@@ -472,20 +470,27 @@
 						else
 							partitions_next=$partitions_next,$pname:$psize
 						fi
+						count=$((count + 1))
 					fi
-					count=$((count + 1))
 				done
 				IFS=$IFS_ORIG
 				partitions=$partitions_next
 				if [ $p = /dev/mapper/${loop}p1 ];then
 					imageDevice=$selectedPart
-					rID=$(nd $selectedPart)
-					instItems[0]=$imageName:$imageDevice
-				elif [ $p = /dev/mapper/${loop}p2 ];then
 					bID=$(nd $selectedPart)
+					instItems[0]=/dev/mapper/${loop}p1:$imageDevice
+				elif [ $p = /dev/mapper/${loop}p2 ];then
+					rID=$(nd $selectedPart)
 					instItems[1]=/dev/mapper/${loop}p2:$selectedPart
 				fi
 			done
+			# /.../
+			# reverse order of instItems because
+			# root partition must be first entry
+			# ----
+			instItems_tmp=${instItems[0]}
+			instItems[0]=${instItems[1]}
+			instItems[1]=$instItems_tmp
 		fi
 		#======================================
 		# Search for a swap space
@@ -621,8 +626,13 @@
 		if [ -z "$pxe" ];then
 			dump="cat $Source"
 			if [ -x /usr/bin/dcounter ];then
-				progressBaseName=$(basename $Source)
-				TEXT_LOAD=$(getText "Loading %1" $progressBaseName)
+				if [ ! -z "$OEM_PARTITION_INSTALL" ];then
+					progressP=$(echo $Source | cut -f5 -dp)
+					progressBaseName="$(basename $OEMRootImage) [p$progressP]"
+				else
+					progressBaseName=$(basename $Source)
+				fi
+				TEXT_LOAD=$(getText "Loading %1" "$progressBaseName")
 				dump="$dump | dcounter -s $needMByte -l \"$TEXT_LOAD \""
 			fi
 			Echo "Loading $Source [$Target] "
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	2010-11-05 16:47:03.000000000 +0100
+++ new/kiwi/system/boot/ix86/oemboot/suse-repart	2011-01-27 12:18:29.000000000 +0100
@@ -417,7 +417,7 @@
 		# Extend LVRoot...
 		#--------------------------------------
 		if [ -z "$OEM_SYSTEMSIZE" ];then
-			lvextend -l 100%FREE /dev/$VGROUP/LVRoot
+			lvextend -l +100%FREE /dev/$VGROUP/LVRoot
 		else
 			lvextend --size $OEM_SYSTEMSIZE"M" /dev/$VGROUP/LVRoot
 		fi
@@ -452,7 +452,7 @@
 		#======================================
 		# resize LV's
 		#--------------------------------------
-		lvresize -l 100%FREE $imageRootDevice
+		lvresize -l +100%FREE $imageRootDevice
 	fi
 	#======================================
 	# resize boot filesystem if needed


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit kiwi for openSUSE:Factory

root＠hilbert.suse.de