Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (f9dedf362201356f90b6e279c674586b689936f1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (f9dedf362201356f90b6e279c674586b689936f1)
  • Date: Wed, 4 Jun 2025 07:46:20 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

disk/grub2/HISTORY
| 6 +
disk/grub2/PRE_BUILD
| 2

disk/grub2/patches/0001-Revert-grub-core-genmoddep.awk-Ensure-output-is-dete.patch
| 35 ++++++++++
3 files changed, 42 insertions(+), 1 deletion(-)

New commits:
commit f9dedf362201356f90b6e279c674586b689936f1
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

grub2: Fix build with mawk

diff --git a/disk/grub2/HISTORY b/disk/grub2/HISTORY
index eeb363d..f1ea4c4 100644
--- a/disk/grub2/HISTORY
+++ b/disk/grub2/HISTORY
@@ -1,4 +1,8 @@
-2025-02=07 Treeve Jelbert <treeve AT sourcemage.org>
+2025-06-04 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD,
patches/0001-Revert-grub-core-genmoddep.awk-Ensure-output-is-dete.patch:
+ fixed build with mawk
+
+2025-02-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.12
* grub2-ignore_ext4_checksum_seed_feature.patch: deleted
* PRE_BUILD: tweak
diff --git a/disk/grub2/PRE_BUILD b/disk/grub2/PRE_BUILD
index 9696c57..e199974 100755
--- a/disk/grub2/PRE_BUILD
+++ b/disk/grub2/PRE_BUILD
@@ -1,5 +1,7 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&
+apply_patch_dir patches &&
+
# suggested by blfs
echo depends bli part_gpt > grub-core/extra_deps.lst &&

diff --git
a/disk/grub2/patches/0001-Revert-grub-core-genmoddep.awk-Ensure-output-is-dete.patch

b/disk/grub2/patches/0001-Revert-grub-core-genmoddep.awk-Ensure-output-is-dete.patch
new file mode 100644
index 0000000..284c7a9
--- /dev/null
+++
b/disk/grub2/patches/0001-Revert-grub-core-genmoddep.awk-Ensure-output-is-dete.patch
@@ -0,0 +1,35 @@
+From ab5825c71cb90ed6133c505608a6553b582ab72f Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <iluceno AT iodev.co.uk>
+Date: Wed, 4 Jun 2025 09:38:10 +0200
+Subject: [PATCH] Revert "grub-core/genmoddep.awk: Ensure output is
+ deterministic"
+
+The code is not portable; only works with GNU AWK.
+
+This reverts commit 87648e9c12a32bddb005b899edc44c2c9c63df82.
+
+Origin: Source Mage
+Upstream-Status: Pending
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ grub-core/genmoddep.awk | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/grub-core/genmoddep.awk b/grub-core/genmoddep.awk
+index ab457cb2b564..b61b0b9eaed9 100644
+--- a/grub-core/genmoddep.awk
++++ b/grub-core/genmoddep.awk
+@@ -63,9 +63,7 @@ END {
+ }
+ modlist = ""
+ depcount[mod] = 0
+- n = asorti(uniqmods, w)
+- for (i = 1; i <= n; i++) {
+- depmod = w[i]
++ for (depmod in uniqmods) {
+ modlist = modlist " " depmod;
+ inverse_dependencies[depmod] = inverse_dependencies[depmod] " " mod
+ depcount[mod]++
+--
+2.49.0
+


  • [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (f9dedf362201356f90b6e279c674586b689936f1), Ismael Luceno, 06/04/2025

Archive powered by MHonArc 2.6.24.

Top of Page