Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package yast2-bootloader for
openSUSE:Factory checked in at 2021-02-26 21:58:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old)
and /work/SRC/openSUSE:Factory/.yast2-bootloader.new.2378 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-bootloader"
Fri Feb 26 21:58:35 2021 rev:303 rq:873507 version:4.3.22
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes
2021-01-29 14:57:06.269510045 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-bootloader.new.2378/yast2-bootloader.changes
2021-02-26 21:58:36.783776642 +0100
@@ -1,0 +2,13 @@
+Mon Feb 15 14:49:00 UTC 2021 - Josef Reidinger <[email protected]>
+
+- Adapted unit test to recent changes in Yast::Report (related to
+ bsc#1179893).
+- 4.3.22
+
+-------------------------------------------------------------------
+Tue Feb 9 15:44:42 UTC 2021 - Josef Reidinger <[email protected]>
+
+- use shim for secure boot also on aarch64 (jsc#SLE-15020)
+- 4.3.21
+
+-------------------------------------------------------------------
Old:
----
yast2-bootloader-4.3.20.tar.bz2
New:
----
yast2-bootloader-4.3.22.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.wj2eKa/_old 2021-02-26 21:58:38.567778209 +0100
+++ /var/tmp/diff_new_pack.wj2eKa/_new 2021-02-26 21:58:38.567778209 +0100
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 4.3.20
+Version: 4.3.22
Release: 0
Summary: YaST2 - Bootloader Configuration
License: GPL-2.0-or-later
++++++ yast2-bootloader-4.3.20.tar.bz2 -> yast2-bootloader-4.3.22.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-4.3.20/package/yast2-bootloader.changes
new/yast2-bootloader-4.3.22/package/yast2-bootloader.changes
--- old/yast2-bootloader-4.3.20/package/yast2-bootloader.changes
2021-01-27 13:48:33.000000000 +0100
+++ new/yast2-bootloader-4.3.22/package/yast2-bootloader.changes
2021-02-18 17:25:29.000000000 +0100
@@ -1,4 +1,17 @@
-------------------------------------------------------------------
+Mon Feb 15 14:49:00 UTC 2021 - Josef Reidinger <[email protected]>
+
+- Adapted unit test to recent changes in Yast::Report (related to
+ bsc#1179893).
+- 4.3.22
+
+-------------------------------------------------------------------
+Tue Feb 9 15:44:42 UTC 2021 - Josef Reidinger <[email protected]>
+
+- use shim for secure boot also on aarch64 (jsc#SLE-15020)
+- 4.3.21
+
+-------------------------------------------------------------------
Wed Jan 27 10:59:26 UTC 2021 - Jos?? Iv??n L??pez Gonz??lez <[email protected]>
- Do not propose resume kernel parameter when the swap is smaller
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-4.3.20/package/yast2-bootloader.spec
new/yast2-bootloader-4.3.22/package/yast2-bootloader.spec
--- old/yast2-bootloader-4.3.20/package/yast2-bootloader.spec 2021-01-27
13:48:33.000000000 +0100
+++ new/yast2-bootloader-4.3.22/package/yast2-bootloader.spec 2021-02-18
17:25:29.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 4.3.20
+Version: 4.3.22
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.20/src/lib/bootloader/grub2efi.rb
new/yast2-bootloader-4.3.22/src/lib/bootloader/grub2efi.rb
--- old/yast2-bootloader-4.3.20/src/lib/bootloader/grub2efi.rb 2021-01-27
13:48:33.000000000 +0100
+++ new/yast2-bootloader-4.3.22/src/lib/bootloader/grub2efi.rb 2021-02-18
17:25:29.000000000 +0100
@@ -100,6 +100,7 @@
res << "grub2-arm-efi"
when "aarch64"
res << "grub2-arm64-efi"
+ res << "shim" << "mokutil" if secure_boot
else
log.warn "Unknown architecture #{Yast::Arch.architecture} for EFI"
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-4.3.20/src/lib/bootloader/grub_install.rb
new/yast2-bootloader-4.3.22/src/lib/bootloader/grub_install.rb
--- old/yast2-bootloader-4.3.20/src/lib/bootloader/grub_install.rb
2021-01-27 13:48:33.000000000 +0100
+++ new/yast2-bootloader-4.3.22/src/lib/bootloader/grub_install.rb
2021-02-18 17:25:29.000000000 +0100
@@ -90,8 +90,6 @@
cmd = ["/usr/sbin/shim-install", "--config-file=/boot/grub2/grub.cfg"]
else
cmd = ["/usr/sbin/grub2-install", "--target=#{target}"]
- # On aarch64, we do not use shim, but '--suse-force-signed' option
(bsc#1136601)
- cmd << "--suse-force-signed" if secure_boot && Yast::Arch.aarch64
# Do skip-fs-probe to avoid error when embedding stage1
# to extended partition
cmd << "--force" << "--skip-fs-probe"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-4.3.20/src/lib/bootloader/systeminfo.rb
new/yast2-bootloader-4.3.22/src/lib/bootloader/systeminfo.rb
--- old/yast2-bootloader-4.3.20/src/lib/bootloader/systeminfo.rb
2021-01-27 13:48:33.000000000 +0100
+++ new/yast2-bootloader-4.3.22/src/lib/bootloader/systeminfo.rb
2021-02-18 17:25:29.000000000 +0100
@@ -93,7 +93,8 @@
# param secure_boot [Boolean] secure boot setting
# @return [Boolean] true if shim has to be used
def shim_needed?(bootloader_name, secure_boot)
- (Yast::Arch.x86_64 || Yast::Arch.i386) && secure_boot &&
efi_used?(bootloader_name)
+ (Yast::Arch.x86_64 || Yast::Arch.i386 || Yast::Arch.aarch64) &&
+ secure_boot && efi_used?(bootloader_name)
end
# Check if secure boot is (in principle) available on an s390 machine.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-4.3.20/test/grub2base_test.rb
new/yast2-bootloader-4.3.22/test/grub2base_test.rb
--- old/yast2-bootloader-4.3.20/test/grub2base_test.rb 2021-01-27
13:48:33.000000000 +0100
+++ new/yast2-bootloader-4.3.22/test/grub2base_test.rb 2021-02-18
17:25:29.000000000 +0100
@@ -9,6 +9,7 @@
allow(Yast::ProductFeatures).to receive(:GetStringFeature)
.and_return("")
allow(Yast::Kernel).to receive(:propose_hibernation?).and_return(true)
+ allow(Yast::Report).to receive(:Error) # do not fail to show popup
end
describe "#read" do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-4.3.20/test/grub_install_test.rb
new/yast2-bootloader-4.3.22/test/grub_install_test.rb
--- old/yast2-bootloader-4.3.20/test/grub_install_test.rb 2021-01-27
13:48:33.000000000 +0100
+++ new/yast2-bootloader-4.3.22/test/grub_install_test.rb 2021-02-18
17:25:29.000000000 +0100
@@ -45,7 +45,7 @@
context "initialized with efi: true" do
subject { Bootloader::GrubInstall.new(efi: true) }
- it "runs shim-install instead of grub2-install if secure_boot: true
passed for non-arm" do
+ it "runs shim-install instead of grub2-install if secure_boot: true
passed" do
stub_arch("x86_64")
stub_efivars
expect(Yast::Execute).to receive(:on_target)
@@ -53,16 +53,6 @@
subject.execute(secure_boot: true)
end
-
- it "runs grub2-install with --suse-force-signed on aarch64 with secure
boot" do
- stub_arch("aarch64")
- stub_efivars(removable: true)
-
- expect(Yast::Execute).to receive(:on_target)
- .with([/grub2-install/, anything, "--suse-force-signed", anything,
anything, anything])
-
- subject.execute(secure_boot: true)
- end
it "runs with target i386-efi on i386" do
stub_arch("i386")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-4.3.20/test/mbr_update_test.rb
new/yast2-bootloader-4.3.22/test/mbr_update_test.rb
--- old/yast2-bootloader-4.3.20/test/mbr_update_test.rb 2021-01-27
13:48:33.000000000 +0100
+++ new/yast2-bootloader-4.3.22/test/mbr_update_test.rb 2021-02-18
17:25:29.000000000 +0100
@@ -25,6 +25,8 @@
before do
# by default common architecture"
allow(Yast::Arch).to receive(:architecture).and_return("x86_64")
+ # do not crash in report if some script failed
+ allow(Yast::Report).to receive(:Error)
end
# FIXME: get reason for it
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-4.3.20/test/sections_test.rb
new/yast2-bootloader-4.3.22/test/sections_test.rb
--- old/yast2-bootloader-4.3.20/test/sections_test.rb 2021-01-27
13:48:33.000000000 +0100
+++ new/yast2-bootloader-4.3.22/test/sections_test.rb 2021-02-18
17:25:29.000000000 +0100
@@ -16,6 +16,11 @@
Bootloader::Sections.new(grub_cfg)
end
+ before do
+ # do not crash in report that grub2-env is not in test env
+ allow(Yast::Report).to receive(:Error)
+ end
+
describe "#all" do
it "returns list of all available sections" do
expect(subject.all).to eq(["linux", "windows"])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-4.3.20/test/systeminfo_test.rb
new/yast2-bootloader-4.3.22/test/systeminfo_test.rb
--- old/yast2-bootloader-4.3.20/test/systeminfo_test.rb 2021-01-27
13:48:33.000000000 +0100
+++ new/yast2-bootloader-4.3.22/test/systeminfo_test.rb 2021-02-18
17:25:29.000000000 +0100
@@ -245,8 +245,8 @@
let(:arch) { "aarch64" }
context "and secure boot is enabled" do
- it "returns false" do
- expect(described_class.shim_needed?("grub2-efi", true)).to be false
+ it "returns true" do
+ expect(described_class.shim_needed?("grub2-efi", true)).to be true
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-4.3.20/test/test_helper.rb
new/yast2-bootloader-4.3.22/test/test_helper.rb
--- old/yast2-bootloader-4.3.20/test/test_helper.rb 2021-01-27
13:48:33.000000000 +0100
+++ new/yast2-bootloader-4.3.22/test/test_helper.rb 2021-02-18
17:25:29.000000000 +0100
@@ -92,5 +92,11 @@
allow(::Bootloader::UdevMapping).to receive(:to_mountby_device) { |d| d }
allow(::Bootloader::UdevMapping).to receive(:to_kernel_device) { |d| d }
devicegraph_stub("trivial.yaml")
+
+ # mock all system operations
+ allow(Yast::Execute).to receive(:on_target)
+ # mock getting default section
+ allow(Yast::Execute).to receive(:on_target)
+ .with("/usr/bin/grub2-editenv", "list", anything).and_return("")
end
end
