Sync from SUSE:ALP:Source:Standard:1.0 perl-Bootloader revision db8b75a00be1463e90aad03fde25a729

This commit is contained in:
Adrian Schröter 2024-10-16 09:16:43 +02:00
parent 39c1f14b98
commit a3a766b1e4
5 changed files with 35 additions and 34 deletions

View File

@ -1,27 +0,0 @@
From eacebfbf81a4bec260341ae02b5cb4e5828a2932 Mon Sep 17 00:00:00 2001
From: Steffen Winterfeldt <wfeldt@opensuse.org>
Date: Thu, 7 Sep 2023 10:43:25 +0200
Subject: [PATCH] bootloader_entry script can have an optional 'force-default'
argument (bsc#1215064)
---
pbl | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pbl b/pbl
index 471c92f..570bafa 100755
--- a/pbl
+++ b/pbl
@@ -300,7 +300,8 @@ if($program eq 'pbl') {
}
if($program eq 'bootloader_entry') {
- if($ARGV[0] =~ /^(add|remove)$/ && @ARGV == 5) {
+ # there might be an optional 6th argument 'force-default'
+ if($ARGV[0] =~ /^(add|remove)$/ && @ARGV >= 5) {
push @todo, [ "$ARGV[0]-kernel", @ARGV[2..4] ]
}
else {
--
2.35.3

BIN
perl-Bootloader-1.6.tar.xz (Stored with Git LFS)

Binary file not shown.

BIN
perl-Bootloader-1.8.2.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,3 +1,33 @@
--------------------------------------------------------------------
Mon Sep 23 12:22:16 UTC 2024 - wfeldt@opensuse.org
- merge gh#openSUSE/perl-bootloader#176
- handle missing grub_installdevice on powerpc (bsc#1230070)
- 1.8.2
- removing patch 0001-bootloader_entry-script-can-have-an-optional-force-d.patch
--------------------------------------------------------------------
Mon Sep 23 12:22:15 UTC 2024 - wfeldt@opensuse.org
- merge gh#openSUSE/perl-bootloader#167
- log grub2-install errors correctly (bsc#1221470)
- 1.8.1
--------------------------------------------------------------------
Mon Sep 23 12:22:14 UTC 2024 - wfeldt@opensuse.org
- merge gh#openSUSE/perl-bootloader#158
- skip warning about unsupported options when in compat mode
- 1.8
--------------------------------------------------------------------
Mon Sep 23 12:22:13 UTC 2024 - wfeldt@opensuse.org
- merge gh#openSUSE/perl-bootloader#156
- bootloader_entry script can have an optional 'force-default'
argument (bsc#1215064)
- 1.7
-------------------------------------------------------------------
Mon Sep 9 07:22:17 UTC 2024 - Marcus Meissner <meissner@suse.com>

View File

@ -25,9 +25,10 @@
%{!?_distconfdir:%global _distconfdir /etc}
Name: perl-Bootloader
Version: 1.6
Version: 1.8.2
Release: 0
Requires: coreutils
Requires: util-linux
Requires: perl-base = %{perl_version}
Obsoletes: perl-Bootloader-YAML < %{version}
Conflicts: kexec-tools < 2.0.26.0
@ -36,8 +37,6 @@ License: GPL-2.0-or-later
Group: System/Boot
URL: https://github.com/openSUSE/perl-bootloader
Source: %{name}-%{version}.tar.xz
# from git
Patch0: 0001-bootloader_entry-script-can-have-an-optional-force-d.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
BuildRequires: rubygem(asciidoctor)
@ -48,7 +47,6 @@ Shell script wrapper for configuring various boot loaders.
%prep
%setup -q
%patch0 -p1
%build