Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2014-11-24 11:13:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-11-06 16:49:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2014-11-24 11:13:32.000000000 +0100 @@ -2 +2 @@ -Wed Nov 5 10:19:30 CET 2014 - m...@suse.de +Fri Nov 21 10:37:41 CET 2014 - m...@suse.de @@ -4 +4,221 @@ -- v7.01.18 released +- v7.02.6 released + +------------------------------------------------------------------- +Fri Nov 21 10:36:26 CET 2014 - m...@suse.de + +- Fixed Makefile clean target + + make sure all autogenerated data is wiped on clean + make sure clean target is called on build of package + +------------------------------------------------------------------- +Fri Nov 21 10:34:00 CET 2014 - m...@suse.de + +- v7.02.5 released + +------------------------------------------------------------------- +Fri Nov 21 09:48:31 CET 2014 - m...@suse.de + +- Allow to run kiwi --describe from git checkout + +------------------------------------------------------------------- +Fri Nov 21 09:30:19 CET 2014 - m...@suse.de + +- Fixed typo in 13.2 os release matcher + +------------------------------------------------------------------- +Fri Nov 21 09:25:48 CET 2014 - m...@suse.de + +- Support kiwi --describe for openSUSE 13.2 + + analysing and cloning of 13.2 systems added + +------------------------------------------------------------------- +Thu Nov 20 16:52:05 CET 2014 - m...@suse.de + +- Added fribidi and fbiterm to kiwi-media-requires package + + Unfortunately these two packages are not on the openSUSE 13.2 + DVD. But kiwi uses fbiterm in the boot images. Thus users + have to add the online repo in order to build. For 13.2 it's + too late but with this change I hope the two packages will + be placed on the DVD again + +------------------------------------------------------------------- +Tue Nov 18 14:04:07 CET 2014 - m...@suse.de + +- Cleanup use of installBootLoader + + Instead of building device nodes out of the partition id's hash + use the already existing device map information. That eliminates + some unneeded logic as well as two helper methods used to find + the right place for the device when only the partition id is + known + +------------------------------------------------------------------- +Mon Nov 17 17:41:23 CET 2014 - m...@suse.de + +- Fixed suseStripKernel for updates/ modules + + If the dependency checker finds a dependency to a module in the updates + or weak-updates directory the move of the module will fail because kiwi + always uses updates/weak-updates modules and has moved them already. + The dependency code however creates a new updates/weak-updates directory + for the affected module and that causes a conflict when the original + updates/weak-updates are moved back to the final place. In the end the + result is that no updates/weak-updates module are present in the initrd + +------------------------------------------------------------------- +Mon Nov 17 16:16:44 CET 2014 - m...@suse.de + +- Better error message in pxeSetupDownloadServer + + Be more descriptive if the PXE download server can't be + found. In addition cleanup suse/rhel-dump to call + pxeSetupDownloadServer instead of duplicating the code + +------------------------------------------------------------------- +Mon Nov 17 15:32:43 CET 2014 - sch...@suse.de + +- Don't remove kernel and initrd in KIWIMiniIsoPlugin + +------------------------------------------------------------------- +Mon Nov 17 12:38:01 CET 2014 - m...@suse.de + +- Make sure drivers/virtio is part of netboot initrd + + This allows to use the virtio network from qemu if + started with the virtio-net-pci driver + +------------------------------------------------------------------- +Mon Nov 17 08:52:54 CET 2014 - m...@suse.de + +- Added 12.2 to the cleanup list in the spec file + +------------------------------------------------------------------- +Mon Nov 17 08:48:45 CET 2014 - m...@suse.de + +- fix bashism in post script + + Use a simple string list in the spec file to walk through + the list of distribution names in order to cleanup old ones + Original patch by: Led <led...@gmail.com> + +------------------------------------------------------------------- +Thu Nov 13 15:31:15 CET 2014 - m...@suse.de + +- v7.02.4 released + +------------------------------------------------------------------- +Thu Nov 13 10:33:38 CET 2014 - m...@suse.de + +- Fixed and cleanup unit test processing + + When running the unit tests the class KIWILog is overwritten + in a way that a global kiwi logger is created from Common::ktLog + but there is no declaration which really overwrites the KIWILog + package to be a Common::ktLog. This patch fixes this and makes + unit testing work in travis again. In addition methods from + Common::ktLog no longer present in KIWILog were removed too + +------------------------------------------------------------------- +Wed Nov 12 17:11:20 CET 2014 - m...@suse.de + +- Fixed result bundler for vhd-fixed format + + There is a small inconsistency between the schema format setup + and the extension used in the result file. The schema wants + format="vhd-fixed" and the file is written as file.vhdfixed + +------------------------------------------------------------------- +Wed Nov 12 15:46:56 CET 2014 - m...@suse.de + +- v7.02.3 released + +------------------------------------------------------------------- +Wed Nov 12 10:04:21 CET 2014 - m...@suse.de + +- Compress install PXE tarball using XZ + + Instead of tar's -z we use now -J for xz compression and + also changed the output name to *.install.tar.xz in order + to allow the buildservice to match this file as a result + +------------------------------------------------------------------- +Wed Nov 12 09:18:53 CET 2014 - m...@suse.de + +- v7.02.2 released + +------------------------------------------------------------------- +Wed Nov 12 09:16:09 CET 2014 - m...@suse.de + +- DB: rebuild documentation, build for factory version + +------------------------------------------------------------------- +Wed Nov 12 09:15:49 CET 2014 - m...@suse.de + +- v7.02.1 released + +------------------------------------------------------------------- +Tue Nov 11 15:15:36 CET 2014 - m...@suse.de + +- Fixed broken travis script + +------------------------------------------------------------------- +Tue Nov 11 15:13:25 CET 2014 - m...@suse.de + +- Run travis using perl 5.18 + +------------------------------------------------------------------- +Tue Nov 11 15:12:25 CET 2014 - m...@suse.de + +- Run Travis checks only for master + +------------------------------------------------------------------- +Tue Nov 11 15:05:31 CET 2014 - m...@suse.de + +- Revert "Update .travis.yml, run clean target before test" + + This reverts commit 67b5d1880ef36b4ded9879ca4ba07dea7f3293f6. + +------------------------------------------------------------------- +Tue Nov 11 14:58:50 CET 2014 - m...@suse.de + +- Update .travis.yml, run clean target before test + +------------------------------------------------------------------- +Tue Nov 11 14:23:24 CET 2014 - m...@suse.de + +- Update 13.2 JeOS description + + added less and iproute2 packages by default + +------------------------------------------------------------------- ++++ 34 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kiwi/kiwi.changes ++++ and /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.6QhaFt/_old 2014-11-24 11:13:33.000000000 +0100 +++ /var/tmp/diff_new_pack.6QhaFt/_new 2014-11-24 11:13:33.000000000 +0100 @@ -26,7 +26,7 @@ Group: System/Management Url: http://github.com/openSUSE/kiwi Name: kiwi -Version: 7.01.18 +Version: 7.02.6 Release: 0 Provides: kiwi-image:lxc Provides: kiwi-image:tbz @@ -597,6 +597,8 @@ Recommends: kiwi-desc-isoboot Recommends: kiwi-desc-netboot Recommends: kiwi-templates +Recommends: fribidi +Recommends: fbiterm %ifarch x86_64 %if 0%{?suse_version} > 1220 Recommends: shim @@ -731,9 +733,8 @@ %post -n kiwi-templates #============================================================ -# Clean up old old template directories if the exists -oldDists=( 10.1 10.2 10.3 11.0 11.1 11.2 11.3 12.1 SLE10 SLED10 ) -for dist in ${oldDists[@]};do +# Clean up old old template directories if present +for dist in 10.1 10.2 10.3 11.0 11.1 11.2 11.3 12.1 12.2 SLE10 SLED10; do rm -rf /usr/share/kiwi/image/suse-$dist-JeOS done %endif ++++++ kiwi-docu.tar.bz2 ++++++ ++++ 11447 lines of diff (skipped) ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.gitignore new/kiwi/.gitignore --- old/kiwi/.gitignore 2014-09-15 16:02:49.000000000 +0200 +++ new/kiwi/.gitignore 2014-11-21 09:45:22.000000000 +0100 @@ -8,3 +8,9 @@ *.op.*.old # hidden temporary files .tmp.* +# kiwirc file created if kiwi is called from git checkout +.kiwirc +# revision file created for packaging or if called from git checkout +.revision +# d3 css data packed into a tarball +metadata/KIWIAnalyse.tgz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2014-11-05 09:55:27.000000000 +0100 +++ new/kiwi/.revision 2014-11-05 09:55:27.000000000 +0100 @@ -1 +1 @@ -900319e56c748dc9ad9249170ac71aaabb06df7e +1434aa96414213b5877479e2be7915ef436d8126 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.travis.yml new/kiwi/.travis.yml --- old/kiwi/.travis.yml 2014-09-15 16:02:49.000000000 +0200 +++ new/kiwi/.travis.yml 2014-11-12 09:22:00.000000000 +0100 @@ -1,8 +1,18 @@ +branches: + only: + - master + language: perl + +perl: + - "5.18" + before_install: - sudo apt-get update -qq - sudo apt-get install -y xsltproc - sudo apt-get install -y syslinux + install: - cpanm -f -n $(cat .perlmodules | tr "\n" " ") + script: make test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/Makefile new/kiwi/Makefile --- old/kiwi/Makefile 2014-11-05 10:11:53.000000000 +0100 +++ new/kiwi/Makefile 2014-11-21 10:35:56.000000000 +0100 @@ -270,6 +270,7 @@ ${MAKE} -C locale clean rm -f tools/burner/Makefile rm -f tools/burner/imagewriter + rm -f metadata/KIWIAnalyse.tgz rm -f .revision rm -f .kiwirc @@ -282,5 +283,5 @@ rm -f /etc/bash_completion.d/kiwi.sh rm -f /dev/shm/lwp-download -build: +build: clean ./.doit -p --local diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/distribution/kiwi-instsource-plugins-openSUSE-13-2/KIWIMiniIsoPlugin.pm new/kiwi/distribution/kiwi-instsource-plugins-openSUSE-13-2/KIWIMiniIsoPlugin.pm --- old/kiwi/distribution/kiwi-instsource-plugins-openSUSE-13-2/KIWIMiniIsoPlugin.pm 2014-11-03 12:21:39.000000000 +0100 +++ new/kiwi/distribution/kiwi-instsource-plugins-openSUSE-13-2/KIWIMiniIsoPlugin.pm 2014-11-18 11:09:59.000000000 +0100 @@ -171,9 +171,9 @@ my $rootdir = dirname($rootfile); $this->logMsg("I", "removing files from <$rootdir>"); foreach my $file (glob("$rootdir/*")) { - if (-f $file && $file !~ m,/efi$,) { + if (-f $file && $file !~ m,/(efi|linux|initrd)$,) { $this->logMsg("I", "removing <$file>"); - unlink $file; + unlink $file; } } return $this; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi new/kiwi/kiwi --- old/kiwi/kiwi 2014-11-05 10:14:46.000000000 +0100 +++ new/kiwi/kiwi 2014-11-21 09:43:43.000000000 +0100 @@ -5,6 +5,9 @@ pushd $callpath &>/dev/null +if [ ! -d "metadata/KIWIAnalyse.tgz" ];then + tar -C metadata -czf metadata/KIWIAnalyse.tgz d3 +fi if [ ! -s ".revision" ];then ./.version > .revision fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/metadata/KIWIAnalyse.systems new/kiwi/metadata/KIWIAnalyse.systems --- old/kiwi/metadata/KIWIAnalyse.systems 2014-09-15 16:02:53.000000000 +0200 +++ new/kiwi/metadata/KIWIAnalyse.systems 2014-11-21 09:29:52.000000000 +0100 @@ -31,3 +31,4 @@ openSUSE-12.2=suse-12.2 openSUSE-12.3=suse-12.3 openSUSE-13.1=suse-13.1 +openSUSE-13.2=suse-13.2 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-10-26 10:15:13.000000000 +0100 +++ new/kiwi/modules/KIWIBoot.pm 2014-11-18 13:59:58.000000000 +0100 @@ -1191,7 +1191,7 @@ if ($needBiosP) { $pnr++; push @commands,"n","p:legacy",$pnr,".","+".$legacysize."M"; - $this->{partids}{biosgrub} = $pnr; + $this->{partids}{biosgrub} = $pnr; } #========================================== # setup Power PReP partition @@ -1201,7 +1201,7 @@ push @commands,"n","p:prep",$pnr,".","+".$prepsize."M"; push @commands,"t",$pnr,"41"; push @commands,"a",$pnr; - $this->{partids}{prep} = $pnr; + $this->{partids}{prep} = $pnr; } #========================================== # setup boot partition @@ -1440,8 +1440,8 @@ #========================================== # Install boot loader on disk #------------------------------------------ - my $bootdevice = $diskname; - if (! $this -> installBootLoader ($bootloader, $bootdevice)) { + my $diskdevice = $diskname; + if (! $this -> installBootLoader ($bootloader, $diskdevice, \%deviceMap)) { $this -> cleanStack (); return; } @@ -1616,12 +1616,12 @@ #------------------------------------------ $kiwi -> info ("Packing installation data..."); $tarname = $system; - $tarname =~ s/\.raw$/\.install\.tgz/; + $tarname =~ s/\.raw$/\.install\.tar\.xz/; foreach my $file ($md5name,$sysname,$irdname,$krnname,$appname) { push @packfiles, basename $file; } $status = KIWIQX::qxx ( - "tar -C $destdir -czf $tarname @packfiles" + "tar -C $destdir -cJf $tarname @packfiles" ); $result = $? >> 8; if ($result != 0) { @@ -2821,11 +2821,11 @@ #========================================== # Install boot loader on disk #------------------------------------------ - my $bootdevice = $diskname; + my $diskdevice = $diskname; if ($haveDiskDevice) { - $bootdevice = $this->{loop}; + $diskdevice = $this->{loop}; } - if (! $this->installBootLoader ($bootloader,$bootdevice)) { + if (! $this->installBootLoader ($bootloader,$diskdevice, \%deviceMap)) { $this -> cleanStack (); return; } @@ -5453,6 +5453,7 @@ my $this = shift; my $loader = shift; my $diskname = shift; + my $deviceMap= shift; my $kiwi = $this->{kiwi}; my $tmpdir = $this->{tmpdir}; my $chainload= $this->{chainload}; @@ -5463,7 +5464,6 @@ my $haveTree = $this->{haveTree}; my $locator = KIWILocator -> instance(); my $bootdev; - my $prepdev; my $result; my $status; my $grubtool; @@ -5472,26 +5472,10 @@ #========================================== # Setup boot device name #------------------------------------------ - my $boot_id = 1; - my $prep_id = 1; - if ($this->{partids}) { - if ($this->{partids}{prep}) { - $prep_id = $this->{partids}{prep}; - } - if ($this->{partids}{installboot}) { - $boot_id = $this->{partids}{installboot}; - } elsif ($this->{partids}{boot}) { - $boot_id = $this->{partids}{boot}; - } elsif ($this->{partids}{root}) { - $boot_id = $this->{partids}{root}; - } - } - if ((! $this->{bindloop}) && (-b $diskname)) { - $bootdev = $this -> __getPartBase ($diskname).$boot_id; - $prepdev = $this -> __getPartBase ($diskname).$prep_id; + if ($deviceMap->{boot}) { + $bootdev = $deviceMap->{boot}; } else { - $bootdev = $this->{bindloop}.$boot_id; - $prepdev = $this->{bindloop}.$prep_id; + $bootdev = $deviceMap->{root}; } #========================================== # Grub2 @@ -5532,7 +5516,7 @@ #------------------------------------------ my $stages = "/mnt/boot/grub2/$grubarch"; if (! KIWIGlobals -> instance() -> mount ($bootdev, '/mnt')) { - $kiwi -> error ("Couldn't mount boot partition: $status"); + $kiwi -> error ("Couldn't mount boot partition: $bootdev"); $kiwi -> failed (); return; } @@ -5579,7 +5563,7 @@ } } elsif (-e "$stages/core.elf") { # architectures: ppc64le - $loaderTarget = $prepdev; + $loaderTarget = $deviceMap->{prep}; $grubtoolopts = "--grub-mkdevicemap=$dmfile -v "; $grubtoolopts.= "-d /mnt/usr/lib/grub2/$grubarch "; $grubtoolopts.= "--root-directory=/mnt --force --no-nvram "; @@ -5663,7 +5647,7 @@ #========================================== # re-init bootid, legacy grub starts at 0 #------------------------------------------ - $boot_id = 0; + my $boot_id = 0; if ($this->{partids}) { if ($this->{partids}{boot}) { $boot_id = $this->{partids}{boot} - 1; @@ -6160,7 +6144,6 @@ $this->{cleanupStack} = \@cStack; $disk =~ s/dev\///; $part = "/dev/mapper".$disk."p"; - $this->{bindloop} = $part; return $this; } @@ -6564,7 +6547,7 @@ # wait for udev to finish device creation KIWIQX::qxx ("udevadm settle --timeout=30 2>&1"); for my $part - (qw(root readonly readwrite boot jump installroot installboot) + (qw(root readonly readwrite boot jump installroot installboot prep) ) { if ($this->{partids}{$part}) { $result{$part} = $this -> __getPartDevice ( @@ -6623,7 +6606,7 @@ $result{$part} = "/dev/$group/".$this->{partids}{$part."_lv"}; } } - for my $part (qw(boot jump)) { + for my $part (qw(boot jump prep)) { if ($this->{partids}{$part}) { $result{$part} = $this -> __getPartDevice ( $device,$this->{partids}{$part} @@ -7567,59 +7550,6 @@ } #========================================== -# __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 = FileHandle -> new(); - 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; -} - -#========================================== -# __getPartBase -#------------------------------------------ -sub __getPartBase { - # ... - # find the correct partition device for a - # given disk device by checking for the first - # two partitions - # --- - my $this = shift; - my $disk = shift; - my $devcopy = $disk; - my $devbase = basename $devcopy; - my @checklist = ( - "/dev/mapper/".$devbase."p1", - "/dev/mapper/".$devbase."p2", - "/dev/".$devbase."p1", - "/dev/".$devbase."p2", - "/dev/".$devbase."1", - "/dev/".$devbase."2" - ); - foreach my $device (@checklist) { - if (-b $device) { - chop $device; - return $device; - } - } - return; -} - -#========================================== # __getPartDevice #------------------------------------------ sub __getPartDevice { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIConfig.sh new/kiwi/modules/KIWIConfig.sh --- old/kiwi/modules/KIWIConfig.sh 2014-09-15 16:02:54.000000000 +0200 +++ new/kiwi/modules/KIWIConfig.sh 2014-11-18 11:11:26.000000000 +0100 @@ -1579,20 +1579,20 @@ fi done done - for mod in `find $stripdir -name "*.ko"`;do - d=`/usr/bin/basename $mod` - i=`/sbin/modprobe \ + for mod in $(find $stripdir -name "*.ko");do + d=$(/usr/bin/basename $mod) + i=$(/sbin/modprobe \ --set-version $VERSION \ --ignore-install \ --show-depends \ - ${d%.ko} | sed -ne 's:.*insmod /\?::p'` + ${d%.ko} | sed -ne 's:.*insmod /\?::p') for d in $i; do case "$d" in *=*) ;; *) - if ! test -f $stripdir/$d ; then + if [ -f $d ] && [ ! -f $stripdir/$d ]; then echo "Fixing kernel module Dependency: $d" - mkdir -vp `/usr/bin/dirname $stripdir/$d` + mkdir -vp $(/usr/bin/dirname $stripdir/$d) cp -flav $d $stripdir/$d fi ;; 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-11-05 10:19:23.000000000 +0100 +++ new/kiwi/modules/KIWIGlobals.pm 2014-11-21 10:37:35.000000000 +0100 @@ -1835,7 +1835,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.01.18"; + $data{Version} = "7.02.6"; $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/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2014-10-30 11:59:29.000000000 +0100 +++ new/kiwi/modules/KIWILinuxRC.sh 2014-11-17 16:10:46.000000000 +0100 @@ -9383,16 +9383,16 @@ pxeCheckServer if [ -z "$SERVER" ];then if [ ! -z "$ip" ];then - Echo "Found server in PXE ip kernel cmdline" + Echo "Found PXE download server IP in kernel cmdline" SERVER=$(echo $ip | awk -F ':' '{ print $2 }') else - Echo "No server configured, trying: tftp.$DOMAIN" + Echo "No PXE download server configured, trying: tftp.$DOMAIN" SERVER=tftp.$DOMAIN fi fi - Echo "Checking Server name: $SERVER" + Echo "Checking connectivity of PXE download server: $SERVER" if ! ping -c 1 -w 30 $SERVER >/dev/null 2>&1;then - Echo "Server: $SERVER not found" + Echo "PXE download server: $SERVER not found" if [ -z "$SERVERTYPE" ] || [ "$SERVERTYPE" = "tftp" ]; then if [ ! -z "$DHCPSIADDR" ];then Echo "Using: $DHCPSIADDR from DHCP info" @@ -9405,7 +9405,7 @@ SERVER=$SERVERID else systemException \ - "Can't assign SERVER IP/name... fatal !" \ + "Can't find responding PXE download server... fatal !" \ "reboot" fi fi 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-09-15 16:02:54.000000000 +0200 +++ new/kiwi/modules/KIWIManager.pm 2014-11-13 10:27:39.000000000 +0100 @@ -585,18 +585,26 @@ my $kiwi = $this->{kiwi}; my @kchroot = @{$this->{kchroot}}; my $root = $this->{root}; + my $locator = $this->{locator}; my $data; my $code; #========================================== # check for rpm binary #------------------------------------------ - if (! -e "$root/bin/rpm") { + my $rpm = $locator -> getExecPath('rpm'); + my $rpmdb = $locator -> getExecPath('rpmdb'); + my $dbdump = $locator -> getExecPath('db_dump'); + my $dbload = $locator -> getExecPath('db45_load'); + if (! $rpm) { return $this; } + if (! $rpmdb) { + $rpmdb = $rpm; + } #========================================== # try to initialize rpm database #------------------------------------------ - $data = KIWIQX::qxx ("@kchroot /bin/rpm --initdb &>/dev/null"); + $data = KIWIQX::qxx ("@kchroot $rpmdb --initdb &>/dev/null"); $code = $? >> 8; #========================================== # try to rebuild DB on failed init @@ -605,23 +613,23 @@ $kiwi -> info ('Rebuild RPM package db...'); my $nameIndex = "$root/var/lib/rpm/Name"; my $packIndex = "$root/var/lib/rpm/Packages"; - if (! -x "/usr/bin/db_dump") { + if (! $dbdump) { $kiwi -> failed (); $kiwi -> error ("db_dump tool required for rpm db rebuild\n"); return; } - if (! -x "/usr/bin/db45_load") { + if (! $dbload) { $kiwi -> failed (); $kiwi -> error ("db45_load tool required for rpm db rebuild\n"); return; } KIWIQX::qxx ('mv '.$packIndex.' '.$packIndex.'.bak'); KIWIQX::qxx ('mv '.$nameIndex.' '.$nameIndex.'.bak'); - KIWIQX::qxx ('db_dump '.$packIndex.'.bak | db45_load '.$packIndex); - KIWIQX::qxx ('db_dump '.$nameIndex.'.bak | db45_load '.$nameIndex); + KIWIQX::qxx ($dbdump.' '.$packIndex.'.bak | '.$dbload.' '.$packIndex); + KIWIQX::qxx ($dbdump.' '.$nameIndex.'.bak | '.$dbload.' '.$nameIndex); KIWIQX::qxx ('rm -f '.$packIndex.'.bak'); KIWIQX::qxx ('rm -f '.$nameIndex.'.bak'); - $data = KIWIQX::qxx ("@kchroot /bin/rpm --rebuilddb 2>&1"); + $data = KIWIQX::qxx ("@kchroot $rpmdb --rebuilddb 2>&1"); $code = $? >> 8; if ($code != 0) { $kiwi -> failed (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIResult.pm new/kiwi/modules/KIWIResult.pm --- old/kiwi/modules/KIWIResult.pm 2014-10-06 11:13:34.000000000 +0200 +++ new/kiwi/modules/KIWIResult.pm 2014-11-13 10:27:39.000000000 +0100 @@ -389,7 +389,7 @@ } elsif ($buildinfo->exists('main','install.stick')) { return $this -> __bundleExtension ('install.raw'); } elsif ($buildinfo->exists('main','install.pxe')) { - return $this -> __bundleExtension ('install.tgz'); + return $this -> __bundleExtension ('install.tar.xz'); } #========================================== # handle formats @@ -398,6 +398,12 @@ if (! $format) { return $this -> __bundleExtension ('raw'); } + if ($format eq 'vhd-fixed') { + # inconsistency between format specified in schema and + # extension used in the result file. More clean fix would + # be a schema change plus xsl stylesheet + $format = 'vhdfixed'; + } if ($format eq 'gce') { my @archives = glob ("$source/*gce-*.tar.gz"); if (! @archives) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-dump new/kiwi/system/boot/armv7l/oemboot/suse-dump --- old/kiwi/system/boot/armv7l/oemboot/suse-dump 2014-09-15 16:02:54.000000000 +0200 +++ new/kiwi/system/boot/armv7l/oemboot/suse-dump 2014-11-17 16:16:15.000000000 +0100 @@ -36,27 +36,7 @@ #====================================== # find TFTP server from lease file #-------------------------------------- - pxeCheckServer - if [ -z $SERVER ];then - SERVER=tftp.$DOMAIN - fi - Echo "Checking Server name: $SERVER" - if ! ping -c 1 $SERVER >/dev/null 2>&1;then - Echo "Server: $SERVER not found" - if [ -z "$SERVERTYPE" ] || [ "$SERVERTYPE" = "tftp" ]; then - if [ ! -z "$DHCPSIADDR" ];then - Echo "Using: $DHCPSIADDR from dhcpcd-info" - SERVER=$DHCPSIADDR - elif [ ! -z "$DHCPSID" ];then - Echo "Using: $DHCPSID from dhcpcd-info" - SERVER=$DHCPSID - else - systemException \ - "Can't assign SERVER IP/name... fatal !" \ - "reboot" - fi - fi - fi + pxeSetupDownloadServer #====================================== # setup server name and blocksize #-------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-12.3/config.xml new/kiwi/system/boot/ix86/netboot/suse-12.3/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-12.3/config.xml 2014-11-03 12:47:04.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-12.3/config.xml 2014-11-17 12:37:18.000000000 +0100 @@ -27,6 +27,7 @@ </drivers> <drivers profiles="default,xen"> <file name="crypto/*"/> + <file name="drivers/virtio/*"/> <file name="drivers/acpi/dock.ko"/> <file name="drivers/ata/*"/> <file name="drivers/block/aoe/aoe.ko"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-13.1/config.xml new/kiwi/system/boot/ix86/netboot/suse-13.1/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-13.1/config.xml 2014-11-03 12:47:02.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-13.1/config.xml 2014-11-17 12:36:21.000000000 +0100 @@ -27,6 +27,7 @@ </drivers> <drivers profiles="default,xen"> <file name="crypto/*"/> + <file name="drivers/virtio/*"/> <file name="drivers/acpi/dock.ko"/> <file name="drivers/ata/*"/> <file name="drivers/block/aoe/aoe.ko"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-13.2/config.xml new/kiwi/system/boot/ix86/netboot/suse-13.2/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-13.2/config.xml 2014-11-03 12:47:03.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-13.2/config.xml 2014-11-17 12:36:28.000000000 +0100 @@ -27,6 +27,7 @@ </drivers> <drivers profiles="default,xen"> <file name="crypto/*"/> + <file name="drivers/virtio/*"/> <file name="drivers/acpi/dock.ko"/> <file name="drivers/ata/*"/> <file name="drivers/block/aoe/aoe.ko"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml 2014-11-03 12:47:01.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml 2014-11-17 12:36:53.000000000 +0100 @@ -27,6 +27,7 @@ </drivers> <drivers profiles="default,xen"> <file name="crypto/*"/> + <file name="drivers/virtio/*"/> <file name="drivers/usb/core/usbcore.ko"/> <file name="drivers/usb/host/*"/> <file name="drivers/usb/storage/usb-storage.ko"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLED12/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLED12/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-SLED12/config.xml 2014-11-03 12:47:03.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-SLED12/config.xml 2014-11-17 12:36:47.000000000 +0100 @@ -26,6 +26,7 @@ </drivers> <drivers profiles="default,xen"> <file name="crypto/*"/> + <file name="drivers/virtio/*"/> <file name="drivers/acpi/dock.ko"/> <file name="drivers/ata/*"/> <file name="drivers/block/aoe/aoe.ko"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml 2014-11-03 12:47:03.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml 2014-11-17 12:37:00.000000000 +0100 @@ -27,6 +27,7 @@ </drivers> <drivers profiles="default,xen"> <file name="crypto/*"/> + <file name="drivers/virtio/*"/> <file name="drivers/usb/core/usbcore.ko"/> <file name="drivers/usb/host/*"/> <file name="drivers/usb/storage/usb-storage.ko"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLES12/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLES12/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-SLES12/config.xml 2014-11-03 12:47:02.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-SLES12/config.xml 2014-11-17 12:36:39.000000000 +0100 @@ -26,6 +26,7 @@ </drivers> <drivers profiles="default,xen"> <file name="crypto/*"/> + <file name="drivers/virtio/*"/> <file name="drivers/acpi/dock.ko"/> <file name="drivers/ata/*"/> <file name="drivers/block/aoe/aoe.ko"/> 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-09-15 16:02:55.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/rhel-dump 2014-11-17 16:15:49.000000000 +0100 @@ -36,27 +36,7 @@ #====================================== # find TFTP server from lease file #-------------------------------------- - pxeCheckServer - if [ -z $SERVER ];then - SERVER=tftp.$DOMAIN - fi - Echo "Checking Server name: $SERVER" - if ! ping -c 1 $SERVER >/dev/null 2>&1;then - Echo "Server: $SERVER not found" - if [ -z "$SERVERTYPE" ] || [ "$SERVERTYPE" = "tftp" ]; then - if [ ! -z "$DHCPSIADDR" ];then - Echo "Using: $DHCPSIADDR from dhcpcd-info" - SERVER=$DHCPSIADDR - elif [ ! -z "$DHCPSID" ];then - Echo "Using: $DHCPSID from dhcpcd-info" - SERVER=$DHCPSID - else - systemException \ - "Can't assign SERVER IP/name... fatal !" \ - "reboot" - fi - fi - fi + pxeSetupDownloadServer #====================================== # setup server name and blocksize #-------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-dump new/kiwi/system/boot/ix86/oemboot/suse-dump --- old/kiwi/system/boot/ix86/oemboot/suse-dump 2014-09-15 16:02:55.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-dump 2014-11-17 16:13:04.000000000 +0100 @@ -36,27 +36,7 @@ #====================================== # find TFTP server from lease file #-------------------------------------- - pxeCheckServer - if [ -z $SERVER ];then - SERVER=tftp.$DOMAIN - fi - Echo "Checking Server name: $SERVER" - if ! ping -c 1 $SERVER >/dev/null 2>&1;then - Echo "Server: $SERVER not found" - if [ -z "$SERVERTYPE" ] || [ "$SERVERTYPE" = "tftp" ]; then - if [ ! -z "$DHCPSIADDR" ];then - Echo "Using: $DHCPSIADDR from dhcpcd-info" - SERVER=$DHCPSIADDR - elif [ ! -z "$DHCPSID" ];then - Echo "Using: $DHCPSID from dhcpcd-info" - SERVER=$DHCPSID - else - systemException \ - "Can't assign SERVER IP/name... fatal !" \ - "reboot" - fi - fi - fi + pxeSetupDownloadServer #====================================== # setup server name and blocksize #-------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-dump new/kiwi/system/boot/ppc/oemboot/suse-dump --- old/kiwi/system/boot/ppc/oemboot/suse-dump 2014-09-15 16:02:55.000000000 +0200 +++ new/kiwi/system/boot/ppc/oemboot/suse-dump 2014-11-17 16:16:05.000000000 +0100 @@ -36,27 +36,7 @@ #====================================== # find TFTP server from lease file #-------------------------------------- - pxeCheckServer - if [ -z $SERVER ];then - SERVER=tftp.$DOMAIN - fi - Echo "Checking Server name: $SERVER" - if ! ping -c 1 $SERVER >/dev/null 2>&1;then - Echo "Server: $SERVER not found" - if [ -z "$SERVERTYPE" ] || [ "$SERVERTYPE" = "tftp" ]; then - if [ ! -z "$DHCPSIADDR" ];then - Echo "Using: $DHCPSIADDR from dhcpcd-info" - SERVER=$DHCPSIADDR - elif [ ! -z "$DHCPSID" ];then - Echo "Using: $DHCPSID from dhcpcd-info" - SERVER=$DHCPSID - else - systemException \ - "Can't assign SERVER IP/name... fatal !" \ - "reboot" - fi - fi - fi + pxeSetupDownloadServer #====================================== # setup server name and blocksize #-------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-dump new/kiwi/system/boot/s390/oemboot/suse-dump --- old/kiwi/system/boot/s390/oemboot/suse-dump 2014-09-15 16:02:55.000000000 +0200 +++ new/kiwi/system/boot/s390/oemboot/suse-dump 2014-11-17 16:16:10.000000000 +0100 @@ -36,27 +36,7 @@ #====================================== # find TFTP server from lease file #-------------------------------------- - pxeCheckServer - if [ -z $SERVER ];then - SERVER=tftp.$DOMAIN - fi - Echo "Checking Server name: $SERVER" - if ! ping -c 1 $SERVER >/dev/null 2>&1;then - Echo "Server: $SERVER not found" - if [ -z "$SERVERTYPE" ] || [ "$SERVERTYPE" = "tftp" ]; then - if [ ! -z "$DHCPSIADDR" ];then - Echo "Using: $DHCPSIADDR from dhcpcd-info" - SERVER=$DHCPSIADDR - elif [ ! -z "$DHCPSID" ];then - Echo "Using: $DHCPSID from dhcpcd-info" - SERVER=$DHCPSID - else - systemException \ - "Can't assign SERVER IP/name... fatal !" \ - "reboot" - fi - fi - fi + pxeSetupDownloadServer #====================================== # setup server name and blocksize #-------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-13.2-JeOS/config.xml new/kiwi/template/ix86/suse-13.2-JeOS/config.xml --- old/kiwi/template/ix86/suse-13.2-JeOS/config.xml 2014-11-03 12:47:00.000000000 +0100 +++ new/kiwi/template/ix86/suse-13.2-JeOS/config.xml 2014-11-20 16:43:20.000000000 +0100 @@ -68,7 +68,7 @@ <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/> </users> <repository type="yast2"> - <source path="obs://openSUSE:Factory/snapshot"/> + <source path="obs://13.2/repo/oss"/> </repository> <packages type="image"> <!-- @@ -99,6 +99,9 @@ <package name="kiwi-desc-vmxboot"/> <package name="kiwi-desc-netboot"/> <package name="openssh"/> + <package name="iproute2"/> + <package name="less"/> + <package name="bash-completion"/> </packages> <packages type="iso"> <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-13.2-JeOS/root/etc/sysconfig/network/ifcfg-lan0 new/kiwi/template/ix86/suse-13.2-JeOS/root/etc/sysconfig/network/ifcfg-lan0 --- old/kiwi/template/ix86/suse-13.2-JeOS/root/etc/sysconfig/network/ifcfg-lan0 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/template/ix86/suse-13.2-JeOS/root/etc/sysconfig/network/ifcfg-lan0 2014-11-12 09:21:59.000000000 +0100 @@ -0,0 +1,4 @@ +BOOTPROTO='dhcp' +MTU='' +REMOTE_IPADDR='' +STARTMODE='onboot' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-13.2-JeOS/root/etc/udev/rules.d/70-persistent-net.rules new/kiwi/template/ix86/suse-13.2-JeOS/root/etc/udev/rules.d/70-persistent-net.rules --- old/kiwi/template/ix86/suse-13.2-JeOS/root/etc/udev/rules.d/70-persistent-net.rules 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/template/ix86/suse-13.2-JeOS/root/etc/udev/rules.d/70-persistent-net.rules 2014-11-12 09:21:59.000000000 +0100 @@ -0,0 +1 @@ +SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="?*", ATTR{dev_id}=="0x0", ATTR{type}=="1", KERNEL=="?*", NAME="lan0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/jenkins/prepare.sh new/kiwi/tests/jenkins/prepare.sh --- old/kiwi/tests/jenkins/prepare.sh 2014-09-15 16:02:55.000000000 +0200 +++ new/kiwi/tests/jenkins/prepare.sh 2014-11-12 09:21:59.000000000 +0100 @@ -34,7 +34,7 @@ # install required packages spec=/home/jenkins/kiwi/kiwi/rpm/kiwi.spec -packages="grub grub2 genisoimage cdrkit-cdrtools-compat squashfs osc yum trang" +packages="grub grub2 genisoimage cdrkit-cdrtools-compat squashfs osc yum trang dosfstools" if ! zypper -n install --no-recommends $packages;then exit 1 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/lib/Common/ktLog.pm new/kiwi/tests/unit/lib/Common/ktLog.pm --- old/kiwi/tests/unit/lib/Common/ktLog.pm 2014-09-15 16:02:56.000000000 +0200 +++ new/kiwi/tests/unit/lib/Common/ktLog.pm 2014-11-13 10:33:37.000000000 +0100 @@ -459,17 +459,6 @@ } #========================================== -# storeXML -#------------------------------------------ -sub storeXML { - # ... - # Dummy function, storing the XML has nothing really to do with logging - # but that's a discussion for another day. - my $this = shift; - return $this; -} - -#========================================== # warning #------------------------------------------ sub warning { @@ -483,17 +472,6 @@ } #========================================== -# writeXMLDiff -#------------------------------------------ -sub writeXMLDiff { - # ... - # Dummy implementation to mimick regular KIWILog object - # --- - my $this = shift; - return $this; -} - -#========================================== # doNorm #------------------------------------------ sub doNorm { @@ -642,5 +620,12 @@ $this -> {skipped} = 0; return $this; } +1; +## no critic (Multiple "package" declarations) +package KIWILog; +sub instance { + return Common::ktLog -> instance(); +} 1; +## use critic -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
