diff --git a/0213-rpm-sort-add-prereqs-for-declaration-of-strchrnul.patch b/0213-rpm-sort-add-prereqs-for-declaration-of-strchrnul.patch new file mode 100644 index 0000000000000000000000000000000000000000..d2458d0066bb6dcd4fc1836a61752ca22dc72456 --- /dev/null +++ b/0213-rpm-sort-add-prereqs-for-declaration-of-strchrnul.patch @@ -0,0 +1,36 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Robbie Harwood +Date: Thu, 5 May 2022 18:01:05 -0400 +Subject: [PATCH] rpm-sort: add prereqs for declaration of strchrnul() + +Signed-off-by: Robbie Harwood +--- + util/grub-rpm-sort.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/util/grub-rpm-sort.c b/util/grub-rpm-sort.c +index 8345944105..71d038bb69 100644 +--- a/util/grub-rpm-sort.c ++++ b/util/grub-rpm-sort.c +@@ -1,13 +1,17 @@ ++#define _GNU_SOURCE 1 ++ + #include ++ ++#include ++#include ++#include + #include + #include ++#include + #include + #include ++#include + #include +-#include +-#include +-#include +-#include + + static size_t + read_file (const char *input, char **ret) diff --git a/grub.patches b/grub.patches index 0ffa64afd9b901db56a28161644d5f09b95257ff..21f7fab598226b47916416e6c2eef30bbbe69fcb 100644 --- a/grub.patches +++ b/grub.patches @@ -210,5 +210,6 @@ Patch0209: 0209-Update-gnulib-version-and-drop-most-gnulib-patches.patch Patch0210: 0210-commands-search-Fix-bug-stopping-iteration-when-no-f.patch Patch0211: 0211-search-new-efidisk-only-option-on-EFI-systems.patch Patch0212: 0212-efi-new-connectefi-command.patch +patch0213: 0213-rpm-sort-add-prereqs-for-declaration-of-strchrnul.patch Patch1000: 1000-change-to-use-fuse3.patch diff --git a/grub2.spec b/grub2.spec index b48169c5aade934b309b28a6a6050761ae2a81a6..daa1b5bf98236942171271983214184a22b6fcb2 100644 --- a/grub2.spec +++ b/grub2.spec @@ -1,4 +1,4 @@ -%define anolis_release 5 +%define anolis_release 6 %global _lto_cflags %{nil} %undefine _hardened_build @@ -511,6 +511,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Mon Oct 17 2022 Chunmei Xu - 2.06-6 +- fix bls config update failed because of grub-rpm-sort + * Fri Sep 30 2022 mgb01105731 - 2.06-5 - add doc package