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 2022-12-06 14:22:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Bootloader (Old)
and /work/SRC/openSUSE:Factory/.perl-Bootloader.new.1835 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Bootloader"
Tue Dec 6 14:22:46 2022 rev:202 rq:1040404 version:0.940
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Bootloader/perl-Bootloader.changes
2022-08-23 14:26:34.319216253 +0200
+++
/work/SRC/openSUSE:Factory/.perl-Bootloader.new.1835/perl-Bootloader.changes
2022-12-06 14:22:48.457386421 +0100
@@ -0,0 +1,7 @@
+--------------------------------------------------------------------
+Mon Dec 5 18:34:40 UTC 2022 - wfe...@opensuse.org
+
+- merge gh#openSUSE/perl-bootloader#140
+- add basic support for systemd-boot
+- 0.940
+
Old:
----
perl-Bootloader-0.939.tar.xz
New:
----
perl-Bootloader-0.940.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Bootloader.spec ++++++
--- /var/tmp/diff_new_pack.L5GIUF/_old 2022-12-06 14:22:48.885388769 +0100
+++ /var/tmp/diff_new_pack.L5GIUF/_new 2022-12-06 14:22:48.889388791 +0100
@@ -23,7 +23,7 @@
%endif
Name: perl-Bootloader
-Version: 0.939
+Version: 0.940
Release: 0
Requires: coreutils
Requires: perl-base = %{perl_version}
++++++ perl-Bootloader-0.939.tar.xz -> perl-Bootloader-0.940.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-0.939/Makefile
new/perl-Bootloader-0.940/Makefile
--- old/perl-Bootloader-0.939/Makefile 2022-04-27 16:22:43.000000000 +0200
+++ new/perl-Bootloader-0.940/Makefile 2022-12-05 19:34:40.000000000 +0100
@@ -54,6 +54,12 @@
@install -d -m 755 $(DESTDIR)/usr/lib/bootloader/u-boot
@install -m 755 u-boot/config $(DESTDIR)/usr/lib/bootloader/u-boot
+ @install -d -m 755 $(DESTDIR)/usr/lib/bootloader/systemd-boot
+ @install -m 755 systemd-boot/install
$(DESTDIR)/usr/lib/bootloader/systemd-boot
+ @install -m 755 systemd-boot/config
$(DESTDIR)/usr/lib/bootloader/systemd-boot
+ @install -m 755 systemd-boot/add-kernel
$(DESTDIR)/usr/lib/bootloader/systemd-boot
+ @install -m 755 systemd-boot/remove-kernel
$(DESTDIR)/usr/lib/bootloader/systemd-boot
+
@install -m 755 pbl $(DESTDIR)/sbin/pbl
@perl -pi -e 's/0\.0/$(VERSION)/ if /VERSION = /' $(DESTDIR)/sbin/pbl
@ln -snf pbl $(DESTDIR)/sbin/update-bootloader
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-0.939/VERSION
new/perl-Bootloader-0.940/VERSION
--- old/perl-Bootloader-0.939/VERSION 2022-04-27 16:22:43.000000000 +0200
+++ new/perl-Bootloader-0.940/VERSION 2022-12-05 19:34:40.000000000 +0100
@@ -1 +1 @@
-0.939
+0.940
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-0.939/changelog
new/perl-Bootloader-0.940/changelog
--- old/perl-Bootloader-0.939/changelog 2022-04-27 16:22:43.000000000 +0200
+++ new/perl-Bootloader-0.940/changelog 2022-12-05 19:34:40.000000000 +0100
@@ -1,3 +1,7 @@
+2022-12-05: 0.940
+ - merge gh#openSUSE/perl-bootloader#140
+ - add basic support for systemd-boot
+
2022-04-27: 0.939
- merge gh#openSUSE/perl-bootloader#139
- fix sysconfig parsing (bsc#1198828)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-0.939/pbl
new/perl-Bootloader-0.940/pbl
--- old/perl-Bootloader-0.939/pbl 2022-04-27 16:22:43.000000000 +0200
+++ new/perl-Bootloader-0.940/pbl 2022-12-05 19:34:40.000000000 +0100
@@ -30,6 +30,7 @@
my $pbl_dir = "/usr/lib/bootloader";
sub pbl_usage;
+sub bootloader_entry_usage;
sub new;
sub log_msg;
sub run_command;
@@ -42,7 +43,8 @@
my @todo;
my $opt_logfile = "/var/log/pbl.log";
-
+my @opt_add_kernel;
+my @opt_remove_kernel;
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# pbl_usage($exit_code)
@@ -56,17 +58,39 @@
Configure/install boot loader.
Options:
- --install Install boot loader.
- --config Create boot loader config.
- --show Print current boot loader name.
- --default ENTRY Set default boot entry to ENTRY.
- --add-option OPTION Add OPTION to default boot options.
- --del-option OPTION Delete OPTION from default boot options.
- --get-option OPTION Get OPTION from default boot options.
- --log LOGFILE Log messages to LOGFILE (default: /var/log/pbl.log)
- --version Show pbl version.
- --help Write this help text.
+ --install Install boot loader.
+ --config Create boot loader config.
+ --show Print current boot loader name.
+ --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 FILE [INITRD]
+ Add kernel FILE with version VERSION.
Optionally add initrd file INITRD
+ explicitly (systemd-boot).
+ --remove-kernel VERSION [FILE [INITRD]]
+ Remove kernel with version VERSION. Optionally
specify kernel and initrd
+ explicitly (systemd-boot).
+ --log LOGFILE Log messages to LOGFILE (default:
/var/log/pbl.log)
+ --version Show pbl version.
+ --help Write this help text.
+
+= = = = = = = =
+
+ exit shift;
+}
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# bootloader_entry_usage($exit_code)
+#
+# Print help text and exit.
+#
+sub bootloader_entry_usage
+{
+ print <<"= = = = = = = =";
+Usage: bootloader_entry add|remove kernel-flavor kernel-version kernel-image
initrd-file
+Add or remove kernel images to boot config.
= = = = = = = =
exit shift;
@@ -253,17 +277,31 @@
if($program eq 'pbl') {
GetOptions(
- 'log=s' => \$opt_logfile,
- 'install' => sub { push @todo, [ 'install' ] },
- 'config' => sub { push @todo, [ 'config' ] },
- 'show' => sub { print "$loader\n"; exit 0 },
- 'default=s' => sub { push @todo, [ 'default', $_[1] ] },
- 'add-option=s' => sub { push @todo, [ 'add-option', $_[1] ] },
- 'del-option=s' => sub { push @todo, [ 'del-option', $_[1] ] },
- 'get-option=s' => sub { push @todo, [ 'get-option', $_[1] ] },
- 'version' => sub { print "$VERSION\n"; exit 0 },
- 'help' => sub { pbl_usage 0 },
+ 'log=s' => \$opt_logfile,
+ 'install' => sub { push @todo, [ 'install' ] },
+ 'config' => sub { push @todo, [ 'config' ] },
+ 'show' => sub { print "$loader\n"; exit 0 },
+ 'default=s' => sub { push @todo, [ 'default', $_[1] ] },
+ 'add-option=s' => sub { push @todo, [ 'add-option', $_[1] ] },
+ 'del-option=s' => sub { push @todo, [ 'del-option', $_[1] ] },
+ 'get-option=s' => sub { push @todo, [ 'get-option', $_[1] ] },
+ 'add-kernel=s{2,3}' => \@opt_add_kernel,
+ 'remove-kernel=s{1,3}' => \@opt_remove_kernel,
+ 'version' => sub { print "$VERSION\n"; exit 0 },
+ 'help' => sub { pbl_usage 0 },
) || pbl_usage 1;
+
+ push @todo, [ "add-kernel", @opt_add_kernel ] if @opt_add_kernel;
+ push @todo, [ "remove-kernel", @opt_remove_kernel ] if @opt_remove_kernel;
+}
+
+if($program eq 'bootloader_entry') {
+ if($ARGV[0] =~ /^(add|remove)$/ && @ARGV == 5) {
+ push @todo, [ "$ARGV[0]-kernel", @ARGV[2..4] ]
+ }
+ else {
+ bootloader_entry_usage 1;
+ }
}
log_msg(1, join(' ', ($0, @ARGV)));
@@ -289,12 +327,14 @@
if(-d "$pbl_dir/$loader") {
for (@todo) {
my @cmd = @{$_};
+ my $opt = $cmd[0];
$cmd[0] = "$pbl_dir/$loader/$cmd[0]";
if(-x $cmd[0]) {
$exit_code = run_command(@cmd) || $exit_code;
}
else {
log_msg(1, "$cmd[0] skipped");
+ print "Option --$opt not available for $loader.\n";
}
}
}
@@ -305,4 +345,3 @@
}
exit $exit_code;
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-0.939/systemd-boot/add-kernel
new/perl-Bootloader-0.940/systemd-boot/add-kernel
--- old/perl-Bootloader-0.939/systemd-boot/add-kernel 1970-01-01
01:00:00.000000000 +0100
+++ new/perl-Bootloader-0.940/systemd-boot/add-kernel 2022-12-05
19:34:40.000000000 +0100
@@ -0,0 +1,22 @@
+#! /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
+#
+
+# usage: add-kernel KERNEL-VERSION KERNEL-FILE [INITRD-FILE]
+#
+# Add kernel/initrd to boot config.
+
+err=0
+if [ -x /usr/bin/kernel-install ] ; then
+ ( set -x ; kernel-install add $* ) || err=1
+else
+ echo "kernel-install: command not found"
+ err=1
+fi
+
+exit $err
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-0.939/systemd-boot/config
new/perl-Bootloader-0.940/systemd-boot/config
--- old/perl-Bootloader-0.939/systemd-boot/config 1970-01-01
01:00:00.000000000 +0100
+++ new/perl-Bootloader-0.940/systemd-boot/config 2022-12-05
19:34:40.000000000 +0100
@@ -0,0 +1,10 @@
+#! /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
+#
+
+echo "nothing to do, really"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-0.939/systemd-boot/install
new/perl-Bootloader-0.940/systemd-boot/install
--- old/perl-Bootloader-0.939/systemd-boot/install 1970-01-01
01:00:00.000000000 +0100
+++ new/perl-Bootloader-0.940/systemd-boot/install 2022-12-05
19:34:40.000000000 +0100
@@ -0,0 +1,18 @@
+#! /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
+#
+
+err=0
+if [ -x /usr/bin/bootctl ] ; then
+ ( set -x ; bootctl --make-machine-id-directory=yes install ) || err=1
+else
+ echo "bootctl: command not found"
+ err=1
+fi
+
+exit $err
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-0.939/systemd-boot/remove-kernel
new/perl-Bootloader-0.940/systemd-boot/remove-kernel
--- old/perl-Bootloader-0.939/systemd-boot/remove-kernel 1970-01-01
01:00:00.000000000 +0100
+++ new/perl-Bootloader-0.940/systemd-boot/remove-kernel 2022-12-05
19:34:40.000000000 +0100
@@ -0,0 +1,22 @@
+#! /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
+#
+
+# usage: remove-kernel KERNEL-VERSION [KERNEL-FILE [INITRD-FILE]]
+#
+# Remove kernel/initrd from boot config.
+
+err=0
+if [ -x /usr/bin/kernel-install ] ; then
+ ( set -x ; kernel-install remove $1 ) || err=1
+else
+ echo "kernel-install: command not found"
+ err=1
+fi
+
+exit $err
