Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package perl-Bootloader for openSUSE:Factory
checked in at 2023-06-29 17:27:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Bootloader (Old)
and /work/SRC/openSUSE:Factory/.perl-Bootloader.new.13546 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Bootloader"
Thu Jun 29 17:27:35 2023 rev:208 rq:1095821 version:1.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Bootloader/perl-Bootloader.changes
2023-06-27 23:15:53.715119229 +0200
+++
/work/SRC/openSUSE:Factory/.perl-Bootloader.new.13546/perl-Bootloader.changes
2023-06-29 17:27:47.710071918 +0200
@@ -1,0 +2,7 @@
+Wed Jun 28 13:58:27 UTC 2023 - wfe...@opensuse.org
+
+- merge gh#openSUSE/perl-bootloader#153
+- check whether grub2-install supports --suse-force-signed option
+- 1.5
+
+--------------------------------------------------------------------
Old:
----
perl-Bootloader-1.4.tar.xz
New:
----
perl-Bootloader-1.5.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Bootloader.spec ++++++
--- /var/tmp/diff_new_pack.qes0Lz/_old 2023-06-29 17:27:50.434087874 +0200
+++ /var/tmp/diff_new_pack.qes0Lz/_new 2023-06-29 17:27:50.438087897 +0200
@@ -25,7 +25,7 @@
%{!?_distconfdir:%global _distconfdir /etc}
Name: perl-Bootloader
-Version: 1.4
+Version: 1.5
Release: 0
Requires: coreutils
Requires: perl-base = %{perl_version}
++++++ perl-Bootloader-1.4.tar.xz -> perl-Bootloader-1.5.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-1.4/VERSION
new/perl-Bootloader-1.5/VERSION
--- old/perl-Bootloader-1.4/VERSION 2023-06-26 17:14:11.000000000 +0200
+++ new/perl-Bootloader-1.5/VERSION 2023-06-28 15:58:27.000000000 +0200
@@ -1 +1 @@
-1.4
+1.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-1.4/changelog
new/perl-Bootloader-1.5/changelog
--- old/perl-Bootloader-1.4/changelog 2023-06-26 17:14:11.000000000 +0200
+++ new/perl-Bootloader-1.5/changelog 2023-06-28 15:58:27.000000000 +0200
@@ -1,3 +1,7 @@
+2023-06-28: 1.5
+ - merge gh#openSUSE/perl-bootloader#153
+ - check whether grub2-install supports --suse-force-signed option
+
2023-06-26: 1.4
- merge gh#openSUSE/perl-bootloader#151
- default-settings: support non-x86 architectures
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-1.4/grub2/install
new/perl-Bootloader-1.5/grub2/install
--- old/perl-Bootloader-1.4/grub2/install 2023-06-26 17:14:11.000000000
+0200
+++ new/perl-Bootloader-1.5/grub2/install 2023-06-28 15:58:27.000000000
+0200
@@ -113,6 +113,19 @@
echo $dev
}
+# Check whether grub2-install supports --suse-force-signed.
+#
+# Exit code 0: supprted, != 0: not supported.
+#
+check_force_signed ()
+{
+ if [ "$target" = powerpc-ieee1275 ] ; then
+ /usr/sbin/grub2-install --help | grep -q -- --suse-force-signed
+ else
+ false
+ fi
+}
+
target=$(uname --hardware-platform)
if [ -z "$target" ] ; then
@@ -130,8 +143,8 @@
# We install grub2 at the end of the installation, not within (bsc#979145)
if [ "$YAST_IS_RUNNING" = instsys ]; then
- echo "Skipping grub2 during installation. Will be done at the end"
- exit 0
+ echo "Skipping grub2 during installation. Will be done at the end"
+ exit 0
fi
if [ "$target" = "powerpc-ieee1275" ] ; then
@@ -140,19 +153,19 @@
append=
if [ "$SYS__BOOTLOADER__UPDATE_NVRAM" = "no" ] ; then
- append="$append --no-nvram"
+ append="$append --no-nvram"
fi
if [ "$SYS__BOOTLOADER__TRUSTED_BOOT" = yes -a -d
"/usr/lib/trustedgrub2/$target" ] ; then
trusted="--directory=/usr/lib/trustedgrub2/$target"
fi
-if [ "$target" = "powerpc-ieee1275" ] ; then
- if [ "$SYS__BOOTLOADER__SECURE_BOOT" = "yes" ] ; then
- append="$append --suse-force-signed"
- else
- append="$append --suse-inhibit-signed"
- fi
+if check_force_signed ; then
+ if [ "$SYS__BOOTLOADER__SECURE_BOOT" = "yes" ] ; then
+ append="$append --suse-force-signed"
+ else
+ append="$append --suse-inhibit-signed"
+ fi
fi
err=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-1.4/grub2-efi/install
new/perl-Bootloader-1.5/grub2-efi/install
--- old/perl-Bootloader-1.4/grub2-efi/install 2023-06-26 17:14:11.000000000
+0200
+++ new/perl-Bootloader-1.5/grub2-efi/install 2023-06-28 15:58:27.000000000
+0200
@@ -33,6 +33,19 @@
fi
}
+# Check whether grub2-install supports --suse-force-signed.
+#
+# Exit code 0: supprted, != 0: not supported.
+#
+check_force_signed ()
+{
+ if [ "$target" = arm64-efi ] ; then
+ /usr/sbin/grub2-install --help | grep -q -- --suse-force-signed
+ else
+ false
+ fi
+}
+
target=$(uname --hardware-platform)
if [ -z "$target" ] ; then
@@ -111,8 +124,8 @@
( set -x ; /usr/sbin/shim-install --config-file=/boot/grub2/grub.cfg $append
)
elif [ -x /usr/sbin/grub2-install ] ; then
if [ "$SYS__BOOTLOADER__SECURE_BOOT" = "yes" ] ; then
- # Use '--suse-force-signed' when shim is not used (aarch64 case)
- if [ "$target" = "arm64-efi" ] ; then
+ # use '--suse-force-signed' if supported, when shim is not used
+ if check_force_signed ; then
append="$append --suse-force-signed"
else
echo "shim-install: command not found"
@@ -126,7 +139,7 @@
( set -x ; /usr/sbin/shim-install --config-file=/boot/grub2/grub.cfg
--removable )
else
# fallback to signed grub so that check_update_default can still work
- ( set -x ; cp /usr/share/grub2/x86_64-efi/grub.efi
/boot/efi/EFI/boot/$efi_default )
+ ( set -x ; cp /usr/share/grub2/$target/grub.efi
/boot/efi/EFI/boot/$efi_default )
fi
fi
else
