Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Wed Mar 2 11:33:36 CET 2011.
-------- --- kiwi/kiwi.changes 2011-02-25 13:35:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2011-03-02 11:23:18.000000000 +0100 @@ -1,0 +2,27 @@ +Wed Mar 2 11:16:40 CET 2011 - [email protected] + +- v4.80 released + +------------------------------------------------------------------- +Wed Mar 2 11:11:09 CET 2011 - [email protected] + +- export meta data location content keys for ftp tree medias + +------------------------------------------------------------------- +Wed Mar 2 10:53:45 CET 2011 - [email protected] + +- ftp medias beside first one should not provide the product + +------------------------------------------------------------------- +Mon Feb 28 15:59:52 CET 2011 - [email protected] + +- don't ignore blocksize value from config.<MAC> (bnc #675004) + +------------------------------------------------------------------- +Fri Feb 25 16:53:05 CET 2011 - [email protected] + +- added support for --recycle-root option which allows to use + and modify an existing root tree while in the kiwi prepare + step. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.PTC26E/_old 2011-03-02 11:31:13.000000000 +0100 +++ /var/tmp/diff_new_pack.PTC26E/_new 2011-03-02 11:31:13.000000000 +0100 @@ -65,7 +65,7 @@ %endif %endif Summary: OpenSuSE - KIWI Image System -Version: 4.79 +Version: 4.80 Release: 1 Group: System/Management License: GPLv2 ++++++ kiwi-docu.tar.bz2 ++++++ kiwi/kiwi-docu.tar.bz2 /mounts/work_src_done/STABLE/kiwi/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 2011-02-25 13:31:24.000000000 +0100 +++ new/kiwi/.revision 2011-03-02 11:19:06.000000000 +0100 @@ -1 +1 @@ -ea7a834247aebbb4f41a028503fa9a62f03c2293 +caaa89e8c7eb31705802807864eaaaca56988573 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/distribution/kiwi-instsource-plugins-openSUSE-11-3/KIWIContentPlugin.pm new/kiwi/distribution/kiwi-instsource-plugins-openSUSE-11-3/KIWIContentPlugin.pm --- old/kiwi/distribution/kiwi-instsource-plugins-openSUSE-11-3/KIWIContentPlugin.pm 2010-02-01 16:15:22.000000000 +0100 +++ new/kiwi/distribution/kiwi-instsource-plugins-openSUSE-11-3/KIWIContentPlugin.pm 2011-03-02 11:19:05.000000000 +0100 @@ -170,8 +170,19 @@ $len = ($l>$len)?$l:$len; } $len++; + + # ftp media special mode ? + my $coll = $this->{m_collect}; + my $flavor = $coll->productData()->getVar("FLAVOR"); + my $ftpmode = ($flavor =~ m{ftp}i); + + my %ftpcontentkeys = map {$_ => 1} qw{CONTENTSTYLE REPOID DESCRDIR DATADIR VENDOR}; + foreach my $i(sort { $a <=> $b } keys(%{$info})) { - print CONT sprintf('%-*s %s', $len, $info->{$i}->[0], $info->{$i}->[1])."\n"; + # ftp medias beside first one should get provide the product + if ( !$ftpmode || $cd eq "1" || $ftpcontentkeys{$info->{$i}->[0]} ) { + print CONT sprintf('%-*s %s', $len, $info->{$i}->[0], $info->{$i}->[1])."\n"; + } } close(CONT); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl --- old/kiwi/kiwi.pl 2011-02-25 13:31:24.000000000 +0100 +++ new/kiwi/kiwi.pl 2011-03-02 11:19:06.000000000 +0100 @@ -47,7 +47,7 @@ #============================================ # Globals (Version) #-------------------------------------------- -our $Version = "4.79"; +our $Version = "4.80"; our $Publisher = "SUSE LINUX Products GmbH"; our $Preparer = "KIWI - http://kiwi.berlios.de";; our $openSUSE = "http://download.opensuse.org";; @@ -220,6 +220,7 @@ our $targetDevice; # alternative device instead of a loop device our %XMLChangeSet; # internal data set for update of XML objects our $ImageDescription; # uniq path to image description due to caller opts +our $RecycleRoot; # use existing root directory incl. contents our $kiwi; # global logging handler object #============================================ @@ -479,7 +480,7 @@ #------------------------------------------ $root = new KIWIRoot ( $kiwi,$xml,$Prepare,$RootTree, - "/base-system",undef,undef,undef, + "/base-system",$RecycleRoot,undef,undef, $CacheRoot,$CacheRootMode, $TargetArch ); @@ -1163,6 +1164,7 @@ #------------------------------------------ my $result = GetOptions( "version" => \&version, + "recycle-root" => \$RecycleRoot, "targetdevice=s" => \$targetDevice, "v|verbose+" => \$Verbosity, "logfile=s" => \$LogFile, @@ -1241,6 +1243,12 @@ "help|h" => \&usage, "<>" => \&usage ); + #======================================== + # check if recycle-root is used + #---------------------------------------- + if (defined $RecycleRoot) { + $RecycleRoot = $RootTree; + } #============================================ # check Partitioner according to device #-------------------------------------------- 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-02-25 13:03:46.000000000 +0100 +++ new/kiwi/modules/KIWILinuxRC.sh 2011-03-02 10:57:51.000000000 +0100 @@ -3778,7 +3778,12 @@ else isize=`expr $blocks \* $blocksize` fi - for blkTest in 32768 61440 65464 ; do + local IFS=' ' + testBlkSizes="32768 61440 65464" + if [ "$imageBlkSize" -gt 0 ]; then + testBlkSizes="$imageBlkSize $testBlkSizes" + fi + for blkTest in $testBlkSizes ; do nBlk=`expr $isize / $blkTest` if [ $nBlk -lt 65535 ] ; then imageBlkSize=$blkTest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIRoot.pm new/kiwi/modules/KIWIRoot.pm --- old/kiwi/modules/KIWIRoot.pm 2011-02-16 09:32:37.000000000 +0100 +++ new/kiwi/modules/KIWIRoot.pm 2011-03-02 10:57:51.000000000 +0100 @@ -329,7 +329,7 @@ #================================== # Return early if cache is used #---------------------------------- - if (defined $main::ImageCache) { + if ((defined $main::ImageCache) || (defined $main::RecycleRoot)) { return $this; } #========================================== ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
