Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2013-02-23 08:08:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2013-02-21 10:38:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2013-02-23 08:08:24.000000000 +0100 @@ -1,0 +2,41 @@ +Fri Feb 22 14:58:47 CET 2013 - [email protected] + +- v5.04.53 released + +------------------------------------------------------------------- +Fri Feb 22 14:53:38 CET 2013 - [email protected] + +- fixed cleanMount function to work if $root dir can't be + created. It might happen that at that point kiwi already + mounted some stuff which can be released via cleanMount + but cleanMount returned if no $root location was created. + +------------------------------------------------------------------- +Fri Feb 22 14:52:28 CET 2013 - [email protected] + +- fixed creation of KIWICache object, was missing the xml pointer + +------------------------------------------------------------------- +Thu Feb 21 15:50:51 CET 2013 - [email protected] + +- v5.04.52 released + +------------------------------------------------------------------- +Thu Feb 21 15:41:21 CET 2013 - [email protected] + +- make sure the openSUSE 12.3 JeOS set the correct console + based systemd target and fix some typos in config.sh too + +------------------------------------------------------------------- +Thu Feb 21 15:40:07 CET 2013 - [email protected] + +- fixed default systemd target setup, baseSetRunlevel + function a systemd target is not a number but something + like multi-user.target or graphical.target + +------------------------------------------------------------------- +Thu Feb 21 10:30:28 CET 2013 - [email protected] + +- v5.04.51 released + +------------------------------------------------------------------- @@ -4,0 +46,5 @@ + +------------------------------------------------------------------- +Wed Feb 20 17:06:29 CET 2013 - [email protected] + +- fix iso creation for non-EFI medias again ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.1OsvOo/_old 2013-02-23 08:08:29.000000000 +0100 +++ /var/tmp/diff_new_pack.1OsvOo/_new 2013-02-23 08:08:29.000000000 +0100 @@ -26,7 +26,7 @@ Summary: openSUSE - KIWI Image System License: GPL-2.0 Group: System/Management -Version: 5.04.50 +Version: 5.04.53 Release: 0 # requirements to build packages BuildRequires: e2fsprogs ++++++ 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.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2013-02-07 08:55:37.000000000 +0100 +++ new/kiwi/.revision 2013-02-21 15:51:36.000000000 +0100 @@ -1 +1 @@ -c98440d365e2f768d35028d60277cf0124354c2c +4111e7b900c8cdba3be23213c31ced08931c297b 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 2013-02-20 15:28:05.000000000 +0100 +++ new/kiwi/modules/KIWICollect.pm 2013-02-21 15:51:44.000000000 +0100 @@ -767,9 +767,14 @@ $this->logMsg('W', $msg); } else { - if (grep {"x86_64" eq $_} $this->{m_archlist}->headList()) { - $this->logMsg('I', "Add EFI Live setup"); - $iso -> addBootEFILive(1); + my %type; + %type = %{$this->{m_xml}->getImageTypeAndAttributes_legacy()}; + my $firmware = $type{firmware}; + if ($firmware eq "efi" || $firmware eq "uefi") { + if (grep {"x86_64" eq $_} $this->{m_archlist}->headList()) { + $this->logMsg('I', "Add EFI Live setup"); + $iso -> addBootEFILive(1); + } } $this->logMsg('I', "Boot methods called successfully"); $is_bootable = 1; 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 2013-02-18 08:55:21.000000000 +0100 +++ new/kiwi/modules/KIWIConfig.sh 2013-02-21 15:51:44.000000000 +0100 @@ -1627,7 +1627,8 @@ # the specified value # ---- local RUNLEVEL=$1 - local target=/usr/lib/systemd/system/runlevel$RUNLEVEL.target + local target_console=/usr/lib/systemd/system/multi-user.target + local target_graphics=/usr/lib/systemd/system/graphical.target if [ ! -f $target ];then target=/lib/systemd/system/runlevel$RUNLEVEL.target fi @@ -1636,7 +1637,11 @@ sed -i "s/id:[0123456]:initdefault:/id:$RUNLEVEL:initdefault:/" \ /etc/inittab if test -d /etc/systemd/system; then - ln -sf $target /etc/systemd/system/default.target + if [ $RUNLEVEL -lt 5 ];then + ln -sf $target_console /etc/systemd/system/default.target + else + ln -sf $target_graphics /etc/systemd/system/default.target + fi 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 2013-02-20 17:07:36.000000000 +0100 +++ new/kiwi/modules/KIWIGlobals.pm 2013-02-22 15:07:56.000000000 +0100 @@ -931,7 +931,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "5.04.50"; + $data{Version} = "5.04.53"; $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/KIWIImageCreator.pm new/kiwi/modules/KIWIImageCreator.pm --- old/kiwi/modules/KIWIImageCreator.pm 2013-02-06 22:22:37.000000000 +0100 +++ new/kiwi/modules/KIWIImageCreator.pm 2013-02-22 15:07:56.000000000 +0100 @@ -1187,7 +1187,7 @@ return; } my $icache = KIWICache -> new( - $this->{cacheDir},$this->{gdata}->{BasePath}, + $xml,$this->{cacheDir},$this->{gdata}->{BasePath}, $this->{buildProfiles},$configDir,$cmdL ); if (! $icache) { 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 2013-02-06 22:22:37.000000000 +0100 +++ new/kiwi/modules/KIWIRoot.pm 2013-02-22 15:07:56.000000000 +0100 @@ -236,8 +236,9 @@ #========================================== # Check for overlay structure #------------------------------------------ - $this->{origtree}= $root; - $this->{overlay} = KIWIOverlay -> new ($root,$cacheRoot); + $this->{root} = $root; + $this->{origtree} = $root; + $this->{overlay} = KIWIOverlay -> new ($root,$cacheRoot); if (! $this->{overlay}) { $this -> cleanMount(); return; @@ -247,6 +248,7 @@ $this -> cleanMount(); return; } + $this->{root} = $root; #========================================== # Mark new root directory as broken #------------------------------------------ @@ -310,7 +312,6 @@ #========================================== # Store object data #------------------------------------------ - $this->{root} = $root; $this->{manager} = $manager; $this->{cmdL} = $cmdL; return $this; @@ -1451,12 +1452,12 @@ if (! defined $this->{mountList}) { return $this; } - if (! defined $root) { - return $this; - } my @mountList = @{$this->{mountList}}; my $baseSystem = $this->{baseSystem}; - my $prefix = $root."/".$baseSystem; + my $prefix; + if (($root) && (-d $root)) { + $prefix = $root."/".$baseSystem; + } my @newList= (); foreach my $item (reverse @mountList) { if (defined $expr) { @@ -1479,7 +1480,7 @@ $kiwi -> done(); } } - if ($item =~ /^$prefix/) { + if (($prefix) && ($item =~ /^$prefix/)) { qxx ("rmdir -p \"$item\" 2>&1"); } if ($item =~ /^\/tmp\/kiwimount/) { @@ -1487,7 +1488,7 @@ } } - if (-d $prefix) { + if (($prefix) && (-d $prefix)) { rmdir $prefix; } if (defined $this->{overlay}) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-12.3-JeOS/config.sh new/kiwi/template/ix86/suse-12.3-JeOS/config.sh --- old/kiwi/template/ix86/suse-12.3-JeOS/config.sh 2013-02-06 22:22:37.000000000 +0100 +++ new/kiwi/template/ix86/suse-12.3-JeOS/config.sh 2013-02-21 15:51:44.000000000 +0100 @@ -37,9 +37,9 @@ suseInsertService sshd #====================================== -# Activate services +# Setup default target, multi-user #-------------------------------------- -systemctl enable console-setup.service +baseSetRunlevel 3 #========================================== # remove package docs @@ -60,14 +60,14 @@ suseConfig #====================================== -# Add 11.1 repo +# Add 12.3 repo #-------------------------------------- baseRepo="http://download.opensuse.org/distribution/12.3/repo/oss"; baseName="suse-12.3" zypper ar $baseRepo $baseName #====================================== -# Remove unneeded packages +# Remove yast packages #-------------------------------------- rpm -qa | grep yast | xargs rpm -e --nodeps -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
