Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2014-05-27 07:09:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2014-05-22 09:04:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2014-05-27 07:09:46.000000000 +0200 @@ -1,0 +2,97 @@ +Mon May 26 15:34:12 CEST 2014 - [email protected] + +- v5.06.99 released + +------------------------------------------------------------------- +Mon May 26 11:00:01 CEST 2014 - [email protected] + +- Update rhel-dump with regards to xz vs gzip change: 10aa35e3 + +------------------------------------------------------------------- +Mon May 26 10:19:29 CEST 2014 - [email protected] + +- Don't start klogconsole if quiet boot is set (bnc #879768) + +------------------------------------------------------------------- +Sun May 25 21:28:50 CEST 2014 - [email protected] + +- Be a bit smarter in best guess of the minimum size for + the boot partition if we need one. The function __getBootSize + now calculates the size using some parameters to keep + roughly 100MB free. This is more accurate than using a + fixed size min default value. Setting a custom value for the + boot partition using the bootpartsize attribute results in + + + Use of bootpartsize without any message if it is bigger + than recommended value + + + Use of bootpartsize with warning if it is smaller than + recommended value + +------------------------------------------------------------------- +Fri May 23 14:07:21 CEST 2014 - [email protected] + +- v5.06.98 released + +------------------------------------------------------------------- +Fri May 23 12:13:31 CEST 2014 - [email protected] + +- Make sure the auto inclusion of a system strip section + according to the bootincluded packages happens before + image.sh is called + +------------------------------------------------------------------- +Fri May 23 11:54:15 CEST 2014 - [email protected] + +- break up too long lines of code + +------------------------------------------------------------------- +Fri May 23 11:46:44 CEST 2014 - [email protected] + +- Better error message + * if no rpm db was found tell us where we searched for it + +------------------------------------------------------------------- +Fri May 23 11:42:05 CEST 2014 - [email protected] + +- Removed code duplication for calling images.sh + +------------------------------------------------------------------- +Thu May 22 17:46:51 CEST 2014 - [email protected] + +- v5.06.97 released + +------------------------------------------------------------------- +Thu May 22 17:19:43 CEST 2014 - [email protected] + +- Fixed syntax typo in warning call + +------------------------------------------------------------------- +Thu May 22 13:06:58 CEST 2014 - [email protected] + +- v5.06.96 released + +------------------------------------------------------------------- +Thu May 22 12:52:56 CEST 2014 - [email protected] + +- Make sure tools in bootincluded packages and archives + automatically stay inside the boot image (initrd) without + having the need for an additional <strip> section + +------------------------------------------------------------------- +Thu May 22 10:09:44 CEST 2014 - [email protected] + +- Fixed Use of uninitialized value $ENV{PATH} + +------------------------------------------------------------------- +Wed May 21 12:12:16 CEST 2014 - [email protected] + +- don't call the rpm dump/reload if all packages are specified + in the bootstrap section. In that case no rpm action happens + inside the chroot. Thus it's not needed to dump/reload the + rpm database. + + + It's not required to have the rpm db tools installed on the host +- The rpm database inside the new root tree stays incompatible + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.XNPrnK/_old 2014-05-27 07:09:47.000000000 +0200 +++ /var/tmp/diff_new_pack.XNPrnK/_new 2014-05-27 07:09:47.000000000 +0200 @@ -26,7 +26,7 @@ Group: System/Management Url: http://github.com/openSUSE/kiwi Name: kiwi -Version: 5.06.95 +Version: 5.06.99 Release: 0 Provides: kiwi-schema = 6.1 # requirements to build packages ++++++ kiwi-docu.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kiwi/kiwi-docu.tar.bz2 /work/SRC/openSUSE:Factory/.kiwi.new/kiwi-docu.tar.bz2 differ: char 11, line 1 ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2014-05-15 11:16:18.000000000 +0200 +++ new/kiwi/.revision 2014-05-23 14:09:40.000000000 +0200 @@ -1 +1 @@ -ea30f3da74131c33bced22c0cd8a0f9502533c9e +30fc38c40b9501aa7d5d8af7ed5cf09e28b52bfb 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 2014-05-16 10:20:24.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2014-05-26 15:35:05.000000000 +0200 @@ -7131,22 +7131,46 @@ # ... # set minimum boot size or the specified value from the # XML description. The function returns the size in - # M-Bytes + # M-Bytes. # --- my $this = shift; my $kiwi = $this->{kiwi}; my $xml = $this->{xml}; my $type = $this->{type}; - my $needMB = 100; - my $wantMB = 200; - if ($type->{bootpartsize}) { - $wantMB = $type->{bootpartsize}; + my $system = $this->{system}; + my $initrd = $this->{initrd}; + my $bootMB = 0; + my $irdMB = 0; + my $msg; + # /.../ + # The minimum boot partition size is based on best guess + # because prior to the creation of the disk boot fs and uuid + # we don't know exactly how much space is used on boot. Thus + # the size estimation is based on: + # + # 1. the current size of the system boot/ directory as a start + if (($system) && (-d $system.'/boot')) { + $bootMB = int (KIWIGlobals -> instance() + -> dsize ($system.'/boot') / 1048576); + } + # 2. plus twice the size of the kiwi initrd + if (($initrd) && (-e $initrd)) { + $irdMB = int (KIWIGlobals -> instance() + -> isize ($initrd) / 1048576); + # it's doubled because bootloader and theme data is + # copied from the initrd in the stage setup + $bootMB += (2 * $irdMB); } - if ($wantMB >= $needMB) { + # 3. plus 100M addon space to reach roughly 100MB free + my $needMB = 100 + $bootMB; + if ($type->{bootpartsize}) { + my $wantMB = $type->{bootpartsize}; + if ($wantMB < $needMB) { + $msg = "Specified bootpartsize is smaller than "; + $msg.= "recommended value of $needMB MB\n"; + $kiwi -> warning ($msg); + } $needMB = $wantMB; - } else { - $kiwi -> loginfo ("Specified boot space of $wantMB MB is too small\n"); - $kiwi -> loginfo ("Using default value of $needMB MB\n"); } $kiwi -> info ("Set boot partition space to: ".$needMB."M\n"); return $needMB; 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 2014-05-15 11:16:18.000000000 +0200 +++ new/kiwi/modules/KIWICollect.pm 2014-05-23 14:09:40.000000000 +0200 @@ -2477,7 +2477,6 @@ } for my $d($this->getMediaNumbers()) { my $dbase = $this->{m_basesubdir}->{$d}; - #my $dbase = $ENV{'PWD'}.$this->{m_basesubdir}->{$d}; my @dlist; push @dlist, "$dbase"; # boot may be nonexistent if no metapack creates it 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 2014-05-20 15:24:16.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2014-05-26 15:35:05.000000000 +0200 @@ -1398,7 +1398,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "5.06.95"; + $data{Version} = "5.06.99"; $data{Publisher} = "SUSE LINUX GmbH"; $data{Preparer} = "KIWI - http://opensuse.github.com/kiwi";; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIImage.pm new/kiwi/modules/KIWIImage.pm --- old/kiwi/modules/KIWIImage.pm 2014-05-15 11:16:18.000000000 +0200 +++ new/kiwi/modules/KIWIImage.pm 2014-05-23 14:09:43.000000000 +0200 @@ -398,8 +398,12 @@ $kiwi -> error ($data); return; } - KIWIQX::qxx ("mv -f $this->{imageDest}/$name.ext4 $this->{imageDest}/$name.clicfs"); - KIWIQX::qxx ("rm -f $this->{imageDest}/fsdata.ext4"); + KIWIQX::qxx ( + "mv -f $this->{imageDest}/$name.ext4 $this->{imageDest}/$name.clicfs" + ); + KIWIQX::qxx ( + "rm -f $this->{imageDest}/fsdata.ext4" + ); $kiwi -> done(); #========================================== # Create image md5sum @@ -2956,29 +2960,43 @@ $kiwi -> info ("Checking file system: $type..."); SWITCH: for ($type) { /ext2/ && do { - KIWIQX::qxx ("/sbin/e2fsck -f -y $this->{imageDest}/$name 2>&1"); + KIWIQX::qxx ( + "/sbin/e2fsck -f -y $this->{imageDest}/$name 2>&1" + ); $kiwi -> done(); last SWITCH; }; /ext3/ && do { - KIWIQX::qxx ("/sbin/fsck.ext3 -f -y $this->{imageDest}/$name 2>&1"); - KIWIQX::qxx ("/sbin/tune2fs -j $this->{imageDest}/$name 2>&1"); + KIWIQX::qxx ( + "/sbin/fsck.ext3 -f -y $this->{imageDest}/$name 2>&1" + ); + KIWIQX::qxx ( + "/sbin/tune2fs -j $this->{imageDest}/$name 2>&1" + ); $kiwi -> done(); last SWITCH; }; /ext4/ && do { - KIWIQX::qxx ("/sbin/fsck.ext4 -f -y $this->{imageDest}/$name 2>&1"); - KIWIQX::qxx ("/sbin/tune2fs -j $this->{imageDest}/$name 2>&1"); + KIWIQX::qxx ( + "/sbin/fsck.ext4 -f -y $this->{imageDest}/$name 2>&1" + ); + KIWIQX::qxx ( + "/sbin/tune2fs -j $this->{imageDest}/$name 2>&1" + ); $kiwi -> done(); last SWITCH; }; /reiserfs/ && do { - KIWIQX::qxx ("/sbin/reiserfsck -y $this->{imageDest}/$name 2>&1"); + KIWIQX::qxx ( + "/sbin/reiserfsck -y $this->{imageDest}/$name 2>&1" + ); $kiwi -> done(); last SWITCH; }; /btrfs/ && do { - KIWIQX::qxx ("/sbin/btrfsck $this->{imageDest}/$name 2>&1"); + KIWIQX::qxx ( + "/sbin/btrfsck $this->{imageDest}/$name 2>&1" + ); $kiwi -> done(); last SWITCH; }; @@ -2987,7 +3005,9 @@ last SWITCH; }; /xfs/ && do { - KIWIQX::qxx ("/sbin/mkfs.xfs $this->{imageDest}/$name 2>&1"); + KIWIQX::qxx ( + "/sbin/mkfs.xfs $this->{imageDest}/$name 2>&1" + ); $kiwi -> done(); last SWITCH; }; @@ -3762,7 +3782,9 @@ $kiwi -> info ("Copying physical to logical [$name]..."); my $free = KIWIQX::qxx ("df -h $extend 2>&1"); $kiwi -> loginfo ("getSize: mount: $free\n"); - my $data = KIWIQX::qxx ("rsync -aHXA --one-file-system $source/ $extend 2>&1"); + my $data = KIWIQX::qxx ( + "rsync -aHXA --one-file-system $source/ $extend 2>&1" + ); my $code = $? >> 8; if ($code != 0) { $kiwi -> failed (); @@ -3782,7 +3804,9 @@ -> generateBuildImageName($this->{xml}); my $dest = $this->{imageDest}."/".$name; $kiwi -> info ("Dumping filesystem image from $device..."); - $data = KIWIQX::qxx ("qemu-img convert -f raw -O raw $device $dest 2>&1"); + $data = KIWIQX::qxx ( + "qemu-img convert -f raw -O raw $device $dest 2>&1" + ); $code = $? >> 8; if ($code != 0) { $kiwi -> failed (); @@ -3810,20 +3834,10 @@ #========================================== # Call images.sh script #------------------------------------------ - if ((! defined $initCache) && (-x "$imageTree/image/images.sh")) { - $kiwi -> info ("Calling image script: images.sh"); - my ($code,$data) = KIWIGlobals -> instance() -> callContained ( - $imageTree,"/image/images.sh" - ); - if ($code != 0) { - $kiwi -> failed (); - $kiwi -> info ($data); - $this -> cleanMount(); + if (! defined $initCache) { + if (! $this -> executeUserImagesScript()) { return; - } else { - $kiwi -> loginfo ("images.sh: $data"); } - $kiwi -> done (); } #========================================== # extract kernel from physical extend @@ -3927,7 +3941,9 @@ #========================================== # mount zfs filesystem #------------------------------------------ - $data = KIWIQX::qxx ("zpool import -d $this->{imageDest} kiwipool 2>&1"); + $data = KIWIQX::qxx ( + "zpool import -d $this->{imageDest} kiwipool 2>&1" + ); $code = $? >> 8; if ($code == 0) { push @clean,"zpool export kiwipool"; @@ -4014,7 +4030,9 @@ KIWIQX::qxx ("$zipper -cd $splash > $splash.bob"); my $count = $this -> extractCPIO ( $splash.".bob" ); for (my $id=1; $id <= $count; $id++) { - KIWIQX::qxx ("cat $splash.bob.$id |(cd $splash.dir && cpio -i 2>&1)"); + KIWIQX::qxx ( + "cat $splash.bob.$id |(cd $splash.dir && cpio -i 2>&1)" + ); } KIWIQX::qxx ("cp -a $splash.dir/etc $newspl"); $result = 1; @@ -4221,11 +4239,17 @@ } $this -> restoreImageDest(); if ((defined $journal) && ($journal eq "journaled-ext3")) { - $data = KIWIQX::qxx ("cd $this->{imageDest} && ln -vs $name $name.ext3 2>&1"); + $data = KIWIQX::qxx ( + "cd $this->{imageDest} && ln -vs $name $name.ext3 2>&1" + ); } elsif ((defined $journal) && ($journal eq "journaled-ext4")) { - $data = KIWIQX::qxx ("cd $this->{imageDest} && ln -vs $name $name.ext4 2>&1"); + $data = KIWIQX::qxx ( + "cd $this->{imageDest} && ln -vs $name $name.ext4 2>&1" + ); } else { - $data = KIWIQX::qxx ("cd $this->{imageDest} && ln -vs $name $name.ext2 2>&1"); + $data = KIWIQX::qxx ( + "cd $this->{imageDest} && ln -vs $name $name.ext2 2>&1" + ); } $this -> remapImageDest(); $kiwi -> loginfo ($data); @@ -4261,7 +4285,9 @@ KIWIQX::qxx ("touch $this->{imageDest}/$name"); } $this -> restoreImageDest(); - $data = KIWIQX::qxx ("cd $this->{imageDest} && ln -vs $name $name.btrfs 2>&1"); + $data = KIWIQX::qxx ( + "cd $this->{imageDest} && ln -vs $name $name.btrfs 2>&1" + ); $this -> remapImageDest(); $kiwi -> loginfo ($data); return $name; @@ -4297,7 +4323,9 @@ KIWIQX::qxx ("touch $this->{imageDest}/$name"); } $this -> restoreImageDest(); - $data = KIWIQX::qxx ("cd $this->{imageDest} && ln -vs $name $name.reiserfs 2>&1"); + $data = KIWIQX::qxx ( + "cd $this->{imageDest} && ln -vs $name $name.reiserfs 2>&1" + ); $this -> remapImageDest(); $kiwi -> loginfo ($data); return $name; @@ -4329,7 +4357,9 @@ } unlink ("$this->{imageDest}/$name"); my $squashfs_tool = $locator -> getExecPath("mksquashfs"); - my $data = KIWIQX::qxx ("$squashfs_tool $tree $this->{imageDest}/$name $opts 2>&1"); + my $data = KIWIQX::qxx ( + "$squashfs_tool $tree $this->{imageDest}/$name $opts 2>&1" + ); my $code = $? >> 8; if ($code != 0) { $kiwi -> failed (); @@ -4382,7 +4412,9 @@ $this -> restoreImageDest(); $data = KIWIQX::qxx ("chmod 644 $this->{imageDest}/$name"); $data = KIWIQX::qxx ("rm -f $this->{imageDest}/$name.squashfs"); - $data = KIWIQX::qxx ("cd $this->{imageDest} && ln -vs $name $name.squashfs 2>&1"); + $data = KIWIQX::qxx ( + "cd $this->{imageDest} && ln -vs $name $name.squashfs 2>&1" + ); $this -> remapImageDest(); $kiwi -> loginfo ($data); return $name; @@ -4423,7 +4455,9 @@ KIWIQX::qxx ("touch $this->{imageDest}/$name"); } $this -> restoreImageDest(); - $data = KIWIQX::qxx ("cd $this->{imageDest} && ln -vs $name $name.zfs 2>&1"); + $data = KIWIQX::qxx ( + "cd $this->{imageDest} && ln -vs $name $name.zfs 2>&1" + ); $this -> remapImageDest(); $kiwi -> loginfo ($data); return $name; @@ -4458,7 +4492,9 @@ KIWIQX::qxx ("touch $this->{imageDest}/$name"); } $this -> restoreImageDest(); - $data = KIWIQX::qxx ("cd $this->{imageDest} && ln -vs $name $name.xfs 2>&1"); + $data = KIWIQX::qxx ( + "cd $this->{imageDest} && ln -vs $name $name.xfs 2>&1" + ); $this -> remapImageDest(); $kiwi -> loginfo ($data); return $name; @@ -4503,7 +4539,9 @@ my $sum = KIWIQX::qxx ("cat $image | md5sum - | cut -f 1 -d-"); chomp $sum; $name =~ s/\.$suf$//; - KIWIQX::qxx ("echo \"$sum $blocks $blocksize\" > $this->{imageDest}/$name.md5"); + KIWIQX::qxx ( + "echo \"$sum $blocks $blocksize\" > $this->{imageDest}/$name.md5" + ); $this->{md5file} = $this->{imageDest}."/".$name.".md5"; $kiwi -> done(); return $name; @@ -4574,8 +4612,9 @@ #------------------------------------------ $kiwi -> info ("Compressing image..."); my $suf = $this->{gdata}->{IrdZipperSuffix}; + my $zip = $this->{gdata}->{IrdZipperCommand}; my $data = KIWIQX::qxx ( - "cat $image | $this->{gdata}->{IrdZipperCommand} > $this->{imageDest}/$name.$suf" + "cat $image | $zip > $this->{imageDest}/$name.$suf" ); my $code = $? >> 8; if ($code != 0) { @@ -4785,7 +4824,9 @@ $cmd = "$zipper -cd $initrd"; $zip = 1; } - $status = KIWIQX::qxx ("$cmd|cpio -it --quiet 'lib/modules/*'|cut -f1-3 -d/"); + $status = KIWIQX::qxx ( + "$cmd|cpio -it --quiet 'lib/modules/*'|cut -f1-3 -d/" + ); my $result = $? >> 8; my @status = split(/\n/,$status); if ($result != 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIImageCreator.pm new/kiwi/modules/KIWIImageCreator.pm --- old/kiwi/modules/KIWIImageCreator.pm 2014-05-15 11:16:18.000000000 +0200 +++ new/kiwi/modules/KIWIImageCreator.pm 2014-05-23 14:09:43.000000000 +0200 @@ -925,14 +925,19 @@ if (-f "$tree/var/lib/rpm/Packages") { $kiwi -> info ("Creating unpacked image tree meta data"); my $idest = $cmdL -> getImageIntermediateTargetDir(); - my $query = '%{NAME}|%{EPOCH}|%{VERSION}|%{RELEASE}|%{ARCH}|%{DISTURL}\n'; + my $query = '%{NAME}|%{EPOCH}|%{VERSION}|' + . '%{RELEASE}|%{ARCH}|%{DISTURL}\n'; my $name = KIWIGlobals -> instance() -> generateBuildImageName($xml); my $path = File::Spec->rel2abs ($tree); - KIWIQX::qxx ("rpm --root $path -qa --qf \"$query\" &> $idest/$name.packages"); + KIWIQX::qxx ( + "rpm --root $path -qa --qf \"$query\" &> $idest/$name.packages" + ); my $result = $? >> 8; if ($result == 0) { - KIWIQX::qxx ("rpm --root $path -Va &> $idest/$name.verified"); + KIWIQX::qxx ( + "rpm --root $path -Va &> $idest/$name.verified" + ); } if ($result != 0) { my $msg; @@ -946,6 +951,10 @@ } } #========================================== + # Add system strip from bootincludes + #------------------------------------------ + $this -> __addBootincludedToolsToKeep ($xml, $tree); + #========================================== # Build image using KIWIImageBuilder #------------------------------------------ my $factory = KIWIImageBuildFactory -> new ($xml, $cmdL, $image); @@ -2158,6 +2167,116 @@ return $this; } +#========================================== +# __getPackageFilelist +#------------------------------------------ +sub __getPackageFilelist { + # ... + # return a list of files owned by a given package + # --- + my $this = shift; + my $pack = shift; + my $root = shift; + my $kiwi = $this->{kiwi}; + my $data = KIWIQX::qxx ( + "rpm --root $root -ql \"$pack\" 2>&1" + ); + my $code = $? >> 8; + if ($code != 0) { + return; + } + return [split(/\n/, $data)]; +} + +#========================================== +# __addBootincludedToolsToKeep +#------------------------------------------ +sub __addBootincludedToolsToKeep { + # ... + # Keep all tools from explicitly bootincluded packages + # by adding a strip section to the system XML data + # which is then added to the boot image when we inherit + # system XML data to the boot + # --- + my $this = shift; + my $xml = shift; + my $root = shift; + my $kiwi = $this->{kiwi}; + my @list; + $kiwi -> info ( + "Reading contents of bootincluded packages/archives\n" + ); + if (! -f "$root/var/lib/rpm/Packages") { + # /.../ + # For the moment we can get the package file list only + # from the rpm database inside of the unpacked root tree + # If no such database exists, treat it as a warning and + # return + # ---- + $kiwi -> warning ( + "--> No rpm database found in $root" + ); + $kiwi -> skipped(); + return $this; + } + my $bootAddPacks = $xml -> getBootIncludePackages(); + for my $pack (@$bootAddPacks) { + my $pack_name = $pack -> getName(); + my $pkglist = $this -> __getPackageFilelist( + $pack_name, $root + ); + if ($pkglist) { + $kiwi -> info ( + "--> got list from $pack_name\n" + ); + push @list, @$pkglist; + } else { + $kiwi -> warning ( + "--> package $pack_name not installed\n" + ); + $kiwi -> skipped(); + } + } + my $FILE = FileHandle -> new(); + if ($FILE -> open ("$root/bootincluded_archives.filelist")) { + while (<$FILE>) { + chomp; + push @list, File::Spec->rel2abs( $_, '/' ) ; + } + $FILE -> close(); + $kiwi -> info ( + "--> got list from bootincluded_archives.filelist\n" + ); + } + $kiwi -> info ( + "Checking for tools in bootincluded contents to keep\n" + ); + my @tool_list = (); + for my $file (@list) { + if ($file =~ /^(\/usr)?\/s?bin\/([^\/]*)$/) { + my $tool = $2; + push @tool_list, $tool + } + } + my %hashTemp = map { $_ => 1 } @tool_list; + @tool_list = sort keys %hashTemp; + if (! @tool_list) { + $kiwi -> info ("--> no tools to keep\n"); + } else { + for my $tool (@tool_list) { + $kiwi -> info ("--> Keep in boot image: $tool\n"); + my %stripData = ( + name => $tool + ); + my $stripObj = KIWIXMLStripData -> new(\%stripData); + if ($stripObj) { + $xml -> addToolsToKeep ([$stripObj]); + } + } + } + return $this; +} + #========================================== # __addStripDataToBootXML #------------------------------------------ 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 2014-05-20 15:24:16.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2014-05-26 15:35:05.000000000 +0200 @@ -542,6 +542,7 @@ # Log all errors and the debug information to the # file set in ELOG_FILE. # ---- + local umountProc=0 if [ ! -f $ELOG_FILE ];then #====================================== # Header for main stage log @@ -566,13 +567,34 @@ #-------------------------------------- exec 2>>$ELOG_FILE #====================================== - # Redirect stdout if quiet is set + # Mount proc for cmdline quiet check #-------------------------------------- if [ ! -e /proc/cmdline ];then mount -t proc proc /proc + umountProc=1 fi if cat /proc/cmdline | grep -qi "quiet";then + #====================================== + # Redirect/Clean stdout if quiet is set + #-------------------------------------- exec 1>>/dev/null + if [ -x /usr/bin/setterm ];then + setterm -clear all + setterm -background black + fi + else + #====================================== + # Set kernel log level + #-------------------------------------- + if lookup klogconsole;then + klogconsole -l 6 + fi + fi + #====================================== + # Clean proc + #-------------------------------------- + if [ $umountProc -eq 1 ];then + umount /proc fi #====================================== # Enable shell debugging and redirect @@ -10300,12 +10322,6 @@ # Start boot timer (first stage) #-------------------------------------- startUtimer - #====================================== - # Set kernel log level - #-------------------------------------- - if lookup klogconsole;then - klogconsole -l 6 - fi } # vim: set noexpandtab: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILocator.pm new/kiwi/modules/KIWILocator.pm --- old/kiwi/modules/KIWILocator.pm 2014-05-15 11:16:18.000000000 +0200 +++ new/kiwi/modules/KIWILocator.pm 2014-05-23 14:09:40.000000000 +0200 @@ -358,7 +358,10 @@ if ($root) { $cmd .= "chroot $root "; } - $cmd .= 'bash -c "PATH='.$ENV{PATH}; + $cmd .= 'bash -c "PATH='; + if ($ENV{PATH}) { + $cmd .= $ENV{PATH}; + } $cmd .= ':/bin:/sbin:/usr/bin:/usr/sbin type -p '; $cmd .= $execName . '" 2>&1'; my $pid = open3 ( 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 2014-05-15 11:16:18.000000000 +0200 +++ new/kiwi/modules/KIWIManager.pm 2014-05-23 14:09:40.000000000 +0200 @@ -710,13 +710,16 @@ # ... # try to fix rpm version incompatibility # --- - my $this = shift; - my @kchroot= @{$this->{kchroot}}; + my $this = shift; + my @kchroot = @{$this->{kchroot}}; + my @packlist = $this -> setupInstallPackages(); #========================================== # cleanup baselibs #------------------------------------------ - if (! $this -> cleanupRPMDatabase()) { - return; + if (@packlist) { + if (! $this -> cleanupRPMDatabase()) { + return; + } } KIWIQX::qxx ("@kchroot ldconfig 2>&1"); return $this; 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 2014-05-15 11:16:18.000000000 +0200 +++ new/kiwi/modules/KIWIRoot.pm 2014-05-23 14:09:40.000000000 +0200 @@ -800,12 +800,6 @@ my $manager = $this->{manager}; my %type; #========================================== - # Check for RPM incompatibility - #------------------------------------------ - if (! $manager -> cleanupRPMDatabase()) { - return; - } - #========================================== # Get image package list #------------------------------------------ my @packList = $manager -> setupInstallPackages; @@ -817,6 +811,12 @@ return $this; } #========================================== + # Check for RPM incompatibility + #------------------------------------------ + if (! $manager -> cleanupRPMDatabase()) { + return; + } + #========================================== # Mount local and NFS directories #------------------------------------------ if (! setupMount ($this)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/rhel-dump new/kiwi/system/boot/ix86/oemboot/rhel-dump --- old/kiwi/system/boot/ix86/oemboot/rhel-dump 2014-05-15 11:16:18.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/rhel-dump 2014-05-26 15:35:05.000000000 +0200 @@ -353,7 +353,7 @@ imageName=$prefix/$imageName imageMD5=$(echo $imageName | sed -e [email protected]@.md5@) if [ ! -z "$pxe" ];then - imageName=$(echo $imageName | sed -e [email protected]@.gz@) + imageName=$(echo $imageName | sed -e [email protected]@.xz@) fi OEMRootImage=$imageName #====================================== @@ -765,7 +765,7 @@ else multicast="disable" Echo "Loading $Source [$Target BS:$imageBlkSize Byte]..." - fetchFile $Source $Target compressed $imageServer + fetchFile $Source $Target compressed-xz $imageServer if test $loadCode != 0 || ! loadOK "$loadStatus";then systemException \ "Download of $imageName failed: $loadStatus" \ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
