Accepting request 1080034 from home:michael-chang:branches:Base:System

- Fix no prep partition error on non-PReP architectures by making the
  prep_loadenv module exclusive to powerpc_ieee1275 platform (bsc#1210489)
  * 0004-Introduce-prep_load_env-command.patch
- Rediff
  * 0005-export-environment-at-start-up.patch
  * 0009-Add-crypttab_entry-to-obviate-the-need-to-input-pass.patch

OBS-URL: https://build.opensuse.org/request/show/1080034
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=449
This commit is contained in:
Michael Chang 2023-04-18 04:15:12 +00:00 committed by Git OBS Bridge
parent d8eda11f25
commit ea9c8438f9
4 changed files with 19 additions and 4 deletions

View File

@ -15,6 +15,9 @@ v2:
To avoid disrupting the boot process with errors, it's important to log
any errors that may occur and always return GRUB_ERR_NONE.
v3:
Making the new module powerpc_ieee1275 specific.
Signed-off-by: Michael Chang <mchang@suse.com>
---
grub-core/Makefile.core.def | 5 +
@ -24,7 +27,7 @@ Signed-off-by: Michael Chang <mchang@suse.com>
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -2624,3 +2624,8 @@
@@ -2624,3 +2624,9 @@
common = lib/libtasn1_wrap/tests/Test_strings.c;
common = lib/libtasn1_wrap/wrap_tests.c;
};
@ -32,6 +35,7 @@ Signed-off-by: Michael Chang <mchang@suse.com>
+module = {
+ name = prep_loadenv;
+ common = commands/prep_loadenv.c;
+ enable = powerpc_ieee1275;
+};
--- /dev/null
+++ b/grub-core/commands/prep_loadenv.c

View File

@ -19,12 +19,13 @@ Signed-off-by: Michael Chang <mchang@suse.com>
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -2617,4 +2617,6 @@
@@ -2628,5 +2628,7 @@
module = {
name = prep_loadenv;
common = commands/prep_loadenv.c;
+ cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
+ cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
enable = powerpc_ieee1275;
};
--- a/grub-core/commands/prep_loadenv.c
+++ b/grub-core/commands/prep_loadenv.c

View File

@ -31,9 +31,9 @@ Signed-off-by: Michael Chang <mchang@suse.com>
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -2643,3 +2643,8 @@
cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
@@ -2633,3 +2633,8 @@
cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
enable = powerpc_ieee1275;
};
+
+module = {

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Apr 18 02:42:23 UTC 2023 - Michael Chang <mchang@suse.com>
- Fix no prep partition error on non-PReP architectures by making the
prep_loadenv module exclusive to powerpc_ieee1275 platform (bsc#1210489)
* 0004-Introduce-prep_load_env-command.patch
- Rediff
* 0005-export-environment-at-start-up.patch
* 0009-Add-crypttab_entry-to-obviate-the-need-to-input-pass.patch
-------------------------------------------------------------------
Tue Apr 11 11:13:26 UTC 2023 - Michael Chang <mchang@suse.com>