Hello community,
here is the log from the commit of package perl-Bootloader for openSUSE:Factory checked in at 2012-04-02 10:30:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Bootloader (Old)
and /work/SRC/openSUSE:Factory/.perl-Bootloader.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Bootloader", Maintainer is "snwint@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Bootloader/perl-Bootloader.changes 2012-03-20 11:31:29.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.perl-Bootloader.new/perl-Bootloader.changes 2012-04-02 10:30:32.000000000 +0200
@@ -1,0 +2,14 @@
+Thu Mar 22 10:30:34 UTC 2012 - mchang@suse.com
+
+- grub2-kernel-commandline.patch: add kerenl parameters (detected
+ necessary and user specfied one during installation) to grub2's
+ config file.(bnc#752939)
+- 0.6.1
+
+-------------------------------------------------------------------
+Thu Mar 22 10:30:33 UTC 2012 - mchang@suse.com
+
+- grub2-efi-module.patch: add new grub2-efi module to support
+ booting on UEFI firmware.
+
+-------------------------------------------------------------------
Old:
----
grub2-skip-fs-probe-for-extended-partition.patch
perl-Bootloader-0.6.0.tar.bz2
New:
----
perl-Bootloader-0.6.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Bootloader.spec ++++++
--- /var/tmp/diff_new_pack.v3r2wR/_old 2012-04-02 10:30:33.000000000 +0200
+++ /var/tmp/diff_new_pack.v3r2wR/_new 2012-04-02 10:30:33.000000000 +0200
@@ -17,7 +17,7 @@
Name: perl-Bootloader
-Version: 0.6.0
+Version: 0.6.1
Release: 0
Requires: perl-base = %{perl_version}
Requires: e2fsprogs
@@ -29,7 +29,6 @@
Source1: update-bootloader
Source2: bootloader_entry
Source3: boot.readme
-Patch: grub2-skip-fs-probe-for-extended-partition.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
Conflicts: multipath-tools < 0.4.8-40.25.1
@@ -49,7 +48,6 @@
%prep
%setup -q
-%patch -p1
rm -rf perl-Bootloader-testsuite
mkdir -p lib
mv src lib/Bootloader
++++++ perl-Bootloader-0.6.0.tar.bz2 -> perl-Bootloader-0.6.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.6.0/perl-Bootloader.changes new/perl-Bootloader-0.6.1/perl-Bootloader.changes
--- old/perl-Bootloader-0.6.0/perl-Bootloader.changes 2012-03-05 15:23:55.000000000 +0100
+++ new/perl-Bootloader-0.6.1/perl-Bootloader.changes 2012-03-30 11:47:45.000000000 +0200
@@ -1,4 +1,38 @@
-------------------------------------------------------------------
+Thu Mar 22 10:30:34 UTC 2012 - mchang@suse.com
+
+- grub2-kernel-commandline.patch: add kerenl parameters (detected
+ necessary and user specfied one during installation) to grub2's
+ config file.(bnc#752939)
+- 0.6.1
+
+-------------------------------------------------------------------
+Thu Mar 22 10:30:33 UTC 2012 - mchang@suse.com
+
+- grub2-efi-module.patch: add new grub2-efi module to support
+ booting on UEFI firmware.
+
+-------------------------------------------------------------------
+Fri Mar 9 08:40:15 UTC 2012 - mchang@suse.com
+
+- grub2-skip-fs-probe-for-extended-partition.patch (bnc#750897)
+
+-------------------------------------------------------------------
+Mon Mar 5 15:38:44 CET 2012 - snwint@suse.de
+
+- integrate grub2 patch
+
+-------------------------------------------------------------------
+Wed Feb 15 09:16:19 UTC 2012 - mchang@suse.com
+
+- add-basic-grub2-module.patch : add basic grub2 support
+
+-------------------------------------------------------------------
+Wed Dec 14 11:06:44 UTC 2011 - coolo@suse.com
+
+- fix license to be in spdx.org format
+
+-------------------------------------------------------------------
Fri Oct 14 09:31:40 CEST 2011 - snwint@suse.de
- support more devices in fallback heuristics
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.6.0/perl-Bootloader.spec.in new/perl-Bootloader-0.6.1/perl-Bootloader.spec.in
--- old/perl-Bootloader-0.6.0/perl-Bootloader.spec.in 2012-03-05 15:23:55.000000000 +0100
+++ new/perl-Bootloader-0.6.1/perl-Bootloader.spec.in 2012-03-30 11:47:45.000000000 +0200
@@ -18,7 +18,7 @@
Recommends: perl-gettext
AutoReqProv: on
Group: System/Boot
-License: GNU General Public License (GPL)
+License: GPL-2.0+
Summary: Library for Configuring Boot Loaders
Source: perl-Bootloader-%{version}.tar.bz2
Source1: update-bootloader
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.6.0/src/Core/GRUB2.pm new/perl-Bootloader-0.6.1/src/Core/GRUB2.pm
--- old/perl-Bootloader-0.6.0/src/Core/GRUB2.pm 2012-03-05 15:23:55.000000000 +0100
+++ new/perl-Bootloader-0.6.1/src/Core/GRUB2.pm 2012-03-30 11:47:45.000000000 +0200
@@ -28,6 +28,10 @@
C<< $settings_ref = Bootloader::Core::GRUB2->GetSettings (); >>
+C<< $glob_info = Bootloader::Core::GRUB2->Global2Info (\@glob_lines, \@section_names); >>
+
+C<< $lines_ref = Bootloader::Core::GRUB2->Info2Global (\%section_info, \@section_names); >>
+
C<< $status = Bootloader::Core::GRUB2->SetSettings (\%settings); >>
C<< $status = Bootloader::Core::GRUB2->InitializeBootloader (); >>
@@ -312,7 +316,8 @@
my $self = shift;
return [ Bootloader::Path::Grub2_devicemap(),
- Bootloader::Path::Grub2_installdevice() ];
+ Bootloader::Path::Grub2_installdevice(),
+ Bootloader::Path::Grub2_defaultconf() ];
}
=item
@@ -359,8 +364,25 @@
$self->l_milestone ("GRUB2::Parselines: device_map: $unix <-> $fw.");
}
- my %glob;
- my $glob_ref = \%glob;
+ # and now proceed with /etc/default/grub
+ my @defaultconf = @{$files{Bootloader::Path::Grub2_defaultconf()} || []};
+ $self->l_milestone ("GRUB2::Parselines: input from default conf :\n'" .
+ join("'\n' ", @defaultconf) . "'");
+
+ # prefix commented config with '@' instread of '#'
+ # this is to new notation for "commented config" and
+ # need to process saparately
+ foreach my $conf (@defaultconf) {
+ if ($conf =~ m/^\s*#\s*GRUB_/) {
+ $conf =~ s/^\s*#/@/;
+ }
+ }
+
+ (my $glob_ref, my $sect_ref) = $self->ParseMenuFileLines (
+ "=",
+ [],
+ \@defaultconf
+ );
if (not exists $self->{"mountpoints"}{'/'})
{
@@ -561,10 +583,32 @@
# map CreateLines ()
sub CreateLines {
my $self = shift;
+ my $global = $self->{"global"};
# first create /etc/default/grub_installdevice
my $grub2_installdev = $self->CreateGrubInstalldevLines();
+ if (defined $global->{"__lines"}) {
+ foreach my $line (@{$global->{"__lines"}}) {
+ if (defined $line->{"value"} && $line->{"value"} eq "" ) {
+ $line->{"value"} = '""';
+ }
+ }
+ }
+
+ my $grub2_defaultconf = $self->PrepareMenuFileLines (
+ [],
+ $global,
+ "",
+ "="
+ );
+
+
+ foreach my $conf (@{$grub2_defaultconf}) {
+ if ($conf =~ m/^\s*@\s*GRUB_/) {
+ $conf =~ s/^\s*@/#/;
+ }
+ }
# TODO: as we know the grub2-install also create device map
# I skipped creating them by yast ..
@@ -578,11 +622,193 @@
## }
return {
Bootloader::Path::Grub2_installdevice() => $grub2_installdev,
+ Bootloader::Path::Grub2_defaultconf() => $grub2_defaultconf,
## Bootloader::Path::Grub2_devicemap() => \@device_map,
}
}
=item
+C<< $glob_info = $Bootloader::Core::GRUB2->Global2Info (\@glob_lines, \@section_names); >>
+
+Gets the general information from the global section of the menu file. This information
+usually means the default section, graphical menu, timeout etc. As argument it takes
+a reference to the list of hashes representing lines of the section, returns a reference
+to a hash containing the important information.
+
+=cut
+
+# map Global2Info (list