[PATCH 0/2] build: Fixes to Building from dist Archive

[PATCH 0/2] build: Fixes to Building from dist Archive

[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.

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(-)

-- 
2.39.5


_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

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

[Andrew Hamilton]

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)
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Signed-off-by: Andrew Hamilton <adhamilt@gmail.com>
---
 conf/Makefile.extra-dist | 1 -
 1 file changed, 1 deletion(-)

diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
index d9e2b8cc7..5e7126f98 100644
--- a/conf/Makefile.extra-dist
+++ b/conf/Makefile.extra-dist
@@ -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
-- 
2.39.5


_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

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

[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'.

Signed-off-by: Andrew Hamilton <adhamilt@gmail.com>
---
 conf/Makefile.extra-dist | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
index 5e7126f98..b61052a18 100644
--- a/conf/Makefile.extra-dist
+++ b/conf/Makefile.extra-dist
@@ -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
 
-- 
2.39.5


_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

Re: [PATCH 0/2] build: Fixes to Building from dist Archive

[Daniel Kiper via Grub-devel]

On Tue, Jun 10, 2025 at 10:15:44PM -0500, Andrew Hamilton wrote:
> 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

For both patches Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>...

Daniel

_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

Re: [PATCH 0/2] build: Fixes to Building from dist Archive

[Mike Gilbert]

On Tue, Jun 10, 2025 at 11:15 PM Andrew Hamilton <adhamilt@gmail.com> wrote:
>
> 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
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

Re: [PATCH 0/2] build: Fixes to Building from dist Archive

[Andrew Hamilton]

[-- Attachment #1.1: Type: text/plain, Size: 841 bytes --]

Apologies, my mistake.

Thanks,
Andrew

On Tue, Jun 24, 2025 at 12:27 PM Mike Gilbert <floppym@gentoo.org> wrote:

> On Tue, Jun 10, 2025 at 11:15 PM Andrew Hamilton <adhamilt@gmail.com>
> wrote:
> >
> > 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.
>

[-- Attachment #1.2: Type: text/html, Size: 1447 bytes --]

[-- Attachment #2: Type: text/plain, Size: 141 bytes --]

_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

Re: [PATCH 0/2] build: Fixes to Building from dist Archive

[Daniel Kiper]

On Tue, Jun 24, 2025 at 01:27:35PM -0400, Mike Gilbert wrote:
> On Tue, Jun 10, 2025 at 11:15 PM Andrew Hamilton <adhamilt@gmail.com> wrote:
> >
> > 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.

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

Daniel

_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel