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-27 23:15:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Bootloader (Old)
and /work/SRC/openSUSE:Factory/.perl-Bootloader.new.15902 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Bootloader"
Tue Jun 27 23:15:46 2023 rev:207 rq:1095455 version:1.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Bootloader/perl-Bootloader.changes
2023-06-03 00:06:32.629748069 +0200
+++
/work/SRC/openSUSE:Factory/.perl-Bootloader.new.15902/perl-Bootloader.changes
2023-06-27 23:15:53.715119229 +0200
@@ -1,0 +2,16 @@
+Mon Jun 26 15:14:11 UTC 2023 - [email protected]
+
+- merge gh#openSUSE/perl-bootloader#151
+- default-settings: support non-x86 architectures
+- add man pages for all commands
+- 1.4
+
+--------------------------------------------------------------------
+Mon Jun 26 10:21:53 UTC 2023 - [email protected]
+
+- merge gh#openSUSE/perl-bootloader#149
+- use signed grub EFI binary when updating grub in default EFI
+ location (bsc#1210799)
+- 1.3
+
+--------------------------------------------------------------------
Old:
----
perl-Bootloader-1.2.tar.xz
New:
----
perl-Bootloader-1.4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Bootloader.spec ++++++
--- /var/tmp/diff_new_pack.ojmI8F/_old 2023-06-27 23:15:54.911126266 +0200
+++ /var/tmp/diff_new_pack.ojmI8F/_new 2023-06-27 23:15:54.919126314 +0200
@@ -25,7 +25,7 @@
%{!?_distconfdir:%global _distconfdir /etc}
Name: perl-Bootloader
-Version: 1.2
+Version: 1.4
Release: 0
Requires: coreutils
Requires: perl-base = %{perl_version}
@@ -37,6 +37,7 @@
Source: %{name}-%{version}.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
+BuildRequires: rubygem(asciidoctor)
#!BuildIgnore: mdadm e2fsprogs limal-bootloader
%description
@@ -49,6 +50,10 @@
%install
make install DESTDIR=%{buildroot} SBINDIR=%{sbindir} ETCDIR=%{_distconfdir}
+make doc
+install -D -m 644 pbl.8 %{buildroot}%{_mandir}/man8/pbl.8
+install -D -m 644 bootloader_entry.8
%{buildroot}%{_mandir}/man8/bootloader_entry.8
+install -D -m 644 update-bootloader.8
%{buildroot}%{_mandir}/man8/update-bootloader.8
mkdir -p %{buildroot}/var/log
touch %{buildroot}/var/log/pbl.log
++++++ perl-Bootloader-1.2.tar.xz -> perl-Bootloader-1.4.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-1.2/Makefile
new/perl-Bootloader-1.4/Makefile
--- old/perl-Bootloader-1.2/Makefile 2023-05-31 15:54:55.000000000 +0200
+++ new/perl-Bootloader-1.4/Makefile 2023-06-26 17:14:11.000000000 +0200
@@ -9,10 +9,10 @@
PM_FILES = $(shell find src -name '*.pm')
-.PHONY: export clean archive test install check
+.PHONY: export clean archive test install check doc
all:
- @echo "Choose one target out of 'archive', 'test', 'test_clean',
'docs', or 'clean'"
+ @echo "Choose one target out of 'archive', 'test', 'test_clean', 'doc',
or 'clean'"
@echo
changelog: $(GITDEPS)
@@ -57,8 +57,6 @@
@install -D -m 644 boot.readme
$(DESTDIR)/usr/share/doc/packages/perl-Bootloader/boot.readme
@install -d -m 755 $(DESTDIR)/usr/share/man/man8
@install -D -m 644 pbl.logrotate $(DESTDIR)$(ETCDIR)/logrotate.d/pbl
- @pod2man update-bootloader
>$(DESTDIR)/usr/share/man/man8/update-bootloader.8
- @chmod 644 $(DESTDIR)/usr/share/man/man8/update-bootloader.8
archive: changelog
mkdir -p package
@@ -66,8 +64,10 @@
tar -r -f package/$(PREFIX).tar --mode=0664 --owner=root --group=root
--mtime="`git show -s --format=%ci`" --transform='s:^:$(PREFIX)/:' VERSION
changelog
xz -f package/$(PREFIX).tar
-docs:
- cd doc/ && make
+%.8: %_man.adoc
+ asciidoctor -b manpage -a version=$(VERSION) -a
soversion=${MAJOR_VERSION} $<
+
+doc: pbl.8 bootloader_entry.8 update-bootloader.8 kexec-bootloader.8
test:
cd perl-Bootloader-testsuite/tests/test_interface/ && make
@@ -77,4 +77,4 @@
clean:
rm -rf .check .install .package package
- rm -f *~ */*~ */*/*~
+ rm -f *.8 *~ */*~ */*/*~
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-1.2/VERSION
new/perl-Bootloader-1.4/VERSION
--- old/perl-Bootloader-1.2/VERSION 2023-05-31 15:54:55.000000000 +0200
+++ new/perl-Bootloader-1.4/VERSION 2023-06-26 17:14:11.000000000 +0200
@@ -1 +1 @@
-1.2
+1.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-1.2/bootloader_entry_man.adoc
new/perl-Bootloader-1.4/bootloader_entry_man.adoc
--- old/perl-Bootloader-1.2/bootloader_entry_man.adoc 1970-01-01
01:00:00.000000000 +0100
+++ new/perl-Bootloader-1.4/bootloader_entry_man.adoc 2023-06-26
17:14:11.000000000 +0200
@@ -0,0 +1,70 @@
+= bootloader_entry(8)
+:doctype: manpage
+:manmanual: System Administration
+:mansource: bootloader_entry {version}
+
+== Name
+
+bootloader_entry - add or remove kernel/initrd pair to boot loader
configuration.
+
+== Synopsis
+
+*bootloader_entry* [_COMMAND_] FLAVOR VERSION KERNEL INITRD
+
+
+== Description
+
+*bootloader_entry* adds or removes a kernel/initrd pair to the boot loader
configuration.
+
+Note that the _FLAVOR_ argument is there for interface compatibility reasons
and not actually used.
+
+*bootloader_entry* is just a symlink to *pbl*. The _add_ and _remove_ options
will be translated to *pbl --add-kernel* and *pbl --remove-kernel*,
respectively.
+
+*bootloader_entry* is not intended to called manually. It is a preserved
interface to the boot loader configuration that is used
+in the post-install section of the Linux kernel package.
+
+== Commands
+
+*add*::
+Add kernel/initrd to boot config.
+
+*remove*::
+Remove kernel/initrd from boot config.
+
+== Files
+
+_/etc/sysconfig/bootloader_::
+General boot loader related configuration settings.
+
+_/var/log/pbl.log_::
+Default log file.
+
+_/usr/etc/logrotate.d/pbl_::
+Logrotate rules for _/var/log/pbl.log_.
+
+_/usr/lib/bootloader_::
+Directory with specific config scripts for each supported boot loader.
+
+== Examples
+
+----
+# add new kernel/initrd
+bootloader_entry add default 6.2.8-1-default vmlinuz-6.2.8-1-default
initrd-6.2.8-1-default
+
+# remove kernel/initrd
+bootloader_entry remove default 6.2.8-1-default vmlinuz-6.2.8-1-default
initrd-6.2.8-1-default
+----
+
+== See Also
+
+*pbl*(8), *update-bootloader*(8).
+
+== Links
+
+- The Boot Loader Specification:
https://uapi-group.org/specifications/specs/boot_loader_specification
+- The Discoverable Partitions Specification:
https://uapi-group.org/specifications/specs/discoverable_partitions_specification
+- grub2: https://www.gnu.org/software/grub/manual/grub/grub.html
+- shim: https://github.com/rhboot/shim
+- systemd-boot:
https://www.freedesktop.org/software/systemd/man/systemd-boot.html
+- u-boot: http://www.denx.de/wiki/U-Boot
+- UEFI Specification: https://uefi.org/specifications
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-1.2/changelog
new/perl-Bootloader-1.4/changelog
--- old/perl-Bootloader-1.2/changelog 2023-05-31 15:54:55.000000000 +0200
+++ new/perl-Bootloader-1.4/changelog 2023-06-26 17:14:11.000000000 +0200
@@ -1,3 +1,13 @@
+2023-06-26: 1.4
+ - merge gh#openSUSE/perl-bootloader#151
+ - default-settings: support non-x86 architectures
+ - add man pages for all commands
+
+2023-06-26: 1.3
+ - merge gh#openSUSE/perl-bootloader#149
+ - use signed grub EFI binary when updating grub in default EFI
+ location (bsc#1210799)
+
2023-05-31: 1.2
- merge gh#openSUSE/perl-bootloader#148
- UEFI: update also default location, if it is controlled by SUSE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-1.2/grub2/default-settings
new/perl-Bootloader-1.4/grub2/default-settings
--- old/perl-Bootloader-1.2/grub2/default-settings 2023-05-31
15:54:55.000000000 +0200
+++ new/perl-Bootloader-1.4/grub2/default-settings 2023-06-26
17:14:11.000000000 +0200
@@ -17,7 +17,22 @@
exit 1
fi
-kernel=$(readlink -f /boot/vmlinuz)
+case $(arch) in
+ x86_64|i?86)
+ image=vmlinuz ;;
+ ppc*)
+ image=vmlinux ;;
+ s390*)
+ image=image ;;
+ armv*)
+ image=zImage ;;
+ aarch64|riscv64)
+ image=Image ;;
+ *)
+ echo "Architecture $(arch) not supported."
+esac
+
+kernel=$(readlink -f /boot/$image)
initrd=$(readlink -f /boot/initrd)
append="$GRUB_CMDLINE_LINUX_DEFAULT"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-1.2/grub2-efi/install
new/perl-Bootloader-1.4/grub2-efi/install
--- old/perl-Bootloader-1.2/grub2-efi/install 2023-05-31 15:54:55.000000000
+0200
+++ new/perl-Bootloader-1.4/grub2-efi/install 2023-06-26 17:14:11.000000000
+0200
@@ -27,6 +27,7 @@
update_default=0
+ # install/update default location if it is 'our' file
if [ -n "$ca_string" -a -f $efi_default_file ] ; then
grep -q "$ca_string" $efi_default_file && update_default=1
fi
@@ -59,8 +60,6 @@
target="$target-efi"
-echo "target = $target, update default location = $update_default"
-
# We install grub2 at the end of the installation, not within (bsc#979145)
if [ "$YAST_IS_RUNNING" = instsys ]; then
echo "Skipping grub2-efi during installation. Will be done at the end"
@@ -92,14 +91,20 @@
update_default=0
else
has_nvram=1
+ # some arm firmwares need the fallback even though they have nvram vars
(bsc#1167015)
+ if [ "$target" = "arm64-efi" ] ; then
+ update_default=1
+ fi
fi
+echo "target = $target, update default location = $update_default"
+
if [ "$SYS__BOOTLOADER__TRUSTED_BOOT" = yes ] && [ -f
"/usr/lib/grub2/$target/tpm.mod" -o -f "/usr/share/grub2/$target/tpm.mod" ] ;
then
append="$append --suse-enable-tpm"
fi
if [ "$SYS__BOOTLOADER__UPDATE_NVRAM" = "no" ] ; then
- append="$append --no-nvram"
+ append="$append --no-nvram"
fi
if [ "$SYS__BOOTLOADER__SECURE_BOOT" = "yes" -a -x /usr/sbin/shim-install ] ;
then
@@ -114,13 +119,15 @@
exit 1
fi
fi
- if [ "$has_nvram" = 1 -a "$target" = "arm64-efi" ] ; then
- # some arm firmwares need the fallback even though they have nvram vars
(bsc#1167015)
- ( set -x ; /usr/sbin/grub2-install --target="$target" $append
$no_nvram_opts )
- fi
( set -x ; /usr/sbin/grub2-install --target="$target" $append )
if [ "$update_default" = 1 ] ; then
- ( set -x ; /usr/sbin/grub2-install --target="$target" $append
$no_nvram_opts )
+ if [ -x /usr/sbin/shim-install ] ; then
+ # update shim to fallback location given it is used most often
+ ( 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 )
+ fi
fi
else
echo "grub2-install: command not found"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-1.2/kexec-bootloader_man.adoc
new/perl-Bootloader-1.4/kexec-bootloader_man.adoc
--- old/perl-Bootloader-1.2/kexec-bootloader_man.adoc 1970-01-01
01:00:00.000000000 +0100
+++ new/perl-Bootloader-1.4/kexec-bootloader_man.adoc 2023-06-26
17:14:11.000000000 +0200
@@ -0,0 +1,41 @@
+= kexec-bootloader(8)
+:doctype: manpage
+:manmanual: System Administration
+:mansource: kexec-bootloader {version}
+
+== Name
+
+kexec-bootloader - load kexec kernel from boot loader configuration.
+
+== Synopsis
+
+*kexec-bootloader* [_OPTIONS_]
+
+
+== Description
+
+*kexec-bootloader* takes the default section of the boot loader configuration
and loads that kernel and initrd
+with *kexec -l* and the respective command line.
+
+Under systemd *kexec-bootloader* may be invoked by kexec-load.service
(*systemctl kexec*) to perform a kexec.
+
+To emulate previous SLE configurable behaviour where kexec occurs
automatically at system reboot the systemd reboot target
+should be altered via *ln -s /usr/lib/systemd/system/kexec.target
/etc/systemd/system/reboot.target*.
+
+== Options
+
+**--dry-run**::
+Do everything but don't actually run kexec.
+
+*-D*, **--debug**::
+Prints debugging output.
+
+*-h*, **help**::
+Shows a short usage message.
+
+== Return value
+The program returns 0 on success and 1 on failure.
+
+== See Also
+
+*kexec*(8).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-1.2/obs/perl-Bootloader.spec
new/perl-Bootloader-1.4/obs/perl-Bootloader.spec
--- old/perl-Bootloader-1.2/obs/perl-Bootloader.spec 2023-05-31
15:54:55.000000000 +0200
+++ new/perl-Bootloader-1.4/obs/perl-Bootloader.spec 2023-06-26
17:14:11.000000000 +0200
@@ -37,6 +37,7 @@
Source: %{name}-%{version}.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
+BuildRequires: rubygem(asciidoctor)
#!BuildIgnore: mdadm e2fsprogs limal-bootloader
%description
@@ -49,6 +50,10 @@
%install
make install DESTDIR=%{buildroot} SBINDIR=%{sbindir} ETCDIR=%{_distconfdir}
+make doc
+install -D -m 644 pbl.8 %{buildroot}%{_mandir}/man8/pbl.8
+install -D -m 644 bootloader_entry.8
%{buildroot}%{_mandir}/man8/bootloader_entry.8
+install -D -m 644 update-bootloader.8
%{buildroot}%{_mandir}/man8/update-bootloader.8
mkdir -p %{buildroot}/var/log
touch %{buildroot}/var/log/pbl.log
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-1.2/pbl_man.adoc
new/perl-Bootloader-1.4/pbl_man.adoc
--- old/perl-Bootloader-1.2/pbl_man.adoc 1970-01-01 01:00:00.000000000
+0100
+++ new/perl-Bootloader-1.4/pbl_man.adoc 2023-06-26 17:14:11.000000000
+0200
@@ -0,0 +1,114 @@
+= pbl(8)
+:doctype: manpage
+:manmanual: System Administration
+:mansource: pbl {version}
+
+== Name
+
+pbl - manage boot loader confguration.
+
+== Synopsis
+
+*pbl* [_OPTIONS_] _IMAGE_
+
+
+== Description
+
+*pbl* is a light wrapper to unify some common boot loader configuration tasks.
+
+It is not intended to provide a comprehensive API to boot loader configuration.
+
+Most notably, not all options make sense for all boot loaders.
+
+Supported boot loaders have a sub directory in _/usr/lib/bootloader_
containing a shell script for each option.
+To add support for a new boot loader create a new directoy with its name and
add scripts for options you need.
+
+== Options
+
+*--install*::
+Install (or update) boot loader. +
+Note that this does not update the boot loader configuration.
+
+*--config*::
+Create (or update) boot loader configuration.
+
+*--show*::
+Print current boot loader.
+
+*--loader* __BOOTLOADER_::
+Set current boot loader to _BOOTLOADER_. +
+Note that this only changes a config variable. To actually use the new boot
loader, run *pbl --install* and *pbl --config*.
+
+*--default* _ENTRY_::
+Set default boot entry to _ENTRY_.
+
+*--add-option* _OPTION_::
+Add _OPTION_ to default boot options (grub2).
+
+*--del-option* _OPTION_::
+Delete OPTION from default boot options (grub2).
+
+*--get-option* _OPTION_::
+Get _OPTION_ from default boot options (grub2).
+
+*--add-kernel* _VERSION_ [_KERNEL_ [_INITRD_]]::
+Add kernel with version _VERSION_. Optionally pass kernel and initrd
explicitly (systemd-boot).
+
+*--remove-kernel* _VERSION_ [_KERNEL_ [_INITRD_]]::
+Remove kernel with version _VERSION_. Optionally pass kernel and initrd
explicitly (systemd-boot).
+
+*--default-settings*::
+Print default kernel, initrd, and boot options.
+
+*--log* _LOGFILE_::
+Log messages to _LOGFILE_ (default: /var/log/pbl.log).
+
+*--version*::
+Show *pbl* version.
+
+*--help*::
+Write this help text.
+
+== Files
+
+_/etc/sysconfig/bootloader_::
+General boot loader related configuration settings.
+
+_/var/log/pbl.log_::
+Default log file.
+
+_/usr/etc/logrotate.d/pbl_::
+Logrotate rules for _/var/log/pbl.log_.
+
+_/usr/lib/bootloader_::
+Directory with specific config scripts for each supported boot loader.
+
+== Examples
+
+----
+# display default boot loader
+pbl --show
+
+# change default boot loader
+pbl --loader systemd-boot
+
+# (re-)install default boot loader
+pbl --install
+
+# update boot loader configuration
+pbl --config
+----
+
+== See Also
+
+*bootloader_entry*(8), *update-bootloader*(8).
+
+== Links
+
+- The Boot Loader Specification:
https://uapi-group.org/specifications/specs/boot_loader_specification
+- The Discoverable Partitions Specification:
https://uapi-group.org/specifications/specs/discoverable_partitions_specification
+- grub2: https://www.gnu.org/software/grub/manual/grub/grub.html
+- shim: https://github.com/rhboot/shim
+- systemd-boot:
https://www.freedesktop.org/software/systemd/man/systemd-boot.html
+- u-boot: http://www.denx.de/wiki/U-Boot
+- UEFI Specification: https://uefi.org/specifications
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-1.2/update-bootloader_man.adoc
new/perl-Bootloader-1.4/update-bootloader_man.adoc
--- old/perl-Bootloader-1.2/update-bootloader_man.adoc 1970-01-01
01:00:00.000000000 +0100
+++ new/perl-Bootloader-1.4/update-bootloader_man.adoc 2023-06-26
17:14:11.000000000 +0200
@@ -0,0 +1,70 @@
+= update-bootloader(8)
+:doctype: manpage
+:manmanual: System Administration
+:mansource: update-bootloader {version}
+
+== Name
+
+update-bootloader - update boot loader configuration.
+
+== Synopsis
+
+*update-bootloader* [_OPTION_]
+
+
+== Description
+
+*update-bootloader* updates the boot loader configuration.
+
+*update-bootloader* is just a symlink to *pbl* and corresponds to *pbl --init*
and *pbl --config*, respectively.
+
+*update-bootloader* is not intended to called manually. It is a preserved
interface to the boot loader configuration that is used
+in the post-install section of some boot loader related packages (e.g. *shim*).
+
+== Option
+
+*--reinit*::
+Install or update boot loader, then update boot loader configuration.
+
+== Obsolete options
+
+*--add*, *--remove*, *--refresh*, *--image*, *--initrd*, *--xen*,
*--xen-kernel*, *--default*, *--previous*, *--name*, *--force*,
*--force-default*, *--man*, *--help*::
+These options relate to ancient versions of *update-bootloader* and are all
ignored.
+
+== Files
+
+_/etc/sysconfig/bootloader_::
+General boot loader related configuration settings.
+
+_/var/log/pbl.log_::
+Default log file.
+
+_/usr/etc/logrotate.d/pbl_::
+Logrotate rules for _/var/log/pbl.log_.
+
+_/usr/lib/bootloader_::
+Directory with specific config scripts for each supported boot loader.
+
+== Examples
+
+----
+# update boot loader configuration
+update-bootloader
+
+# install/update boot loader and update boot loader configuration
+update-bootloader --reinit
+----
+
+== See Also
+
+*bootloader_entry*(8), *pbl*(8).
+
+== Links
+
+- The Boot Loader Specification:
https://uapi-group.org/specifications/specs/boot_loader_specification
+- The Discoverable Partitions Specification:
https://uapi-group.org/specifications/specs/discoverable_partitions_specification
+- grub2: https://www.gnu.org/software/grub/manual/grub/grub.html
+- shim: https://github.com/rhboot/shim
+- systemd-boot:
https://www.freedesktop.org/software/systemd/man/systemd-boot.html
+- u-boot: http://www.denx.de/wiki/U-Boot
+- UEFI Specification: https://uefi.org/specifications
