Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2015-01-25 21:14:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-01-21 21:56:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2015-01-25 21:14:11.000000000 +0100 @@ -1,0 +2,34 @@ +Fri Jan 23 13:57:50 CET 2015 - [email protected] + +- v7.02.22 released + +------------------------------------------------------------------- +Fri Jan 23 12:08:27 CET 2015 - [email protected] + +- Don't use /mnt as mount point in a kiwi process + + It could cause conflicts if the building system has /mnt + mounted for some reasons. Especially if the image target + directory is set to /mnt kiwi failed because it over + mounted its own results + +------------------------------------------------------------------- +Wed Jan 21 15:09:02 CET 2015 - [email protected] + +- Update SLE12 JeOS template for ppc + + The description was missing firmware packages and did + not use grub2 as the bootloader which is the default + for sles12 on ppc + +------------------------------------------------------------------- +Mon Jan 19 17:47:41 CET 2015 - [email protected] + +- Use symlink instead of copy for /etc/localtime. + +------------------------------------------------------------------- +Mon Jan 19 11:55:09 CET 2015 - [email protected] + +- Don't remove the docs from the RHEL JeOS templates + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.iHYIsC/_old 2015-01-25 21:14:12.000000000 +0100 +++ /var/tmp/diff_new_pack.iHYIsC/_new 2015-01-25 21:14:12.000000000 +0100 @@ -26,7 +26,7 @@ Group: System/Management Url: http://github.com/openSUSE/kiwi Name: kiwi -Version: 7.02.21 +Version: 7.02.22 Release: 0 Provides: kiwi-image:lxc Provides: kiwi-image:tbz ++++++ kiwi-docu.tar.bz2 ++++++ ++++++ 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-12-15 14:32:44.000000000 +0100 +++ new/kiwi/.revision 2014-12-15 14:32:44.000000000 +0100 @@ -1 +1 @@ -af91f28bc8b65a2c0f0070ddd1c2cd9176f7f2bf +63fc5aa7fd1971ecdbea7c1882b62550fc13f30d 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-12-15 14:32:45.000000000 +0100 +++ new/kiwi/modules/KIWIBoot.pm 2015-01-23 12:07:51.000000000 +0100 @@ -85,6 +85,7 @@ my $knlink; my $tmpdir; my $loopdir; + my $boot_mount_point; my $result; my $status; my $isxen; @@ -198,27 +199,38 @@ #========================================== # create tmp dir for operations #------------------------------------------ - $tmpdir = KIWIQX::qxx ("mktemp -qdt kiwiboot.XXXXXX"); chomp $tmpdir; + $tmpdir = KIWIQX::qxx ("mktemp -qdt kiwiboot.XXXXXX"); + chomp $tmpdir; $result = $? >> 8; if ($result != 0) { $kiwi -> error ("Couldn't create tmp dir: $tmpdir: $!"); $kiwi -> failed (); return; } - $loopdir = KIWIQX::qxx ("mktemp -qdt kiwiloop.XXXXXX"); chomp $loopdir; + $loopdir = KIWIQX::qxx ("mktemp -qdt kiwiloop.XXXXXX"); + chomp $loopdir; $result = $? >> 8; if ($result != 0) { $kiwi -> error ("Couldn't create tmp dir: $loopdir: $!"); $kiwi -> failed (); return; } + $boot_mount_point = KIWIQX::qxx ("mktemp -qdt kiwiboot.XXXXXX"); + chomp $boot_mount_point; + $result = $? >> 8; + if ($result != 0) { + $kiwi -> error ("Couldn't create tmp dir: $boot_mount_point: $!"); + $kiwi -> failed (); + return; + } #========================================== # Store object data (1) #------------------------------------------ $this->{cleanupStack} = []; $this->{tmpdir} = $tmpdir; $this->{loopdir} = $loopdir; - $this->{tmpdirs} = [ $tmpdir, $loopdir ]; + $this->{bootmountpoint} = $boot_mount_point; + $this->{tmpdirs} = [ $tmpdir, $loopdir, $boot_mount_point ]; $this->{haveTree} = $haveTree; $this->{kiwi} = $kiwi; $this->{bootsize} = 100; @@ -5467,6 +5479,7 @@ my $firmware = $this->{firmware}; my $system = $this->{system}; my $haveTree = $this->{haveTree}; + my $mount = $this->{bootmountpoint}; my $locator = KIWILocator -> instance(); my $bootdev; my $result; @@ -5519,12 +5532,12 @@ #========================================== # Mount boot partition #------------------------------------------ - my $stages = "/mnt/boot/grub2/$grubarch"; - if (! KIWIGlobals -> instance() -> mount ($bootdev, '/mnt')) { + if (! KIWIGlobals -> instance() -> mount ($bootdev, $mount)) { $kiwi -> error ("Couldn't mount boot partition: $bootdev"); $kiwi -> failed (); return; } + my $stages = $mount."/boot/grub2/$grubarch"; if (($firmware =~ /ec2|bios|ofw/) && (! -e "$stages/$grubimg")) { $kiwi -> error ("Mandatory grub2 modules not found"); $kiwi -> failed (); @@ -5570,8 +5583,8 @@ # architectures: ppc64le $loaderTarget = $deviceMap->{prep}; $grubtoolopts = "--grub-mkdevicemap=$dmfile -v "; - $grubtoolopts.= "-d /mnt/usr/lib/grub2/$grubarch "; - $grubtoolopts.= "--root-directory=/mnt --force --no-nvram "; + $grubtoolopts.= "-d $mount/usr/lib/grub2/$grubarch "; + $grubtoolopts.= "--root-directory=$mount --force --no-nvram "; $targetMessage= "On PReP partition"; } else { if (! -e "$stages/core.img") { @@ -5843,13 +5856,13 @@ $result = $? >> 8; } else { $kiwi -> info ("Installing extlinux on device: $bootdev"); - if (KIWIGlobals -> instance() -> mount ($bootdev, '/mnt')) { + if (KIWIGlobals -> instance() -> mount ($bootdev, $mount)) { $status = KIWIQX::qxx ( - "extlinux --install /mnt/boot/syslinux 2>&1" + "extlinux --install $mount/boot/syslinux 2>&1" ); $result = $? >> 8; } - $status = KIWIQX::qxx ("umount /mnt 2>&1"); + $status = KIWIQX::qxx ("umount $mount 2>&1"); } if ($result != 0) { $kiwi -> failed (); @@ -5901,14 +5914,13 @@ #========================================== # mount boot device... #------------------------------------------ - if (! KIWIGlobals -> instance() -> mount ($bootdev, '/mnt')) { + if (! KIWIGlobals -> instance() -> mount ($bootdev, $mount)) { $kiwi -> failed (); $kiwi -> error ("Can't mount boot partition: $status"); $kiwi -> failed (); $this -> cleanStack (); return; } - my $mount = "/mnt"; my $config = "$mount/boot/zipl.conf"; if (! $haveRealDevice) { #========================================== @@ -7354,6 +7366,17 @@ my $locator = KIWILocator -> instance(); my $result = 1; my $status; + my $tmpdir = KIWIQX::qxx ("mktemp -qdt kiwiresize.XXXXXX"); + chomp $tmpdir; + $result = $? >> 8; + if ($result != 0) { + $kiwi -> failed (); + $kiwi -> error ("Couldn't create tmp dir: $tmpdir: $!"); + $kiwi -> failed (); + $this -> luksClose(); + return; + } + push @{$this->{tmpdirs}}, $tmpdir; $kiwi->loginfo ("Resize Operation: Device: $mapper\n"); $kiwi->loginfo ("Resize Operation: Image Disk Type: $diskType\n"); $kiwi->loginfo ("Resize Operation: Filesystem Type: $fsType\n"); @@ -7393,12 +7416,12 @@ return; } if ($btrfs_tool) { - $btrfs_cmd = "$btrfs_tool filesystem resize max /mnt"; + $btrfs_cmd = "$btrfs_tool filesystem resize max $tmpdir"; } else { - $btrfs_cmd = "$btrfs_ctrl -r max /mnt"; + $btrfs_cmd = "$btrfs_ctrl -r max $tmpdir"; } $status = KIWIQX::qxx (" - mount $mapper /mnt && $btrfs_cmd; umount /mnt 2>&1" + mount $mapper $tmpdir && $btrfs_cmd; umount $tmpdir 2>&1" ); $result = $? >> 8; last SWITCH; @@ -7412,7 +7435,7 @@ return; } $status = KIWIQX::qxx (" - mount $mapper /mnt && $xfsGrow /mnt; umount /mnt 2>&1" + mount $mapper $tmpdir && $xfsGrow $tmpdir; umount $tmpdir 2>&1" ); $result = $? >> 8; last SWITCH; 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-12-15 14:32:45.000000000 +0100 +++ new/kiwi/modules/KIWIConfig.sh 2015-01-22 10:29:58.000000000 +0100 @@ -401,7 +401,7 @@ #-------------------------------------- if [ ! -z "$kiwi_timezone" ];then if [ -f /usr/share/zoneinfo/$kiwi_timezone ];then - cp /usr/share/zoneinfo/$kiwi_timezone /etc/localtime + ln -sf /usr/share/zoneinfo/$kiwi_timezone /etc/localtime baseUpdateSysConfig \ /etc/sysconfig/clock TIMEZONE $kiwi_timezone else 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 2015-01-16 11:35:43.000000000 +0100 +++ new/kiwi/modules/KIWIGlobals.pm 2015-01-23 13:57:46.000000000 +0100 @@ -1846,7 +1846,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.02.21"; + $data{Version} = "7.02.22"; $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/template/ix86/rhel-06.0-JeOS/config.sh new/kiwi/template/ix86/rhel-06.0-JeOS/config.sh --- old/kiwi/template/ix86/rhel-06.0-JeOS/config.sh 2014-12-15 14:32:50.000000000 +0100 +++ new/kiwi/template/ix86/rhel-06.0-JeOS/config.sh 2015-01-19 11:54:42.000000000 +0100 @@ -31,11 +31,6 @@ # TODO #====================================== -# Remove all documentation -#-------------------------------------- -baseStripDocs - -#====================================== # Umount kernel filesystems #-------------------------------------- baseCleanMount diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/rhel-07.0-JeOS/config.sh new/kiwi/template/ix86/rhel-07.0-JeOS/config.sh --- old/kiwi/template/ix86/rhel-07.0-JeOS/config.sh 2014-12-15 14:32:50.000000000 +0100 +++ new/kiwi/template/ix86/rhel-07.0-JeOS/config.sh 2015-01-19 11:54:52.000000000 +0100 @@ -21,11 +21,6 @@ #... #====================================== -# Remove all documentation -#-------------------------------------- -baseStripDocs - -#====================================== # Setup default target, multi-user #-------------------------------------- baseSetRunlevel 3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ppc/suse-SLE12-JeOS/config.xml new/kiwi/template/ppc/suse-SLE12-JeOS/config.xml --- old/kiwi/template/ppc/suse-SLE12-JeOS/config.xml 2014-12-15 14:32:50.000000000 +0100 +++ new/kiwi/template/ppc/suse-SLE12-JeOS/config.xml 2015-01-22 10:29:58.000000000 +0100 @@ -16,7 +16,7 @@ <keytable>us.map.gz</keytable> <timezone>Europe/Berlin</timezone> <hwclock>utc</hwclock> - <type image="vmx" filesystem="ext3" boot="vmxboot/suse-SLES12" bootloader="yaboot" primary="true"/> + <type image="vmx" filesystem="ext4" boot="vmxboot/suse-SLES12" bootloader="grub2" firmware="ofw" primary="true"/> </preferences> <users group="root"> <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/> @@ -25,18 +25,17 @@ <source path="obs://SUSE:SLE-12:GA/standard"/> </repository> <packages type="image"> - <namedCollection name="base"/> - <product name="SUSE_SLES"/> + <namedCollection name="Minimal"/> <package name="kernel-default"/> - <package name="ifplugd"/> <package name="iputils"/> <package name="vim"/> - <package name="syslog-ng"/> + <package name="grub2"/> + <package name="grub2-powerpc-ieee1275"/> + <package name="grub2-branding-SLE-12"/> </packages> <packages type="bootstrap"> <package name="filesystem"/> <package name="glibc-locale"/> <package name="cracklib-dict-full"/> - <package name="openssl-certs"/> </packages> </image> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
