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-01-15 17:57:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Bootloader (Old)
and /work/SRC/openSUSE:Factory/.perl-Bootloader.new.32243 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Bootloader"
Sun Jan 15 17:57:38 2023 rev:203 rq:1058049 version:0.941
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Bootloader/perl-Bootloader.changes
2022-12-06 14:22:48.457386421 +0100
+++
/work/SRC/openSUSE:Factory/.perl-Bootloader.new.32243/perl-Bootloader.changes
2023-01-15 17:57:40.366027216 +0100
@@ -1,0 +2,7 @@
+Thu Jan 12 17:30:54 UTC 2023 - [email protected]
+
+- merge gh#openSUSE/perl-bootloader#141
+- systemd-boot: easier initial setup
+- 0.941
+
+--------------------------------------------------------------------
Old:
----
perl-Bootloader-0.940.tar.xz
New:
----
perl-Bootloader-0.941.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Bootloader.spec ++++++
--- /var/tmp/diff_new_pack.vi7r4J/_old 2023-01-15 17:57:42.766041461 +0100
+++ /var/tmp/diff_new_pack.vi7r4J/_new 2023-01-15 17:57:42.770041485 +0100
@@ -1,7 +1,7 @@
#
# spec file for package perl-Bootloader
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@
%endif
Name: perl-Bootloader
-Version: 0.940
+Version: 0.941
Release: 0
Requires: coreutils
Requires: perl-base = %{perl_version}
++++++ perl-Bootloader-0.940.tar.xz -> perl-Bootloader-0.941.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-0.940/VERSION
new/perl-Bootloader-0.941/VERSION
--- old/perl-Bootloader-0.940/VERSION 2022-12-05 19:34:40.000000000 +0100
+++ new/perl-Bootloader-0.941/VERSION 2023-01-12 18:30:54.000000000 +0100
@@ -1 +1 @@
-0.940
+0.941
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-0.940/changelog
new/perl-Bootloader-0.941/changelog
--- old/perl-Bootloader-0.940/changelog 2022-12-05 19:34:40.000000000 +0100
+++ new/perl-Bootloader-0.941/changelog 2023-01-12 18:30:54.000000000 +0100
@@ -1,3 +1,7 @@
+2023-01-12: 0.941
+ - merge gh#openSUSE/perl-bootloader#141
+ - systemd-boot: easier initial setup
+
2022-12-05: 0.940
- merge gh#openSUSE/perl-bootloader#140
- add basic support for systemd-boot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-0.940/pbl
new/perl-Bootloader-0.941/pbl
--- old/perl-Bootloader-0.940/pbl 2022-12-05 19:34:40.000000000 +0100
+++ new/perl-Bootloader-0.941/pbl 2023-01-12 18:30:54.000000000 +0100
@@ -60,16 +60,17 @@
Options:
--install Install boot loader.
--config Create boot loader config.
- --show Print current boot loader name.
+ --show Print current boot loader.
+ --loader BOOTLOADER Set current boot loader to BOOTLOADER.
--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
+ --add-kernel VERSION [KERNEL [INITRD]]
+ Add kernel with version VERSION. Optionally
pass kernel and initrd
explicitly (systemd-boot).
- --remove-kernel VERSION [FILE [INITRD]]
- Remove kernel with version VERSION. Optionally
specify kernel and initrd
+ --remove-kernel VERSION [KERNEL [INITRD]]
+ Remove kernel with version VERSION. Optionally
pass kernel and initrd
explicitly (systemd-boot).
--log LOGFILE Log messages to LOGFILE (default:
/var/log/pbl.log)
--version Show pbl version.
@@ -281,11 +282,12 @@
'install' => sub { push @todo, [ 'install' ] },
'config' => sub { push @todo, [ 'config' ] },
'show' => sub { print "$loader\n"; exit 0 },
+ 'loader=s' => sub { system "perl -pi -e
's/^(LOADER_TYPE=)\\S+/\$1\"$_[1]\"/' /etc/sysconfig/bootloader" ; 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,
+ 'add-kernel=s{1,3}' => \@opt_add_kernel,
'remove-kernel=s{1,3}' => \@opt_remove_kernel,
'version' => sub { print "$VERSION\n"; exit 0 },
'help' => sub { pbl_usage 0 },
@@ -324,7 +326,7 @@
unshift @todo, [ 'install' ] if grep { /^--reinit$/ } @ARGV;
}
-if(-d "$pbl_dir/$loader") {
+if(-d "$pbl_dir/$loader" || $program eq "pbl") {
for (@todo) {
my @cmd = @{$_};
my $opt = $cmd[0];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-0.940/systemd-boot/add-kernel
new/perl-Bootloader-0.941/systemd-boot/add-kernel
--- old/perl-Bootloader-0.940/systemd-boot/add-kernel 2022-12-05
19:34:40.000000000 +0100
+++ new/perl-Bootloader-0.941/systemd-boot/add-kernel 2023-01-12
18:30:54.000000000 +0100
@@ -7,13 +7,50 @@
# bootloader, language
#
-# usage: add-kernel KERNEL-VERSION KERNEL-FILE [INITRD-FILE]
+# 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
+ version=$1
+ kernel=$2
+ initrd=$3
+
+ if [[ -z "$kernel" ]] ; then
+ for i in vmlinuz Image image vmlinux ; do
+ if [[ -f "/boot/$i-$version" && -f "/boot/initrd-$version" ]] ; then
+ kernel="/boot/$i-$version"
+ initrd="/boot/initrd-$version"
+ break
+ elif [[ -f "/usr/lib/modules/$version/$i" ]] ; then
+ kernel="/usr/lib/modules/$version/$i"
+ break
+ fi
+ done
+ elif [[ ! "$kernel" =~ / && -f "/boot/$kernel" ]] ; then
+ kernel="/boot/$kernel"
+ fi
+
+ if [[ -z "$kernel" ]] ; then
+ echo "kernel version \"$version\" not found"
+ exit 2
+ fi
+
+ if [[ -z "$initrd" ]] ; then
+ if [[ "$kernel" =~ / ]] ; then
+ dir=$(dirname $kernel)
+ k=$(basename $kernel)
+ i=initrd-${k#*-}
+ if [[ "$k" =~ - && -f "$dir/$i" ]] ; then
+ initrd="$dir/$i"
+ fi
+ fi
+ elif [[ ! "$initrd" =~ / && -f "/boot/$initrd" ]] ; then
+ initrd="/boot/$initrd"
+ fi
+
+ ( set -x ; kernel-install add $version $kernel $initrd ) || err=1
else
echo "kernel-install: command not found"
err=1
