Hello community,
here is the log from the commit of package yast2-bootloader for
openSUSE:Factory checked in at 2020-09-18 14:27:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old)
and /work/SRC/openSUSE:Factory/.yast2-bootloader.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-bootloader"
Fri Sep 18 14:27:58 2020 rev:295 rq:834684 version:4.3.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes
2020-08-14 13:10:12.405230258 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-bootloader.new.4249/yast2-bootloader.changes
2020-09-18 14:28:43.111309587 +0200
@@ -1,0 +2,9 @@
+Mon Sep 14 12:07:31 UTC 2020 - Josef Reidinger <[email protected]>
+- merge SLE15 SP2 changes:
+-- fix detection of present of efivars causing grub2-install
+ failures on some arm boards (bsc#1172114)
+-- add workaround for ARM to make GRUB2 works for
+ every device. It can potentially break multi-boot (bsc#1167015)
+- 4.3.9
+
+-------------------------------------------------------------------
Old:
----
yast2-bootloader-4.3.8.tar.bz2
New:
----
yast2-bootloader-4.3.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.MZPONv/_old 2020-09-18 14:28:44.771311259 +0200
+++ /var/tmp/diff_new_pack.MZPONv/_new 2020-09-18 14:28:44.775311263 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-bootloader
#
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,17 +12,17 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: yast2-bootloader
-Version: 4.3.8
+Version: 4.3.9
Release: 0
Summary: YaST2 - Bootloader Configuration
License: GPL-2.0-or-later
Group: System/YaST
-Url: https://github.com/yast/yast-bootloader
+URL: https://github.com/yast/yast-bootloader
Source0: %{name}-%{version}.tar.bz2
++++++ yast2-bootloader-4.3.8.tar.bz2 -> yast2-bootloader-4.3.9.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-4.3.8/package/yast2-bootloader.changes
new/yast2-bootloader-4.3.9/package/yast2-bootloader.changes
--- old/yast2-bootloader-4.3.8/package/yast2-bootloader.changes 2020-08-12
13:54:37.000000000 +0200
+++ new/yast2-bootloader-4.3.9/package/yast2-bootloader.changes 2020-09-14
08:39:11.000000000 +0200
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Mon Sep 14 12:07:31 UTC 2020 - Josef Reidinger <[email protected]>
+- merge SLE15 SP2 changes:
+-- fix detection of present of efivars causing grub2-install
+ failures on some arm boards (bsc#1172114)
+-- add workaround for ARM to make GRUB2 works for
+ every device. It can potentially break multi-boot (bsc#1167015)
+- 4.3.9
+
+-------------------------------------------------------------------
Tue Aug 11 11:57:36 CEST 2020 - [email protected]
- AutoYaST: Added supplements: autoyast(bootloader) into the spec file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-4.3.8/package/yast2-bootloader.spec
new/yast2-bootloader-4.3.9/package/yast2-bootloader.spec
--- old/yast2-bootloader-4.3.8/package/yast2-bootloader.spec 2020-08-12
13:54:37.000000000 +0200
+++ new/yast2-bootloader-4.3.9/package/yast2-bootloader.spec 2020-09-14
08:39:11.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 4.3.8
+Version: 4.3.9
Release: 0
Summary: YaST2 - Bootloader Configuration
License: GPL-2.0-or-later
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-4.3.8/src/lib/bootloader/grub_install.rb
new/yast2-bootloader-4.3.9/src/lib/bootloader/grub_install.rb
--- old/yast2-bootloader-4.3.8/src/lib/bootloader/grub_install.rb
2020-08-12 13:54:37.000000000 +0200
+++ new/yast2-bootloader-4.3.9/src/lib/bootloader/grub_install.rb
2020-09-14 08:39:11.000000000 +0200
@@ -39,6 +39,13 @@
if no_device_install?
Yast::Execute.on_target(cmd)
+ # workaround for arm on SLE15 SP2 (bsc#1167015)
+ # run grub2-install also non-removable if efi is there
+ if Yast::Arch.aarch64 &&
!Dir.glob("/sys/firmware/efi/efivars/*").empty?
+ cmd.delete("--no-nvram")
+ cmd.delete("--removable")
+ Yast::Execute.on_target(cmd)
+ end
[]
else
return [] if devices.empty?
@@ -118,7 +125,8 @@
# working NVRAM, we either see no efivars at all (booted via non-EFI
entry
# point) or there is no efi variable exposed. Install grub in the
# removable location there.
- efi && Dir.glob("/sys/firmware/efi/efivars/*").empty?
+ # Workaround for SLE15 SP2 - run always as removable on arm (bsc#1167015)
+ Yast::Arch.aarch64 || (efi &&
Dir.glob("/sys/firmware/efi/efivars/*").empty?)
end
def no_device_install?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-4.3.8/test/grub_install_test.rb
new/yast2-bootloader-4.3.9/test/grub_install_test.rb
--- old/yast2-bootloader-4.3.8/test/grub_install_test.rb 2020-08-12
13:54:37.000000000 +0200
+++ new/yast2-bootloader-4.3.9/test/grub_install_test.rb 2020-09-14
08:39:11.000000000 +0200
@@ -37,6 +37,10 @@
end
end
+ before do
+ allow(::File).to receive(:directory?).and_return(false)
+ end
+
context "initialized with efi: true" do
subject { Bootloader::GrubInstall.new(efi: true) }
@@ -49,12 +53,12 @@
subject.execute(secure_boot: true)
end
- it "runs grub2-install with --suse-force-signed on aarch64" do
+ it "runs grub2-install with --suse-force-signed on aarch64 with secure
boot" do
stub_arch("aarch64")
- stub_efivars
+ stub_efivars(removable: true)
expect(Yast::Execute).to receive(:on_target)
- .with([/grub2-install/, anything, "--suse-force-signed", anything,
anything])
+ .with([/grub2-install/, anything, "--suse-force-signed", anything,
anything, anything, anything])
subject.execute(secure_boot: true)
end
@@ -91,8 +95,17 @@
it "runs with target arm64-efi on aarch64" do
stub_arch("aarch64")
- stub_efivars
- expect_grub2_install("arm64-efi")
+ stub_efivars(removable: true)
+ expect_grub2_install("arm64-efi", removable: true)
+
+ subject.execute(devices: [])
+ end
+
+ it "runs twice as removable and non removable on aarch64 with efi vars
(bsc#1167015)" do
+ stub_arch("aarch64")
+ stub_efivars(removable: false)
+ expect_grub2_install("arm64-efi", removable: false)
+ expect_grub2_install("arm64-efi", removable: true)
subject.execute(devices: [])
end
@@ -133,7 +146,7 @@
it "do not raise exception if secure_boot: true passed" do
stub_arch("x86_64")
- expect { subject.execute(secure_boot: true) }.to_not
raise_error(RuntimeError)
+ expect { subject.execute(secure_boot: true) }.to_not raise_error
end
it "runs for each device passed in devices" do
