Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Mon Sep 5 16:35:23 CEST 2011.
-------- --- kiwi/kiwi.changes 2011-08-27 21:31:43.000000000 +0200 +++ kiwi/kiwi.changes 2011-09-02 16:00:41.000000000 +0200 @@ -1,0 +2,58 @@ +Fri Sep 2 15:51:15 CEST 2011 - [email protected] + +- v4.95.4 released + +------------------------------------------------------------------- +Fri Sep 2 15:41:51 CEST 2011 - [email protected] + +- fixed warning when checking for rpc_pipefs (bnc #711389) + +------------------------------------------------------------------- +Fri Sep 2 12:57:46 CEST 2011 - [email protected] + +- fixed checkLVMbind() to search for the lvm flag on the disk + first. Only if the disk has that flag we search for the LVM + devices. + +------------------------------------------------------------------- +Thu Sep 1 11:52:24 CEST 2011 - [email protected] + +- last commit causes a regression for non split types. + +------------------------------------------------------------------- +Thu Sep 1 11:04:55 CEST 2011 - [email protected] + +- fixed bootloader setup for split images + +------------------------------------------------------------------- +Thu Sep 1 10:07:23 CEST 2011 - [email protected] + +- added missing done() flag + +------------------------------------------------------------------- +Wed Aug 31 16:34:21 CEST 2011 - [email protected] + +- product build: avoid multiple handling of debug packages + +------------------------------------------------------------------- +Wed Aug 31 16:29:44 CEST 2011 - [email protected] + +- priorize repositories over fallback architectures + +------------------------------------------------------------------- +Tue Aug 30 16:30:56 CEST 2011 - [email protected] + +- more readable 'kiwi --list' output + +------------------------------------------------------------------- +Tue Aug 30 16:09:47 CEST 2011 - [email protected] + +- make sure $prio variable is initialized empty for + each repo validation (bnc #714927) + +------------------------------------------------------------------- +Tue Aug 30 12:49:54 CEST 2011 - [email protected] + +- fixed inline description of addRepository() function + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.3d5cXN/_old 2011-09-05 16:33:15.000000000 +0200 +++ /var/tmp/diff_new_pack.3d5cXN/_new 2011-09-05 16:33:15.000000000 +0200 @@ -69,7 +69,7 @@ %endif %endif Summary: OpenSuSE - KIWI Image System -Version: 4.95.3 +Version: 4.95.4 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-08-19 17:34:52.000000000 +0200 +++ new/kiwi/.revision 2011-08-30 16:30:46.000000000 +0200 @@ -1 +1 @@ -0cd0b56b04d2c81adc6753ee1ed0d4316cd00b66 +d632869396adc2458d87ff31f6a97a4de8487e64 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl --- old/kiwi/kiwi.pl 2011-08-19 17:34:52.000000000 +0200 +++ new/kiwi/kiwi.pl 2011-08-30 16:30:46.000000000 +0200 @@ -1500,7 +1500,7 @@ "$system/$image" ); if ($controlFile) { - $kiwi -> info ($image); + $kiwi -> info ("* ".$image."\n"); my $xml = new KIWIXML ( $kiwi,$system."/".$image,undef,undef,$cmdL ); @@ -1508,7 +1508,7 @@ next; } my $version = $xml -> getImageVersion(); - $kiwi -> note (" -> Version: $version"); + $kiwi -> info ("Version: $version"); $kiwi -> done(); } } 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-08-26 16:01:55.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2011-09-02 15:52:24.000000000 +0200 @@ -279,7 +279,7 @@ #========================================== # check for activated volume group #------------------------------------------ - $sdev = $this -> checkLVMbind ($sdev); + $sdev = $this -> checkLVMbind ($sdev,$this->{loop}); #========================================== # perform mount call #------------------------------------------ @@ -784,7 +784,7 @@ #========================================== # check for activated volume group #------------------------------------------ - $sdev = $this -> checkLVMbind ($sdev); + $sdev = $this -> checkLVMbind ($sdev,$this->{loop}); #========================================== # perform mount call #------------------------------------------ @@ -1149,7 +1149,7 @@ #========================================== # check for activated volume group #------------------------------------------ - $sdev = $this -> checkLVMbind ($sdev); + $sdev = $this -> checkLVMbind ($sdev,$this->{loop}); #========================================== # perform mount call #------------------------------------------ @@ -1734,6 +1734,7 @@ "Adding $splitMB MB space for split read-write portion" ); $this -> __updateDiskSize ($splitMB); + $kiwi -> done(); } #========================================== # obtain filesystem type from xml data @@ -4076,8 +4077,15 @@ # --- my $this = shift; my $sdev = shift; + my $disk = shift; my @groups; #========================================== + # check for lvm flag on disk + #------------------------------------------ + if (! $this-> __getPartID ($disk,"lvm")) { + return $sdev; + } + #========================================== # activate volume groups #------------------------------------------ open (my $SCAN,"vgscan 2>/dev/null |"); @@ -5248,4 +5256,27 @@ return $this; } +#========================================== +# __getPartID +#------------------------------------------ +sub __getPartID { + # ... + # try to find the partition number which references + # the provided flag like "boot" or "lvm" + # --- + my $this = shift; + my $disk = shift; + my $flag = shift; + my $fd = new FileHandle; + if ($fd -> open ("parted -m $disk print | cut -f1,7 -d:|")) { + while (my $line = <$fd>) { + if ($line =~ /^(\d):$flag/) { + return $1; + } + } + $fd -> close(); + } + return 0; +} + 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWICollect.pm new/kiwi/modules/KIWICollect.pm --- old/kiwi/modules/KIWICollect.pm 2011-07-18 11:52:49.000000000 +0200 +++ new/kiwi/modules/KIWICollect.pm 2011-09-02 15:52:24.000000000 +0200 @@ -821,23 +821,23 @@ my @fallbacklist = ($requestedArch); if($nofallback==0 && $mode != 2) { - @fallbacklist = $this->{m_archlist}->fallbacks($requestedArch); + @fallbacklist = $this->{m_archlist}->fallbacks($requestedArch); @fallbacklist = ($requestedArch) unless @fallbacklist; $this->logMsg("I", " Look for fallbacks fallbacks") if $this->{m_debug} >= 6; } $this->logMsg("I", " Use as expanded architectures >".join(" ", @fallbacklist)."<") if $this->{m_debug} >= 5; my $fb_available = 0; - FA:foreach my $arch(@fallbacklist) { - $this->logMsg("I", " check architecture $arch ") if $this->{m_debug} >= 5; - PACKKEY:foreach my $packKey( sort{$poolPackages->{$a}->{priority} <=> $poolPackages->{$b}->{priority}} keys(%{$poolPackages})) { - # FIXME: check for forcerepo + PACKKEY:foreach my $packKey( sort{$poolPackages->{$a}->{priority} <=> $poolPackages->{$b}->{priority}} keys(%{$poolPackages})) { + FA:foreach my $arch(@fallbacklist) { + $this->logMsg("I", " check architecture $arch ") if $this->{m_debug} >= 5; + # FIXME: check for forcerepo $this->logMsg("I", " check $packKey ") if $this->{m_debug} >= 5; my $packPointer = $poolPackages->{$packKey}; if ( $packPointer->{arch} ne $arch ) { $this->logMsg("I", " => package $packName not available for arch $arch in repo $packKey") if $this->{m_debug} >= 4; - next PACKKEY; + next FA; } if($nofallback==0 && $mode != 2 && $this->{m_archlist}->arch($arch)) { my $follow = $this->{m_archlist}->arch($arch)->follower(); @@ -849,7 +849,7 @@ && ! defined( $packOptions->{requireVersion}->{$packPointer->{version}."-".$packPointer->{release}} ) ) { $this->logMsg("D", " => package ".$packName."-".$packPointer->{version}."-".$packPointer->{release}." not available for arch $arch in repo $packKey in this version") if $this->{m_debug} >= 4; - next PACKKEY; + next FA; } # Success, found a package ! my $medium = $packOptions->{'medium'} || 1; @@ -904,15 +904,15 @@ } $this->addDebugPackage($srcname."-debuginfo".$suffix, $arch, $packPointer); $this->addDebugPackage($srcname."-debugsource", $arch, $packPointer); - $this->addDebugPackage($basename."-debuginfo".$suffix, $arch, $packPointer); + $this->addDebugPackage($basename."-debuginfo".$suffix, $arch, $packPointer) unless $srcname eq $basename; }; } } next ARCH; # package processed, jump to the next request arch or package } - $this->logMsg("W", " => package $packName not available for arch $arch in any repo") if $this->{m_debug} >= 4; + $this->logMsg("W", " => package $packName not available for $requestedArch nor its fallbacks for repository $packKey") if $this->{m_debug} >= 4; } # /@fallbackarch - $this->logMsg("W", " => package $packName not available for $requestedArch nor its fallbacks") if $this->{m_debug} >= 1; + $this->logMsg("W", " => package $packName not available for arch $requestedArch in any repo") if $this->{m_debug} >= 1; push @missingPackages, $packName; } # /@archs } @@ -1112,11 +1112,11 @@ } $this->logMsg("I", " Use as expanded architectures >".join(" ", @fallbacklist)."<") if $this->{m_debug} >= 5; - FARCH:foreach my $arch(@fallbacklist) { - PACKKEY:foreach my $packKey( sort{$poolPackages->{$a}->{priority} <=> $poolPackages->{$b}->{priority}} keys(%{$poolPackages})) { + PACKKEY:foreach my $packKey( sort{$poolPackages->{$a}->{priority} <=> $poolPackages->{$b}->{priority}} keys(%{$poolPackages})) { + FARCH:foreach my $arch(@fallbacklist) { my $packPointer = $poolPackages->{$packKey}; - next PACKKEY if(!$packPointer->{'localfile'}); # should not be needed - next PACKKEY if($packPointer->{arch} ne $arch); + next FARCH if(!$packPointer->{'localfile'}); # should not be needed + next FARCH if($packPointer->{arch} ne $arch); $this->logMsg("I", "unpack $packPointer->{'localfile'} "); $this->{m_util}->unpac_package($packPointer->{'localfile'}, "$tmp"); 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-08-27 21:29:52.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2011-09-02 15:52:24.000000000 +0200 @@ -40,7 +40,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "4.95.3"; + $data{Version} = "4.95.4"; $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/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2011-08-26 16:01:55.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2011-09-02 15:52:24.000000000 +0200 @@ -437,6 +437,9 @@ #-------------------------------------- function mount_rpc_pipefs { # See if the file system is there yet + if [ ! -e /var/lib/nfs/rpc_pipefs ];then + return 0 + fi case `stat -c "%t" -f /var/lib/nfs/rpc_pipefs 2>/dev/null` in *67596969*) return 0;; @@ -4013,7 +4016,7 @@ # if there is a downloaded kernel and initrd from the KIWI_INITRD # setup. the kernelList function won't find initrds that gets # downloaded over tftp so make sure the vmlinu[zx]/initrd combo - # gets added + # gets added as well as the linux.vmx/initrd.vmx combo # ---- if [ -e $prefix/boot/vmlinuz ];then KERNEL_LIST="vmlinuz:initrd" @@ -4023,6 +4026,10 @@ KERNEL_LIST="vmlinux:initrd" KERNEL_NAME[1]=vmlinux fi + if [ -e $prefix/boot/linux.vmx ];then + KERNEL_LIST="vmlinux:initrd" + KERNEL_NAME[1]="vmlinux" + fi fi KERNEL_LIST=$(echo $KERNEL_LIST | sed -e s@^,@@) export KERNEL_LIST @@ -7253,10 +7260,6 @@ fi return fi - if [ ! -z "$COMBINED_IMAGE" ];then - # split image, /boot must be on the fsreadwrite area - return - fi if [ -z "$imageDiskDevice" ];then # no disk device like for live ISO based on clicfs return @@ -7273,9 +7276,11 @@ #-------------------------------------- mkdir -p /$mpoint mount $imageBootDevice /$mpoint - cp -a /mnt/boot /$mpoint - if [ -e /boot.tgz ];then - tar -xf /boot.tgz -C /$mpoint + if [ -z "$COMBINED_IMAGE" ];then + cp -a /mnt/boot /$mpoint + if [ -e /boot.tgz ];then + tar -xf /boot.tgz -C /$mpoint + fi fi umount /$mpoint rmdir /$mpoint diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIManager.pm new/kiwi/modules/KIWIManager.pm --- old/kiwi/modules/KIWIManager.pm 2011-08-27 20:52:49.000000000 +0200 +++ new/kiwi/modules/KIWIManager.pm 2011-08-30 16:22:03.000000000 +0200 @@ -779,7 +779,6 @@ if ($manager eq "zypper") { my @zypper = @{$this->{zypper}}; my $stype = "private"; - my $prio; qxx ("rm -f $dataDir/*.repo"); if (! $chroot) { $stype = "public"; @@ -795,6 +794,7 @@ foreach my $alias (keys %{$source{$stype}}) { my @sopts = @{$source{$stype}{$alias}}; my @zopts = (); + my $prio; foreach my $opt (@sopts) { next if ! defined $opt; $opt =~ /(.*?)=(.*)/; 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-08-27 20:52:49.000000000 +0200 +++ new/kiwi/modules/KIWIXML.pm 2011-08-30 16:22:03.000000000 +0200 @@ -1908,12 +1908,8 @@ #------------------------------------------ sub addRepository { # ... - # Add a repository node to the current list of repos - # this is done by reading the xml description file again and - # overwriting the first repository node with the new data - # A new object XML::LibXML::NodeList is created which - # contains the changed element. The element is then appended - # the the global repositNodeList + # Add a repository section to the current list of + # repos and update repositNodeList accordingly. # --- my $this = shift; my $kiwi = $this->{kiwi}; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
