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-05-21 19:08:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Bootloader (Old)
and /work/SRC/openSUSE:Factory/.perl-Bootloader.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Bootloader"
Sun May 21 19:08:25 2023 rev:205 rq:1087959 version:1.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Bootloader/perl-Bootloader.changes
2023-04-29 17:27:34.638400668 +0200
+++
/work/SRC/openSUSE:Factory/.perl-Bootloader.new.1533/perl-Bootloader.changes
2023-05-21 19:08:38.786413890 +0200
@@ -1,0 +2,14 @@
+Fri May 19 14:15:25 UTC 2023 - [email protected]
+
+- no not install kexec-bootloader
+- 1.1
+
+--------------------------------------------------------------------
+Fri May 19 14:08:30 UTC 2023 - [email protected]
+
+- merge gh#openSUSE/perl-bootloader#144
+- add default-settings script
+- add new kexec-bootloader
+- add --default-settings option (bsc#1211082)
+
+--------------------------------------------------------------------
Old:
----
perl-Bootloader-1.0.tar.xz
New:
----
perl-Bootloader-1.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Bootloader.spec ++++++
--- /var/tmp/diff_new_pack.nfmi2g/_old 2023-05-21 19:08:39.302416836 +0200
+++ /var/tmp/diff_new_pack.nfmi2g/_new 2023-05-21 19:08:39.306416859 +0200
@@ -25,7 +25,7 @@
%{!?_distconfdir:%global _distconfdir /etc}
Name: perl-Bootloader
-Version: 1.0
+Version: 1.1
Release: 0
Requires: coreutils
Requires: perl-base = %{perl_version}
++++++ perl-Bootloader-1.0.tar.xz -> perl-Bootloader-1.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-1.0/Makefile
new/perl-Bootloader-1.1/Makefile
--- old/perl-Bootloader-1.0/Makefile 2023-04-24 19:38:14.000000000 +0200
+++ new/perl-Bootloader-1.1/Makefile 2023-05-19 16:52:26.000000000 +0200
@@ -31,6 +31,7 @@
@install -m 755 grub2/add-option $(DESTDIR)/usr/lib/bootloader/grub2
@install -m 755 grub2/del-option $(DESTDIR)/usr/lib/bootloader/grub2
@install -m 755 grub2/get-option $(DESTDIR)/usr/lib/bootloader/grub2
+ @install -m 755 grub2/default-settings
$(DESTDIR)/usr/lib/bootloader/grub2
@install -d -m 755 $(DESTDIR)/usr/lib/bootloader/grub2-efi
@install -m 755 grub2-efi/install
$(DESTDIR)/usr/lib/bootloader/grub2-efi
@@ -38,6 +39,7 @@
@install -m 755 grub2/add-option $(DESTDIR)/usr/lib/bootloader/grub2-efi
@install -m 755 grub2/del-option $(DESTDIR)/usr/lib/bootloader/grub2-efi
@install -m 755 grub2/get-option $(DESTDIR)/usr/lib/bootloader/grub2-efi
+ @install -m 755 grub2/default-settings
$(DESTDIR)/usr/lib/bootloader/grub2-efi
@install -d -m 755 $(DESTDIR)/usr/lib/bootloader/u-boot
@install -m 755 u-boot/config $(DESTDIR)/usr/lib/bootloader/u-boot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-1.0/VERSION
new/perl-Bootloader-1.1/VERSION
--- old/perl-Bootloader-1.0/VERSION 2023-04-24 19:38:14.000000000 +0200
+++ new/perl-Bootloader-1.1/VERSION 2023-05-19 16:52:26.000000000 +0200
@@ -1 +1 @@
-1.0
+1.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-1.0/changelog
new/perl-Bootloader-1.1/changelog
--- old/perl-Bootloader-1.0/changelog 2023-04-24 19:38:14.000000000 +0200
+++ new/perl-Bootloader-1.1/changelog 2023-05-19 16:52:26.000000000 +0200
@@ -1,9 +1,18 @@
+2023-05-19: 1.1
+ - merge gh#openSUSE/perl-bootloader#144
+ - add default-settings script
+ - add new kexec-bootloader
+ - add --default-settings option (bsc#1211082)
+ - no not install kexec-bootloader
+ - fix spec file, again
+
2023-04-24: 1.0
- merge gh#openSUSE/perl-bootloader#143
- adjust Makefile for usrmerge and legacy package split
- move obs spec file to git repo
- split off old perl code to perl-Bootloader-legacy package
- remove legacy part completely
+ - fix spec file
2023-04-24: 0.942
- merge gh#openSUSE/perl-bootloader#142
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-1.0/grub2/default-settings
new/perl-Bootloader-1.1/grub2/default-settings
--- old/perl-Bootloader-1.0/grub2/default-settings 1970-01-01
01:00:00.000000000 +0100
+++ new/perl-Bootloader-1.1/grub2/default-settings 2023-05-19
16:52:26.000000000 +0200
@@ -0,0 +1,28 @@
+#! /bin/bash
+
+# Settings from /etc/sysconfig/filename are available as environment vars
+# with the name 'SYS__FILENAME__KEY' (filename converted to upper case).
+#
+# Not all files are parsed, current list is:
+# bootloader, language
+#
+
+if [ -e /etc/default/grub ] ; then
+ . /etc/default/grub
+ if [ -z "$GRUB_CMDLINE_LINUX_DEFAULT" ] ; then
+ echo "Warning: GRUB_CMDLINE_LINUX_DEFAULT is empty"
+ fi
+else
+ echo "/etc/default/grub missing"
+ exit 1
+fi
+
+kernel=$(readlink -f /boot/vmlinuz)
+initrd=$(readlink -f /boot/initrd)
+append="$GRUB_CMDLINE_LINUX_DEFAULT"
+
+echo "kernel=$kernel" >$PBL_RESULT
+echo "initrd=$initrd" >>$PBL_RESULT
+echo -n "append=${append@Q}" >>$PBL_RESULT
+
+exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-1.0/kexec-bootloader
new/perl-Bootloader-1.1/kexec-bootloader
--- old/perl-Bootloader-1.0/kexec-bootloader 1970-01-01 01:00:00.000000000
+0100
+++ new/perl-Bootloader-1.1/kexec-bootloader 2023-05-19 16:52:26.000000000
+0200
@@ -0,0 +1,70 @@
+#! /usr/bin/bash
+
+# Print help text and exit.
+#
+usage () {
+ cat <<EOF
+Usage: kexec-bootloader [OPTIONS]
+Loads kexec kernel from bootloader configuration.
+
+Options:
+
+ -D, --debug Print debugging information.
+ --dry-run Do everything but don't actually run kexec.
+ -h, --help Show this help message.
+
+kexec-bootloader gets the default kernel, initrd, and boot options and
+prepares a kexec() system call with it.
+
+You then can run 'kexec --exec' to boot with this configuration.
+EOF
+
+ exit $1
+}
+
+while true ; do
+ case $1 in
+ -D|--debug) opt_debug=1 ; shift ; continue ;;
+ --dry-run) opt_dry_run=1; shift ; continue ;;
+ -h|--help) usage 0 ;;
+ esac
+
+ break
+done
+
+[ "$#" != 0 ] && usage 1
+
+. <(pbl --default-settings)
+
+[ "$?" != 0 ] && exit 1
+
+for i in $(< /proc/cmdline) ; do
+ case $i in
+ root=*) root=$i ; break ;;
+ esac
+done
+
+if [ -z "$root" ] ; then
+ echo "Could not determine no 'root' option." >&2
+ exit 1
+fi
+
+kexec="kexec --kexec-syscall-auto --load '$kernel' --initrd='$initrd'
--append='$root $append'"
+
+if [ "$opt_debug" = 1 ] ; then
+ echo "Image : $kernel"
+ echo "Initrd : $initrd"
+ echo "Append : $append"
+ echo "Root : $root"
+ echo "Kexec call: $kexec"
+fi
+
+if [ "$opt_dry_run" != 1 ] ; then
+ sh -c "$kexec"
+ if [ "$?" != 0 ] ; then
+ echo "kexec failed." >&2
+ exit 1
+ fi
+fi
+
+exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-1.0/obs/perl-Bootloader.spec
new/perl-Bootloader-1.1/obs/perl-Bootloader.spec
--- old/perl-Bootloader-1.0/obs/perl-Bootloader.spec 2023-04-24
19:38:14.000000000 +0200
+++ new/perl-Bootloader-1.1/obs/perl-Bootloader.spec 2023-05-19
16:52:26.000000000 +0200
@@ -16,7 +16,7 @@
#
-%if 0%{?usrmerged}
+%if %{suse_version} > 1550
%define sbindir %{_sbindir}
%else
%define sbindir /sbin
@@ -29,7 +29,6 @@
Release: 0
Requires: coreutils
Requires: perl-base = %{perl_version}
-Provides: perl-Bootloader-YAML = %{version}
Obsoletes: perl-Bootloader-YAML < %{version}
Summary: Tool for boot loader configuration
License: GPL-2.0-or-later
@@ -50,6 +49,7 @@
%install
make install DESTDIR=%{buildroot} SBINDIR=%{sbindir} ETCDIR=%{_distconfdir}
+mkdir -p %{buildroot}/var/log
touch %{buildroot}/var/log/pbl.log
%post
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-1.0/pbl new/perl-Bootloader-1.1/pbl
--- old/perl-Bootloader-1.0/pbl 2023-04-24 19:38:14.000000000 +0200
+++ new/perl-Bootloader-1.1/pbl 2023-05-19 16:52:26.000000000 +0200
@@ -53,7 +53,7 @@
#
sub pbl_usage
{
- print <<"= = = = = = = =";
+ print { $_[0] ? *STDERR : *STDOUT } <<"= = = = = = = =";
Usage: pbl [OPTIONS]
Configure/install boot loader.
@@ -72,6 +72,7 @@
--remove-kernel VERSION [KERNEL [INITRD]]
Remove kernel with version VERSION. Optionally
pass kernel and initrd
explicitly (systemd-boot).
+ --default-settings Return 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.
@@ -289,6 +290,7 @@
'get-option=s' => sub { push @todo, [ 'get-option', $_[1] ] },
'add-kernel=s{1,3}' => \@opt_add_kernel,
'remove-kernel=s{1,3}' => \@opt_remove_kernel,
+ 'default-settings' => sub { push @todo, [ 'default-settings' ] },
'version' => sub { print "$VERSION\n"; exit 0 },
'help' => sub { pbl_usage 0 },
) || pbl_usage 1;
