Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory checked in
at 2013-03-01 10:48:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi (Old)
and /work/SRC/openSUSE:Factory/.kiwi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi", Maintainer is "m...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2013-03-01
07:23:33.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2013-03-01
10:48:44.000000000 +0100
@@ -1,0 +2,10 @@
+Fri Mar 1 09:30:20 CET 2013 - m...@suse.de
+
+- v5.04.57 released
+
+-------------------------------------------------------------------
+Fri Mar 1 09:29:29 CET 2013 - m...@suse.de
+
+- fixed grub2 setup for older distros which packages into lib/grub2-efi
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.1gkQKr/_old 2013-03-01 10:48:47.000000000 +0100
+++ /var/tmp/diff_new_pack.1gkQKr/_new 2013-03-01 10:48:47.000000000 +0100
@@ -26,7 +26,7 @@
Summary: openSUSE - KIWI Image System
License: GPL-2.0
Group: System/Management
-Version: 5.04.56
+Version: 5.04.57
Release: 0
# requirements to build packages
BuildRequires: e2fsprogs
++++++ kiwi.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision 2013-02-21 15:51:36.000000000 +0100
+++ new/kiwi/.revision 2013-02-21 15:51:36.000000000 +0100
@@ -1 +1 @@
-a3bdf56b57a7da45ec3c0b1a317ad7a197a1efa4
+a4f7b2026b3f3a6dd0ae78b97c3419e160869720
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 2013-02-27 23:54:12.000000000 +0100
+++ new/kiwi/modules/KIWIBoot.pm 2013-03-01 09:57:40.000000000 +0100
@@ -3302,15 +3302,16 @@
my $unzip = "$zipper -cd $initrd 2>&1";
my %stages = ();
my $test = "cat $initrd";
- my $grub = 'grub2-efi';
+ my $grub_bios= 'grub2';
+ my $grub_efi = 'grub2';
my $lib = 'lib';
if ($zipped) {
$test = $unzip;
}
$status = qxx ("$test | cpio -it --quiet | grep -q
lib/grub2-efi 2>&1");
$result = $? >> 8;
- if ($result != 0) {
- $grub = 'grub2';
+ if ($result == 0) {
+ $grub_efi = 'grub2-efi';
}
$status = qxx ("$test | cpio -it --quiet | grep -q lib64/efi
2>&1");
$result = $? >> 8;
@@ -3327,12 +3328,12 @@
#==========================================
# Stage files
#------------------------------------------
- $stages{bios}{initrd} = "'usr/lib/$grub/$grubpc/*'";
- $stages{bios}{stageSRC} = "/usr/lib/$grub/$grubpc";
+ $stages{bios}{initrd} = "'usr/lib/$grub_bios/$grubpc/*'";
+ $stages{bios}{stageSRC} = "/usr/lib/$grub_bios/$grubpc";
$stages{bios}{stageDST} = "/boot/grub2/$grubpc";
if (($firmware eq "efi") || ($firmware eq "uefi")) {
- $stages{efi}{initrd} = "'usr/lib/$grub/$efipc/*'";
- $stages{efi}{stageSRC} = "/usr/lib/$grub/$efipc";
+ $stages{efi}{initrd} = "'usr/lib/$grub_efi/$efipc/*'";
+ $stages{efi}{stageSRC} = "/usr/lib/$grub_efi/$efipc";
$stages{efi}{stageDST} = "/boot/grub2-efi/$efipc";
}
if ($firmware eq "uefi") {
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-28 12:43:42.000000000 +0100
+++ new/kiwi/modules/KIWIGlobals.pm 2013-03-01 09:57:40.000000000 +0100
@@ -934,7 +934,7 @@
# Globals (generic)
#------------------------------------------
my %data;
- $data{Version} = "5.04.56";
+ $data{Version} = "5.04.57";
$data{Publisher} = "SUSE LINUX GmbH";
$data{Preparer} = "KIWI - http://opensuse.github.com/kiwi";;
$data{ConfigName} = "config.xml";
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
