Hello community, here is the log from the commit of package kiwi checked in at Wed Jul 11 11:16:17 CEST 2007. -------- --- arch/i386/kiwi/kiwi.changes 2007-07-09 17:46:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2007-07-11 10:51:11.489625000 +0200 @@ -1,0 +2,8 @@ +Tue Jul 10 13:12:56 CEST 2007 - ms@suse.de + +- v1.44 +- fixed use of undefined reference +- fixed use of plusSuggested, means required + suggested only +- fixed report creation in KIWIMigrate.pm + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.AW7252/_old 2007-07-11 11:15:50.000000000 +0200 +++ /var/tmp/diff_new_pack.AW7252/_new 2007-07-11 11:15:50.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kiwi (Version 1.43) +# spec file for package kiwi (Version 1.44) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,7 +15,7 @@ BuildRequires: module-init-tools perl perl-XML-LibXML perl-libwww-perl screen smart syslinux Requires: perl perl-XML-LibXML perl-libwww-perl screen Summary: OpenSuSE - KIWI Image System -Version: 1.43 +Version: 1.44 Release: 1 Group: System/Management License: GPL v2 or later @@ -302,6 +302,11 @@ %{_datadir}/kiwi/image/xenboot/suse* %changelog +* Tue Jul 10 2007 - ms@suse.de +- v1.44 +- fixed use of undefined reference +- fixed use of plusSuggested, means required + suggested only +- fixed report creation in KIWIMigrate.pm * Tue Jul 03 2007 - ms@suse.de - v1.43 - re-added resolv.conf to be part of the chroot system. This was the reason ++++++ kiwi.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/kiwi.pl new/kiwi/kiwi.pl --- old/kiwi/kiwi.pl 2007-07-09 17:44:59.000000000 +0200 +++ new/kiwi/kiwi.pl 2007-07-11 10:46:21.000000000 +0200 @@ -31,7 +31,7 @@ #============================================ # Globals (Version) #-------------------------------------------- -our $Version = "1.43"; +our $Version = "1.44"; our $SchemeVersion = "1.4"; #============================================ # Globals 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 2007-07-09 17:44:59.000000000 +0200 +++ new/kiwi/modules/KIWIMigrate.pm 2007-07-11 10:47:11.000000000 +0200 @@ -122,7 +122,20 @@ '\/usr\/src\/', # no sources '\/spool', # no spool directories '^\/dev\/', # no device node files - '\/usr\/X11R6\/' # no depreciated dirs + '\/usr\/X11R6\/', # no depreciated dirs + '\/tmp\/', # no /tmp data + '\/boot\/', # no /boot data + '\/proc\/', # no /proc data + '\/sys\/', # no /sys data + '\/abuild\/', # no /abuild data + '\/cache', # no cache files + '\/fillup-templates', # no fillup data + '\/var\/lib\/rpm', # no RPM data + '\/var\/lib\/zypp', # no ZYPP data + '\/var\/lib\/smart', # no smart data + '\/var\/log', # no logs + '\/var\/run', # no pid files + '\/media\/' # no media automount files ); if (defined $excl) { my @exclude = @{$excl}; @@ -355,6 +368,7 @@ } $this->{rdev} = $rootdev; $this->{rsize} = $data; + $this->{mount} = "/kiwiroot"; return $this; } @@ -371,12 +385,18 @@ my $dest = $this->{dest}; my $kiwi = $this->{kiwi}; my $rdev = $this->{rdev}; + my $mount= $this->{mount}; my @deny = @{$this->{deny}}; my %result; #========================================== # mount root system #------------------------------------------ - my $data = qx(mount $rdev /mnt 2>&1); + if (! -d $mount && ! mkdir $mount) { + $kiwi -> error ("Failed to create kiwi root mount point: $!"); + $kiwi -> failed (); + return undef; + } + my $data = qx(mount $rdev $mount 2>&1); my $code = $? >> 8; if ($code != 0) { $kiwi -> error ("Failed to mount root system: $data"); @@ -391,17 +411,17 @@ my $filehash = shift; return sub { if (-f $File::Find::name) { - $filehash->{$File::Find::name} = $File::Find::dir; + my $expr = quotemeta $mount; + my $file = $File::Find::name; $file =~ s/$expr//; + my $dirn = $File::Find::dir; $dirn =~ s/$expr//; + $filehash->{$file} = $dirn; } } }; #========================================== # Find files not packaged #------------------------------------------ - my @dirs = ( - "/etc","/lib","/lib64","/bin", - "/sbin","/opt","/srv","/usr" - ); + my @dirs = ($mount); my $wref = generateWanted (\%result); $kiwi -> info ("Inspecting root file system..."); find ($wref, @dirs); @@ -484,7 +504,12 @@ @rpmcheck = sort keys %result; if (defined $demo) { $kiwi -> info ("Creating report for root tree: $dest/report"); - my $data = qx(du -ch --time @rpmcheck > $dest/report 2>&1); + my @list = (); + foreach my $file (@rpmcheck) { + my $data = quotemeta $file; + push (@list,$data); + } + my $data = qx(du -ch --time @list | column -t > $dest/report); my $code = $? >> 8; if ($code != 0) { $kiwi -> failed (); @@ -526,8 +551,12 @@ #------------------------------------------ sub cleanMount { my $this = shift; + my $mount= $this->{mount}; if (defined $this->{mounted}) { - qx(umount /mnt); undef $this->{mounted}; + qx(umount $mount); undef $this->{mounted}; + } + if (-d $mount) { + rmdir $mount; } return $this; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWIPattern.pm new/kiwi/modules/KIWIPattern.pm --- old/kiwi/modules/KIWIPattern.pm 2007-05-21 14:41:52.000000000 +0200 +++ new/kiwi/modules/KIWIPattern.pm 2007-07-11 10:46:20.000000000 +0200 @@ -240,7 +240,7 @@ ); } elsif ($pattype eq "plusSuggested") { @reqs = $this -> getSection ( - '^(\+Re[qc]:|\+Sug:)','^(\-Re[qc]:|\-Sug:)',\@patdata + '^(\+Req:|\+Sug:)','^(\-Req:|\-Sug:)',\@patdata ); } else { @reqs = $this -> getSection ( @@ -287,7 +287,7 @@ ); } elsif ($pattype eq "plusSuggested") { @pacs = $this -> getSection ( - '^(\+Pr[qc]:|\+Psg:)','^(\-Pr[qc]:|\-Psg:)' + '^(\+Prq:|\+Psg:)','^(\-Prq:|\-Psg:)' ); } else { @pacs = $this -> getSection ( 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 2007-07-09 17:45:20.000000000 +0200 +++ new/kiwi/modules/KIWIRoot.pm 2007-07-11 10:46:20.000000000 +0200 @@ -646,6 +646,9 @@ my $this = shift; my $kiwi = $this->{kiwi}; my $root = $this->{root}; + if (! defined $this->{mountList}) { + return $this; + } my @mountList = @{$this->{mountList}}; my $baseSystem = $this->{baseSystem}; my $prefix = $root."/".$baseSystem; 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 2007-05-21 14:41:52.000000000 +0200 +++ new/kiwi/modules/KIWIURL.pm 2007-07-11 10:46:20.000000000 +0200 @@ -105,7 +105,7 @@ my $browser = LWP::UserAgent->new; my $location = qw (http://ftp.opensuse.org/pub/opensuse); my @types = qw (distribution repositories); - my @dists = qw (inst-source repo/oss); + my @dists = qw (inst-source inst-source-extra repo/oss); my @urllist = (); my $kiwi = $this->{kiwi}; #========================================== ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org