Skip to contentSkip to conversation

build: Fixes to Building from dist Archive

PATCH In review Andrew Hamilton 4 participants 7 messages Jun 11, 2025 – Jun 25, 2025

lore
Share & tools
lore
#0 lore raw

cover build: Fixes to Building from dist Archive

Fix several issues with attempting to create and build from the GRUB 'dist' archive.

1. extra_deps.lst is now automatically generated so remove this from the archive to avoid a dependency on running make first.

2. Add additional header files to the dist archive.

The first patch is a resend of Mike Gilbert's from:
https://mail.gnu.org/archive/html/grub-devel/2025-03/msg00223.html

Testing performed:
./bootstrap
./configure
make dist
Built generated tar.gz with buildroot and confirmed success for x86-64.

Andrew Hamilton (2):
build: remove extra_deps.lst from EXTRA_DIST
build: Add new header files to dist to allow building from tar

 conf/Makefile.extra-dist | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Signature · 7 lines
2.39.5


_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
#1 lore raw

PATCH 1/2 build: remove extra_deps.lst from EXTRA_DIST

This file is auto-generated based on the selected platform and should not be included in the source tarball.

Fixes 6744840b (build: Track explicit module dependencies in Makefile.core.def)
---
 conf/Makefile.extra-dist | 1 -
 1 file changed, 1 deletion(-)
conf/Makefile.extra-dist +0 -1
index d9e2b8cc7..5e7126f98 100644
@@ -21,7 +21,6 @@ EXTRA_DIST += conf/i386-cygwin-img-ld.sc
 EXTRA_DIST += grub-core/Makefile.core.def
 EXTRA_DIST += grub-core/Makefile.gcry.def
 
-EXTRA_DIST += grub-core/extra_deps.lst
 EXTRA_DIST += grub-core/genmoddep.awk
 EXTRA_DIST += grub-core/genmod.sh.in
 EXTRA_DIST += grub-core/gensyminfo.sh.in
Signature · 7 lines
2.39.5


_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
#2 lore raw

PATCH 2/2 build: Add new header files to dist to allow building from tar

In reply to Andrew Hamilton

Several new header files have been added to GRUB which need to be manually added to the dist archive. This allows building from the tar archive created by 'make dist'.

---
 conf/Makefile.extra-dist | 3 +++
 1 file changed, 3 insertions(+)
conf/Makefile.extra-dist +3 -0
index 5e7126f98..b61052a18 100644
@@ -35,6 +35,9 @@ EXTRA_DIST += grub-core/lib/libgcrypt-grub/mpi/generic
 EXTRA_DIST += $(shell find $(top_srcdir)/include -name '*.h')
 EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/lib -name '*.h')
 EXTRA_DIST += grub-core/efiemu/runtime/config.h
+EXTRA_DIST += grub-core/tests/asn1/asn1_test.h
+EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/tests/asn1/tests -name '*.h')
+EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/commands/tpm2_key_protector -name '*.h')
 
 EXTRA_DIST += grub-core/lib/LzmaDec.c
 
Signature · 7 lines
2.39.5


_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
#3 lore raw
In reply to Andrew Hamilton
Quoted 18 lines · Andrew Hamilton

Fix several issues with attempting to create and build from the GRUB 'dist' archive.

1. extra_deps.lst is now automatically generated so remove this from the archive to avoid a dependency on running make first.

2. Add additional header files to the dist archive.

The first patch is a resend of Mike Gilbert's from:
https://mail.gnu.org/archive/html/grub-devel/2025-03/msg00223.html

Testing performed:
./bootstrap
./configure
make dist
Built generated tar.gz with buildroot and confirmed success for x86-64.

Quoted 3 lines

Andrew Hamilton (2):
build: remove extra_deps.lst from EXTRA_DIST
build: Add new header files to dist to allow building from tar

For both patches Reviewed-by: Daniel Kiper <[email protected]>...

Daniel

_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel

#4 lore raw
In reply to Andrew Hamilton
Quoted 11 lines · Andrew Hamilton

Fix several issues with attempting to create and build from the GRUB 'dist' archive.

1. extra_deps.lst is now automatically generated so remove this from the archive to avoid a dependency on running make first.

2. Add additional header files to the dist archive.

The first patch is a resend of Mike Gilbert's from:
https://mail.gnu.org/archive/html/grub-devel/2025-03/msg00223.html

Thanks for getting this merged; I am at a loss as to why my patch was ignored for months.

In the future, please maintain the Author when resending patches from other people.

_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel

#5 lore raw

Apologies, my mistake.

Thanks,
Andrew

Quoted 11 lines · Mike Gilbert
Quoted 9 lines · Andrew Hamilton

Fix several issues with attempting to create and build from the GRUB 'dist' archive.

1. extra_deps.lst is now automatically generated so remove this from the archive to avoid a dependency on running make first.

2. Add additional header files to the dist archive.

Quoted 9 lines
Quoted 2 lines

The first patch is a resend of Mike Gilbert's from:
https://mail.gnu.org/archive/html/grub-devel/2025-03/msg00223.html

Thanks for getting this merged; I am at a loss as to why my patch was ignored for months.

In the future, please maintain the Author when resending patches from other people.

_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel

#6 lore raw
In reply to Mike Gilbert
Quoted 8 lines · Mike Gilbert
Quoted 7 lines · Andrew Hamilton

Fix several issues with attempting to create and build from the GRUB 'dist' archive.

1. extra_deps.lst is now automatically generated so remove this from the archive to avoid a dependency on running make first.

Quoted 7 lines
Quoted 4 lines

2. Add additional header files to the dist archive.

The first patch is a resend of Mike Gilbert's from:
https://mail.gnu.org/archive/html/grub-devel/2025-03/msg00223.html

Thanks for getting this merged; I am at a loss as to why my patch was ignored for months.

Sorry, it was not intentional. Simply fallen through the cracks...

Daniel

_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel