[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ed5e80eb626db0c6dd96f5a4c4dbe3fb7cd05fc2
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via ed5e80eb626db0c6dd96f5a4c4dbe3fb7cd05fc2 (commit) from c4f03017a51e50f1a445e4180f44839689b188f1 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit ed5e80eb626db0c6dd96f5a4c4dbe3fb7cd05fc2 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Jan 10 07:22:59 2024 +0100
grub: update to 2.12 (final release version)
this should fix problems on systems installed on xfs
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/aarch64/grub | 57 ++++++++++++++++++++++ config/rootfiles/common/riscv64/grub | 57 ++++++++++++++++++++++ config/rootfiles/common/x86_64/grub | 57 ++++++++++++++++++++++ .../124 => core/183}/filelists/aarch64/grub | 0 .../182 => core/183}/filelists/riscv64/grub | 0 .../100 => core/183}/filelists/x86_64/grub | 0 config/rootfiles/core/183/update.sh | 4 +- lfs/grub | 8 +-- .../grub/grub-2.12-rc1-fix_bli_bin_sh_path.patch | 9 ---- 9 files changed, 177 insertions(+), 15 deletions(-) copy config/rootfiles/{oldcore/124 => core/183}/filelists/aarch64/grub (100%) copy config/rootfiles/{oldcore/182 => core/183}/filelists/riscv64/grub (100%) copy config/rootfiles/{oldcore/100 => core/183}/filelists/x86_64/grub (100%) delete mode 100644 src/patches/grub/grub-2.12-rc1-fix_bli_bin_sh_path.patch
Difference in files: diff --git a/config/rootfiles/common/aarch64/grub b/config/rootfiles/common/aarch64/grub index ddacba511..274346765 100644 --- a/config/rootfiles/common/aarch64/grub +++ b/config/rootfiles/common/aarch64/grub @@ -509,6 +509,63 @@ usr/share/grub/unicode.pf2 #usr/share/info/grub.info #usr/share/info/grub.info-1 #usr/share/info/grub.info-2 +#usr/share/locale/ast/LC_MESSAGES/grub.mo +#usr/share/locale/ca/LC_MESSAGES/grub.mo +#usr/share/locale/da/LC_MESSAGES/grub.mo +#usr/share/locale/de/LC_MESSAGES/grub.mo +#usr/share/locale/de@hebrew +#usr/share/locale/de@hebrew/LC_MESSAGES +#usr/share/locale/de@hebrew/LC_MESSAGES/grub.mo +#usr/share/locale/de_CH +#usr/share/locale/de_CH/LC_MESSAGES +#usr/share/locale/de_CH/LC_MESSAGES/grub.mo +#usr/share/locale/en@arabic +#usr/share/locale/en@arabic/LC_MESSAGES +#usr/share/locale/en@arabic/LC_MESSAGES/grub.mo +#usr/share/locale/en@cyrillic +#usr/share/locale/en@cyrillic/LC_MESSAGES +#usr/share/locale/en@cyrillic/LC_MESSAGES/grub.mo +#usr/share/locale/en@greek +#usr/share/locale/en@greek/LC_MESSAGES +#usr/share/locale/en@greek/LC_MESSAGES/grub.mo +#usr/share/locale/en@hebrew +#usr/share/locale/en@hebrew/LC_MESSAGES +#usr/share/locale/en@hebrew/LC_MESSAGES/grub.mo +#usr/share/locale/en@piglatin +#usr/share/locale/en@piglatin/LC_MESSAGES +#usr/share/locale/en@piglatin/LC_MESSAGES/grub.mo +#usr/share/locale/en@quot/LC_MESSAGES/grub.mo +#usr/share/locale/eo/LC_MESSAGES/grub.mo +#usr/share/locale/es/LC_MESSAGES/grub.mo +#usr/share/locale/fi/LC_MESSAGES/grub.mo +#usr/share/locale/fr/LC_MESSAGES/grub.mo +#usr/share/locale/gl/LC_MESSAGES/grub.mo +#usr/share/locale/he/LC_MESSAGES/grub.mo +#usr/share/locale/hr/LC_MESSAGES/grub.mo +#usr/share/locale/hu/LC_MESSAGES/grub.mo +#usr/share/locale/id/LC_MESSAGES/grub.mo +#usr/share/locale/it/LC_MESSAGES/grub.mo +#usr/share/locale/ja/LC_MESSAGES/grub.mo +#usr/share/locale/ka/LC_MESSAGES/grub.mo +#usr/share/locale/ko/LC_MESSAGES/grub.mo +#usr/share/locale/lg/LC_MESSAGES/grub.mo +#usr/share/locale/lt/LC_MESSAGES/grub.mo +#usr/share/locale/nb/LC_MESSAGES/grub.mo +#usr/share/locale/nl/LC_MESSAGES/grub.mo +#usr/share/locale/pa/LC_MESSAGES/grub.mo +#usr/share/locale/pl/LC_MESSAGES/grub.mo +#usr/share/locale/pt/LC_MESSAGES/grub.mo +#usr/share/locale/pt_BR/LC_MESSAGES/grub.mo +#usr/share/locale/ro/LC_MESSAGES/grub.mo +#usr/share/locale/ru/LC_MESSAGES/grub.mo +#usr/share/locale/sl/LC_MESSAGES/grub.mo +#usr/share/locale/sr/LC_MESSAGES/grub.mo +#usr/share/locale/sv/LC_MESSAGES/grub.mo +#usr/share/locale/tr/LC_MESSAGES/grub.mo +#usr/share/locale/uk/LC_MESSAGES/grub.mo +#usr/share/locale/vi/LC_MESSAGES/grub.mo +#usr/share/locale/zh_CN/LC_MESSAGES/grub.mo +#usr/share/locale/zh_TW/LC_MESSAGES/grub.mo #usr/share/man/man1/grub-editenv.1 #usr/share/man/man1/grub-file.1 #usr/share/man/man1/grub-fstest.1 diff --git a/config/rootfiles/common/riscv64/grub b/config/rootfiles/common/riscv64/grub index ca262f7d0..4bbe3ed70 100644 --- a/config/rootfiles/common/riscv64/grub +++ b/config/rootfiles/common/riscv64/grub @@ -507,6 +507,63 @@ usr/share/grub/unicode.pf2 #usr/share/info/grub.info #usr/share/info/grub.info-1 #usr/share/info/grub.info-2 +#usr/share/locale/ast/LC_MESSAGES/grub.mo +#usr/share/locale/ca/LC_MESSAGES/grub.mo +#usr/share/locale/da/LC_MESSAGES/grub.mo +#usr/share/locale/de/LC_MESSAGES/grub.mo +#usr/share/locale/de@hebrew +#usr/share/locale/de@hebrew/LC_MESSAGES +#usr/share/locale/de@hebrew/LC_MESSAGES/grub.mo +#usr/share/locale/de_CH +#usr/share/locale/de_CH/LC_MESSAGES +#usr/share/locale/de_CH/LC_MESSAGES/grub.mo +#usr/share/locale/en@arabic +#usr/share/locale/en@arabic/LC_MESSAGES +#usr/share/locale/en@arabic/LC_MESSAGES/grub.mo +#usr/share/locale/en@cyrillic +#usr/share/locale/en@cyrillic/LC_MESSAGES +#usr/share/locale/en@cyrillic/LC_MESSAGES/grub.mo +#usr/share/locale/en@greek +#usr/share/locale/en@greek/LC_MESSAGES +#usr/share/locale/en@greek/LC_MESSAGES/grub.mo +#usr/share/locale/en@hebrew +#usr/share/locale/en@hebrew/LC_MESSAGES +#usr/share/locale/en@hebrew/LC_MESSAGES/grub.mo +#usr/share/locale/en@piglatin +#usr/share/locale/en@piglatin/LC_MESSAGES +#usr/share/locale/en@piglatin/LC_MESSAGES/grub.mo +#usr/share/locale/en@quot/LC_MESSAGES/grub.mo +#usr/share/locale/eo/LC_MESSAGES/grub.mo +#usr/share/locale/es/LC_MESSAGES/grub.mo +#usr/share/locale/fi/LC_MESSAGES/grub.mo +#usr/share/locale/fr/LC_MESSAGES/grub.mo +#usr/share/locale/gl/LC_MESSAGES/grub.mo +#usr/share/locale/he/LC_MESSAGES/grub.mo +#usr/share/locale/hr/LC_MESSAGES/grub.mo +#usr/share/locale/hu/LC_MESSAGES/grub.mo +#usr/share/locale/id/LC_MESSAGES/grub.mo +#usr/share/locale/it/LC_MESSAGES/grub.mo +#usr/share/locale/ja/LC_MESSAGES/grub.mo +#usr/share/locale/ka/LC_MESSAGES/grub.mo +#usr/share/locale/ko/LC_MESSAGES/grub.mo +#usr/share/locale/lg/LC_MESSAGES/grub.mo +#usr/share/locale/lt/LC_MESSAGES/grub.mo +#usr/share/locale/nb/LC_MESSAGES/grub.mo +#usr/share/locale/nl/LC_MESSAGES/grub.mo +#usr/share/locale/pa/LC_MESSAGES/grub.mo +#usr/share/locale/pl/LC_MESSAGES/grub.mo +#usr/share/locale/pt/LC_MESSAGES/grub.mo +#usr/share/locale/pt_BR/LC_MESSAGES/grub.mo +#usr/share/locale/ro/LC_MESSAGES/grub.mo +#usr/share/locale/ru/LC_MESSAGES/grub.mo +#usr/share/locale/sl/LC_MESSAGES/grub.mo +#usr/share/locale/sr/LC_MESSAGES/grub.mo +#usr/share/locale/sv/LC_MESSAGES/grub.mo +#usr/share/locale/tr/LC_MESSAGES/grub.mo +#usr/share/locale/uk/LC_MESSAGES/grub.mo +#usr/share/locale/vi/LC_MESSAGES/grub.mo +#usr/share/locale/zh_CN/LC_MESSAGES/grub.mo +#usr/share/locale/zh_TW/LC_MESSAGES/grub.mo #usr/share/man/man1/grub-editenv.1 #usr/share/man/man1/grub-file.1 #usr/share/man/man1/grub-fstest.1 diff --git a/config/rootfiles/common/x86_64/grub b/config/rootfiles/common/x86_64/grub index 665c0e223..548c40a1f 100644 --- a/config/rootfiles/common/x86_64/grub +++ b/config/rootfiles/common/x86_64/grub @@ -1182,6 +1182,63 @@ usr/share/grub/unicode.pf2 #usr/share/info/grub.info #usr/share/info/grub.info-1 #usr/share/info/grub.info-2 +#usr/share/locale/ast/LC_MESSAGES/grub.mo +#usr/share/locale/ca/LC_MESSAGES/grub.mo +#usr/share/locale/da/LC_MESSAGES/grub.mo +#usr/share/locale/de/LC_MESSAGES/grub.mo +#usr/share/locale/de@hebrew +#usr/share/locale/de@hebrew/LC_MESSAGES +#usr/share/locale/de@hebrew/LC_MESSAGES/grub.mo +#usr/share/locale/de_CH +#usr/share/locale/de_CH/LC_MESSAGES +#usr/share/locale/de_CH/LC_MESSAGES/grub.mo +#usr/share/locale/en@arabic +#usr/share/locale/en@arabic/LC_MESSAGES +#usr/share/locale/en@arabic/LC_MESSAGES/grub.mo +#usr/share/locale/en@cyrillic +#usr/share/locale/en@cyrillic/LC_MESSAGES +#usr/share/locale/en@cyrillic/LC_MESSAGES/grub.mo +#usr/share/locale/en@greek +#usr/share/locale/en@greek/LC_MESSAGES +#usr/share/locale/en@greek/LC_MESSAGES/grub.mo +#usr/share/locale/en@hebrew +#usr/share/locale/en@hebrew/LC_MESSAGES +#usr/share/locale/en@hebrew/LC_MESSAGES/grub.mo +#usr/share/locale/en@piglatin +#usr/share/locale/en@piglatin/LC_MESSAGES +#usr/share/locale/en@piglatin/LC_MESSAGES/grub.mo +#usr/share/locale/en@quot/LC_MESSAGES/grub.mo +#usr/share/locale/eo/LC_MESSAGES/grub.mo +#usr/share/locale/es/LC_MESSAGES/grub.mo +#usr/share/locale/fi/LC_MESSAGES/grub.mo +#usr/share/locale/fr/LC_MESSAGES/grub.mo +#usr/share/locale/gl/LC_MESSAGES/grub.mo +#usr/share/locale/he/LC_MESSAGES/grub.mo +#usr/share/locale/hr/LC_MESSAGES/grub.mo +#usr/share/locale/hu/LC_MESSAGES/grub.mo +#usr/share/locale/id/LC_MESSAGES/grub.mo +#usr/share/locale/it/LC_MESSAGES/grub.mo +#usr/share/locale/ja/LC_MESSAGES/grub.mo +#usr/share/locale/ka/LC_MESSAGES/grub.mo +#usr/share/locale/ko/LC_MESSAGES/grub.mo +#usr/share/locale/lg/LC_MESSAGES/grub.mo +#usr/share/locale/lt/LC_MESSAGES/grub.mo +#usr/share/locale/nb/LC_MESSAGES/grub.mo +#usr/share/locale/nl/LC_MESSAGES/grub.mo +#usr/share/locale/pa/LC_MESSAGES/grub.mo +#usr/share/locale/pl/LC_MESSAGES/grub.mo +#usr/share/locale/pt/LC_MESSAGES/grub.mo +#usr/share/locale/pt_BR/LC_MESSAGES/grub.mo +#usr/share/locale/ro/LC_MESSAGES/grub.mo +#usr/share/locale/ru/LC_MESSAGES/grub.mo +#usr/share/locale/sl/LC_MESSAGES/grub.mo +#usr/share/locale/sr/LC_MESSAGES/grub.mo +#usr/share/locale/sv/LC_MESSAGES/grub.mo +#usr/share/locale/tr/LC_MESSAGES/grub.mo +#usr/share/locale/uk/LC_MESSAGES/grub.mo +#usr/share/locale/vi/LC_MESSAGES/grub.mo +#usr/share/locale/zh_CN/LC_MESSAGES/grub.mo +#usr/share/locale/zh_TW/LC_MESSAGES/grub.mo #usr/share/man/man1/grub-editenv.1 #usr/share/man/man1/grub-file.1 #usr/share/man/man1/grub-fstest.1 diff --git a/config/rootfiles/core/183/filelists/aarch64/grub b/config/rootfiles/core/183/filelists/aarch64/grub new file mode 120000 index 000000000..40ae85fb6 --- /dev/null +++ b/config/rootfiles/core/183/filelists/aarch64/grub @@ -0,0 +1 @@ +../../../../common/aarch64/grub \ No newline at end of file diff --git a/config/rootfiles/core/183/filelists/riscv64/grub b/config/rootfiles/core/183/filelists/riscv64/grub new file mode 120000 index 000000000..7013c0be5 --- /dev/null +++ b/config/rootfiles/core/183/filelists/riscv64/grub @@ -0,0 +1 @@ +../../../../common/riscv64/grub \ No newline at end of file diff --git a/config/rootfiles/core/183/filelists/x86_64/grub b/config/rootfiles/core/183/filelists/x86_64/grub new file mode 120000 index 000000000..78d3bd784 --- /dev/null +++ b/config/rootfiles/core/183/filelists/x86_64/grub @@ -0,0 +1 @@ +../../../../common/x86_64/grub \ No newline at end of file diff --git a/config/rootfiles/core/183/update.sh b/config/rootfiles/core/183/update.sh index 6ff84387f..0dbd6445f 100644 --- a/config/rootfiles/core/183/update.sh +++ b/config/rootfiles/core/183/update.sh @@ -17,7 +17,7 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2023 IPFire-Team info@ipfire.org. # +# Copyright (C) 2024 IPFire-Team info@ipfire.org. # # # ############################################################################ # @@ -149,7 +149,7 @@ sendprofile
# Update grub config to display new core version if [ -e /boot/grub/grub.cfg ]; then - grub-mkconfig -o /boot/grub/grub.cfg +<------>/usr/bin/install-bootloader fi
sync diff --git a/lfs/grub b/lfs/grub index 2db76c627..bcc6ac4ab 100644 --- a/lfs/grub +++ b/lfs/grub @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2024 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 2.12-rc1 +VER = 2.12
THISAPP = grub-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -61,7 +61,7 @@ objects = $(DL_FILE) \ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) unifont-7.0.03.pcf.gz = $(DL_FROM)/unifont-7.0.03.pcf.gz
-$(DL_FILE)_BLAKE2 = 3ada3d51b8cbae260b8ddeb249d8529f273ca578e5361a24988e6e1bf5ef405e507831862dfcefd35ee1c26068cbdc38eda7a04fe1cec378e945e08c5b00d891 +$(DL_FILE)_BLAKE2 = a678f7fafb945d325c8cf47aa086f48357a8f6335b762f77038c30a3896b3b05491598d9931d5335841d224fffcbe4a9a43ca1479057c1f1ce52b8d2a952c431 unifont-7.0.03.pcf.gz_BLAKE2 = fb96c1786fcc8c77796c90ce30a2b7d544013bd62cedbf7b027e1894fe75cdbd2044717796cb0e3150db1457fcb58076491d9c0b855621b652fb9a52c0793469
install : $(TARGET) @@ -94,7 +94,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) $(DIR_APP_EFI) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub/grub-2.06-remove_os_prober_disabled_warning.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub/grub-2.02_disable_vga_fallback.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub/grub-2.12-rc1-fix_bli_bin_sh_path.patch + cd $(DIR_APP) && [ ! -e grub-core/extra_deps.lst ] && echo 'depends bli part_gpt' > grub-core/extra_deps.lst cd $(DIR_APP) && autoreconf -vfi
# Install unifont diff --git a/src/patches/grub/grub-2.12-rc1-fix_bli_bin_sh_path.patch b/src/patches/grub/grub-2.12-rc1-fix_bli_bin_sh_path.patch deleted file mode 100644 index f933f5922..000000000 --- a/src/patches/grub/grub-2.12-rc1-fix_bli_bin_sh_path.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -Naur grub-2.12-rc1.org/util/grub.d/25_bli.in grub-2.12-rc1/util/grub.d/25_bli.in ---- grub-2.12-rc1.org/util/grub.d/25_bli.in 2023-07-10 17:43:48.000000000 +0200 -+++ grub-2.12-rc1/util/grub.d/25_bli.in 2023-11-17 07:07:30.743519612 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/sh -+#!/bin/sh - set -e - - # grub-mkconfig helper script.
hooks/post-receive -- IPFire 2.x development tree
-
Arne Fitzenreiter