Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2011-11-02 11:57:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2011-10-28 19:49:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2011-11-02 11:57:09.000000000 +0100 @@ -1,0 +2,42 @@ +Mon Oct 31 10:24:10 CET 2011 - [email protected] + +- v4.98.12 released + +------------------------------------------------------------------- +Mon Oct 31 09:52:52 CET 2011 - [email protected] + +- s390 netboot: +* make sure the VTOC table is created prior to any fdasd call +* make sure searchBusIDBootDevice is called to set the device + in $DISK online by a custom DEVICE_INIT command + +------------------------------------------------------------------- +Mon Oct 31 09:52:22 CET 2011 - [email protected] + +- added support for custom s390 device init command in the + searchBusIDBootDevice function. This is required if the s390 + client was not booted by an ipl command but e.g. via zPXE + +------------------------------------------------------------------- +Sun Oct 30 20:37:49 CET 2011 - [email protected] + +- fixed migration code: +* fixed creation of URL list from zypper information +* write current schema version (5.3) XML +* fixed creation of KIWISatSolver objects + +------------------------------------------------------------------- +Sat Oct 29 22:42:36 CEST 2011 - [email protected] + +- added support for Microsoft Hyper-V machine image format + <type ... format="vpc"/>. This requires a qemu version + which supports the vpc format conversion (fate# 309765) + +------------------------------------------------------------------- +Sat Oct 29 22:34:28 CEST 2011 - [email protected] + +- fixed migration module to work again. Added 11.4 and 12.1 paths + and make sure the global object pointer is there when it is + accessed + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.avnjQ1/_old 2011-11-02 11:57:11.000000000 +0100 +++ /var/tmp/diff_new_pack.avnjQ1/_new 2011-11-02 11:57:11.000000000 +0100 @@ -69,7 +69,7 @@ %endif %endif Summary: OpenSuSE - KIWI Image System -Version: 4.98.11 +Version: 4.98.12 Release: 1 Group: System/Management License: GPLv2 ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2011-10-28 13:59:34.000000000 +0200 +++ new/kiwi/.revision 2011-10-31 10:14:36.000000000 +0100 @@ -1 +1 @@ -09f7ec7b6a79943153207fd6ed51275a7441ab1f +98a56eb39d341590b41e83b10693cbe34472d7af diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl --- old/kiwi/kiwi.pl 2011-10-28 13:59:34.000000000 +0200 +++ new/kiwi/kiwi.pl 2011-10-31 10:14:36.000000000 +0100 @@ -1336,7 +1336,7 @@ print " kiwi --installstick <initrd>\n"; print " [ --installstick-system <vmx-system-image> ]\n"; print "Image format conversion:\n"; - print " kiwi --convert <systemImage> [ --format <vmdk|ovf|qcow2> ]\n"; + print " kiwi --convert <systemImage> [ --format <vmdk|ovf|qcow2|..> ]\n"; print "Helper Tools:\n"; print " kiwi --createpassword\n"; print " kiwi --createhash <image-path>\n"; 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 2011-10-28 13:59:39.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2011-10-31 10:25:04.000000000 +0100 @@ -40,7 +40,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "4.98.11"; + $data{Version} = "4.98.12"; $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/KIWIImageFormat.pm new/kiwi/modules/KIWIImageFormat.pm --- old/kiwi/modules/KIWIImageFormat.pm 2011-10-28 13:59:34.000000000 +0200 +++ new/kiwi/modules/KIWIImageFormat.pm 2011-10-31 10:14:36.000000000 +0100 @@ -155,6 +155,9 @@ if ($format eq "vmdk") { $kiwi -> info ("Starting raw => $format conversion\n"); return $this -> createVMDK(); + } elsif ($format eq "vpc") { + $kiwi -> info ("Starting raw => $format conversion\n"); + return $this -> createVPC(); } elsif ($format eq "ovf") { $kiwi -> info ("Starting raw => $format conversion\n"); return $this -> createOVF(); @@ -319,28 +322,19 @@ } #========================================== +# createVPC +#------------------------------------------ +sub createVPC { + my $this = shift; + return $this -> createVMDK(); +} + +#========================================== # createQCOW2 #------------------------------------------ sub createQCOW2 { my $this = shift; - my $kiwi = $this->{kiwi}; - my $format = $this->{format}; - my $source = $this->{image}; - my $target = $source; - my $status; - my $result; - $kiwi -> info ("Creating $format image..."); - $target =~ s/\.raw$/\.$format/; - $status = qxx ("qemu-img convert -f raw $source -O $format $target 2>&1"); - $result = $? >> 8; - if ($result != 0) { - $kiwi -> failed (); - $kiwi -> error ("Couldn't create $format image: $status"); - $kiwi -> failed (); - return undef; - } - $kiwi -> done (); - return $target; + return $this -> createVMDK(); } #========================================== 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-10-28 13:59:39.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2011-10-31 10:14:36.000000000 +0100 @@ -3411,6 +3411,17 @@ local wwpn local slun #====================================== + # check for custom device init command + #-------------------------------------- + if [ ! -z "$DEVICE_INIT" ];then + if ! eval $DEVICE_INIT;then + export biosBootDevice="Failed to call: $DEVICE_INIT" + return 1 + fi + export biosBootDevice=$DISK + return 0 + fi + #====================================== # determine device type: dasd or zfcp #-------------------------------------- if [ -z "$ipl_type" ];then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIMigrate.pm new/kiwi/modules/KIWIMigrate.pm --- old/kiwi/modules/KIWIMigrate.pm 2011-10-28 13:59:34.000000000 +0200 +++ new/kiwi/modules/KIWIMigrate.pm 2011-10-31 10:14:36.000000000 +0100 @@ -84,6 +84,7 @@ $kiwi -> failed (); return undef; } + $this->{gdata} = $main::global -> getGlobals(); my $product = $this -> getOperatingSystemVersion(); if (! defined $product) { $kiwi -> failed (); @@ -226,7 +227,6 @@ $this->{product} = $product; $this->{mount} = []; $this->{autoyastCloneList} = \@autoyastCloneList; - $this->{gdata} = $main::global -> getGlobals(); return $this; } @@ -691,6 +691,7 @@ return undef; } foreach my $repo (@list) { + $repo =~ s/^\s+//g; if ($repo =~ /^\d.*\|(.*)\|.*\|(.*)\|.*\|(.*)\|(.*)\|(.*)\|/) { my $enabled = $2; my $source = $5; @@ -811,7 +812,7 @@ #========================================== # <description> #------------------------------------------ - print FD '<image schemaversion="4.8" '; + print FD '<image schemaversion="5.3" '; print FD 'name="suse-migration-'.$product.'">'."\n"; print FD "\t".'<description type="system">'."\n"; print FD "\t\t".'<author>***AUTHOR***</author>'."\n"; @@ -824,8 +825,7 @@ print FD "\t".'<preferences>'."\n"; print FD "\t\t".'<type image="oem" boot="oemboot/suse-'.$product.'"'; print FD ' filesystem="ext3" installiso="true">'."\n"; - print FD "\t\t\t".'<oemconfig>'."\n"; - print FD "\t\t\t".'</oemconfig>'."\n"; + print FD "\t\t\t".'<oemconfig/>'."\n"; print FD "\t\t".'</type>'."\n"; print FD "\t\t".'<version>1.1.1</version>'."\n"; print FD "\t\t".'<packagemanager>zypper</packagemanager>'."\n"; @@ -856,9 +856,10 @@ #========================================== # <packages> #------------------------------------------ - print FD "\t".'<packages type="image">'."\n"; + print FD "\t".'<packages type="bootstrap">'."\n"; if (defined $pats) { foreach my $pattern (sort @{$pats}) { + $pattern =~ s/^pattern://; print FD "\t\t".'<opensusePattern name="'.$pattern.'"/>'."\n"; } } @@ -868,15 +869,6 @@ } } print FD "\t".'</packages>'."\n"; - #========================================== - # <packages type="bootstrap"> - #------------------------------------------ - print FD "\t".'<packages type="bootstrap">'."\n"; - print FD "\t\t".'<package name="filesystem"/>'."\n"; - print FD "\t\t".'<package name="glibc-locale"/>'."\n"; - print FD "\t\t".'<package name="cracklib-dict-full"/>'."\n"; - print FD "\t\t".'<package name="openssl-certs"/>'."\n"; - print FD "\t".'</packages>'."\n"; print FD '</image>'."\n"; close FD; return $this; @@ -1119,15 +1111,15 @@ my $name = $1; $name =~ s/^ +//g; $name =~ s/ +$//g; - $pathash{"$name"} = "$name"; + $pathash{"pattern:$name"} = "$name"; } } @patlist = keys %pathash; } $this->{patterns} = \@patlist; my $psolve = new KIWISatSolver ( - $kiwi,\@patlist,\@urllist,undef,undef,undef, - "silent","plusRecommended" + $kiwi,\@patlist,\@urllist,"solve-patterns", + undef,undef,undef,"plusRecommended" ); my @result = (); if (! defined $psolve) { @@ -1180,8 +1172,8 @@ my $repo = $psolve -> getRepo(); my $pool = $psolve -> getPool(); my $xsolve = new KIWISatSolver ( - $kiwi,\@result,\@urllist,"solve-packages",$repo,$pool, - "silent","plusRecommended" + $kiwi,\@result,\@urllist,"solve-packages", + $repo,$pool,undef,"plusRecommended" ); if (! defined $xsolve) { $kiwi -> error ("Failed to solve packages"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIMigrate.txt new/kiwi/modules/KIWIMigrate.txt --- old/kiwi/modules/KIWIMigrate.txt 2011-10-18 12:50:04.000000000 +0200 +++ new/kiwi/modules/KIWIMigrate.txt 2011-10-31 10:14:36.000000000 +0100 @@ -11,3 +11,5 @@ openSUSE-11.1=suse-11.1 openSUSE-11.2=suse-11.2 openSUSE-11.3=suse-11.3 +openSUSE-11.4=suse-11.4 +openSUSE-12.1=suse-12.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rnc new/kiwi/modules/KIWISchema.rnc --- old/kiwi/modules/KIWISchema.rnc 2011-10-28 13:59:34.000000000 +0200 +++ new/kiwi/modules/KIWISchema.rnc 2011-10-31 10:14:36.000000000 +0100 @@ -1490,7 +1490,7 @@ k.type.format.attribute = ## Specifies the format of the virtual disk. attribute format { - "ec2" | "ovf" | "qcow2" | "vmdk" + "ec2" | "ovf" | "qcow2" | "vmdk" | "vpc" } k.type.fsnocheck.attribute = ## Turn off periodic filesystem checks on ext2/3/4. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rng new/kiwi/modules/KIWISchema.rng --- old/kiwi/modules/KIWISchema.rng 2011-10-28 13:59:34.000000000 +0200 +++ new/kiwi/modules/KIWISchema.rng 2011-10-31 10:14:36.000000000 +0100 @@ -2013,6 +2013,7 @@ <value>ovf</value> <value>qcow2</value> <value>vmdk</value> + <value>vpc</value> </choice> </attribute> </define> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/netboot/suse-linuxrc new/kiwi/system/boot/s390/netboot/suse-linuxrc --- old/kiwi/system/boot/s390/netboot/suse-linuxrc 2011-10-28 13:59:35.000000000 +0200 +++ new/kiwi/system/boot/s390/netboot/suse-linuxrc 2011-10-31 10:14:36.000000000 +0100 @@ -60,6 +60,19 @@ initialize #====================================== +# recreateVTOCTable +#-------------------------------------- +function recreateVTOCTable { + # /.../ + # re-create VTOC re-using existing partition sizes + # ---- + Echo "Recreate VTOC table [ $imageDiskDevice ]" + createPartitionerInput u y w + callPartitioner $input + rm -f $input +} + +#====================================== # Beautify Startup #-------------------------------------- echo "Loading KIWI PXE Boot-System..." @@ -266,6 +279,7 @@ #====================================== # 12) Check for diskful station #-------------------------------------- +searchBusIDBootDevice if [ $LOCAL_BOOT = "no" ];then checkDevice=$DISK if [ -z "$checkDevice" ];then @@ -355,6 +369,7 @@ # Standard table #-------------------------------------- cleanPartitionTable + recreateVTOCTable createPartitionerInput $(pxePartitionInput) callPartitioner $input else @@ -394,6 +409,7 @@ imageDiskDevice=$raid_dev rm -f $input cleanPartitionTable + recreateVTOCTable createPartitionerInput $(pxeRaidPartitionInput) callPartitioner $input done -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
