Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Fri Apr 1 16:53:33 CEST 2011.
-------- --- kiwi/kiwi.changes 2011-03-31 11:53:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2011-04-01 14:40:18.000000000 +0200 @@ -1,0 +2,25 @@ +Fri Apr 1 14:32:57 CEST 2011 - [email protected] + +- v4.84 released + +------------------------------------------------------------------- +Fri Apr 1 11:12:49 CEST 2011 - [email protected] + +- added normalizeBootPath() function which allows to use + the following boot attribute source locator prefixes: + +* this:// => pointing to the image description directory +* system:// => pointing to /usr/share/kiwi/image +* dir:// => pointing to a directory + + if no source locator is set kiwi uses the path if it is an + absolute path and in case of a relative path it checks if + the path relative to the called directory exists and if not + it also checks if the path exists below /usr/share/kiwi/image + +------------------------------------------------------------------- +Fri Apr 1 10:42:23 CEST 2011 - [email protected] + +- fixed repository setup for cache creation + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.V5UAAu/_old 2011-04-01 16:51:22.000000000 +0200 +++ /var/tmp/diff_new_pack.V5UAAu/_new 2011-04-01 16:51:22.000000000 +0200 @@ -65,8 +65,8 @@ %endif %endif Summary: OpenSuSE - KIWI Image System -Version: 4.83 -Release: 7 +Version: 4.84 +Release: 1 Group: System/Management License: GPLv2 Source: %{name}.tar.bz2 ++++++ 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-03-25 14:47:34.000000000 +0100 +++ new/kiwi/.revision 2011-04-01 14:35:59.000000000 +0200 @@ -1 +1 @@ -3ce9b1d00c9723deef8343f8948a1987c9a52c55 +c8b8dce8bc1ea227b9606fd4c238877129c43491 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl --- old/kiwi/kiwi.pl 2011-03-25 14:47:34.000000000 +0100 +++ new/kiwi/kiwi.pl 2011-04-01 14:35:59.000000000 +0200 @@ -49,7 +49,7 @@ #============================================ # Globals (Version) #-------------------------------------------- -our $Version = "4.83"; +our $Version = "4.84"; our $Publisher = "SUSE LINUX Products GmbH"; our $Preparer = "KIWI - http://kiwi.berlios.de";; our $openSUSE = "http://download.opensuse.org";; @@ -1979,9 +1979,11 @@ # sources #------------------------------------------ /^sources/ && do { - foreach my $url (@{$xml->{urllist}}) { + my %repos = $xml -> getRepository(); + foreach my $url (keys %repos) { my $source = new XML::LibXML::Element ("source"); $source -> setAttribute ("path","$url"); + $source -> setAttribute ("type",$repos{$url}->[0]); $scan -> appendChild ($source); } last SWITCH; @@ -3054,7 +3056,7 @@ # Create image package list #------------------------------------------ $listXMLInfo = $mode; - @listXMLInfoSelection = ("packages"); + @listXMLInfoSelection = ("packages","sources"); $CacheScan = listXMLInfo ("internal"); if (! $CacheScan) { undef $ImageCache; @@ -3206,6 +3208,7 @@ my $CacheDistro = $init->[0]; my @CachePatterns = @{$init->[1]}; my @CachePackages = @{$init->[2]}; + my $CacheScan = $init->[3]; my $imageCacheDir = $ImageCache; my $imagePrepareDir = $main::Prepare; #========================================== @@ -3220,6 +3223,20 @@ if (@CachePackages) { push @CachePatterns,"package-cache" } + #========================================== + # setup repositories for building + #------------------------------------------ + $main::IgnoreRepos = 1; + my @repos = $CacheScan -> getElementsByTagName ("source"); + foreach my $node (@repos) { + my $path = $node -> getAttribute ("path"); + my $type = $node -> getAttribute ("type"); + push @main::AddRepository, $path; + push @main::AddRepositoryType, $type; + } + #========================================== + # walk through cachable patterns + #------------------------------------------ foreach my $pattern (@CachePatterns) { if ($pattern eq "package-cache") { $pattern = $xml -> getImageName(); @@ -3316,25 +3333,31 @@ # createResetClosure #------------------------------------------ sub createResetClosure { - my $backupSurvive = $main::Survive; - my @backupProfiles = @main::Profiles; - my $backupCreate = $main::Create; - my $backupPrepare = $main::Prepare; - my $backupRootTree = $main::RootTree; - my $backupForceNewRoot = $main::ForceNewRoot; - my @backupPatterns = @main::AddPattern; - my @backupPackages = @main::AddPackage; - my @backupRemovePackages= @main::RemovePackage; + my $backupSurvive = $main::Survive; + my @backupProfiles = @main::Profiles; + my $backupCreate = $main::Create; + my $backupPrepare = $main::Prepare; + my $backupRootTree = $main::RootTree; + my $backupForceNewRoot = $main::ForceNewRoot; + my @backupPatterns = @main::AddPattern; + my @backupPackages = @main::AddPackage; + my @backupRemovePackages = @main::RemovePackage; + my $backupIgnoreRepos = $main::IgnoreRepos; + my @backupAddRepository = @main::AddRepository; + my @backupAddRepositoryType = @main::AddRepositoryType; return sub { - @main::Profiles = @backupProfiles; - $main::Prepare = $backupPrepare; - $main::Create = $backupCreate; - $main::ForceNewRoot = $backupForceNewRoot; - @main::AddPattern = @backupPatterns; - @main::AddPackage = @backupPackages; - @main::RemovePackage= @backupRemovePackages; - $main::RootTree = $backupRootTree; - $main::Survive = $backupSurvive; + @main::Profiles = @backupProfiles; + $main::Prepare = $backupPrepare; + $main::Create = $backupCreate; + $main::ForceNewRoot = $backupForceNewRoot; + @main::AddPattern = @backupPatterns; + @main::AddPackage = @backupPackages; + @main::RemovePackage = @backupRemovePackages; + $main::IgnoreRepos = $backupIgnoreRepos; + @main::AddRepository = @backupAddRepository; + @main::AddRepositoryType = @backupAddRepositoryType; + $main::RootTree = $backupRootTree; + $main::Survive = $backupSurvive; } } 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 2011-03-15 12:07:25.000000000 +0100 +++ new/kiwi/modules/KIWIURL.pm 2011-04-01 14:35:59.000000000 +0200 @@ -120,6 +120,39 @@ } #========================================== +# normalizeBootPath +#------------------------------------------ +sub normalizeBootPath { + # ... + # check local path functions and normalize the high level + # URLs if required. This function is meant to be called + # on the value of the boot attribute only + # --- + my $this = shift; + my $module = shift; + my $kiwi = $this->{kiwi}; + my $path; + $module = $this -> quote ($module); + $path = $this -> thisPath ($module); + if (defined $path) { + return $path; + } + $path = $this -> obsPath ($module,"boot"); + if (defined $path) { + return $path; + } + $path = $this -> systemPath ($module); + if (defined $path) { + return $path; + } + $path = $this -> dirPath ($module); + if (defined $path) { + return $path; + } + return $module; +} + +#========================================== # quote #------------------------------------------ sub quote { @@ -186,6 +219,30 @@ } #========================================== +# systemPath +#------------------------------------------ +sub systemPath { + #... + # This path uses the provided system:// path and + # prefix it with kiwi's default module system dir + #--- + my $this = shift; + my $module = shift; + my $prefix = $main::System; + my $kiwi = $this->{kiwi}; + my $path = undef; + #========================================== + # normalize URL data + #------------------------------------------ + if ((! defined $module) || ($module !~ /^system:\/\//)) { + return undef; + } + $module =~ s/system:\/\///; + $path = $this -> dirPath ("dir://".$prefix."/".$module); + return $path; +} + +#========================================== # thisPath #------------------------------------------ sub thisPath { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIXML.pm new/kiwi/modules/KIWIXML.pm --- old/kiwi/modules/KIWIXML.pm 2011-03-30 12:10:37.000000000 +0200 +++ new/kiwi/modules/KIWIXML.pm 2011-04-01 14:35:59.000000000 +0200 @@ -1446,7 +1446,7 @@ my %record = (); $record{type} = $node -> getAttribute("image"); $record{boot} = $node -> getAttribute("boot"); - my $bootpath = $urlhd -> obsPath ($record{boot},"boot"); + my $bootpath = $urlhd -> normalizeBootPath ($record{boot}); if (defined $bootpath) { $record{boot} = $bootpath; } @@ -4840,7 +4840,7 @@ $record{filesystem} = "$filesystemRW,$filesystemRO"; } } - my $bootpath = $urlhd -> obsPath ($record{boot},"boot"); + my $bootpath = $urlhd -> normalizeBootPath ($record{boot}); if (defined $bootpath) { $record{boot} = $bootpath; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
