emit EXTRA_DIST unconditionally so tarball does not depend on configured platform
PATCH 1/1 emit EXTRA_DIST unconditionally so tarball does not depend on configured platform
Currently extra_dist sources are emitted under enabled platform conditions. So if module/image/... is not enabled for every platform, extra_dist files will not be included in tarball during "make dist" if module is not enabled for currently configured platform. As example, attempt to build i386-pc from tarball created under x86_64-efi fails with:
make[3]: Entering directory `/home/bor/build/grub/grub-2.00/grub-core'
gcc -DHAVE_CONFIG_H -I. -I.. -Wall -W -I../include -I../include -DGRUB_MACHINE_PCBIOS=1 -DGRUB_MACHINE=I386_PC -DGRUB_TARGET_CPU_I386=1 -m32 -nostdinc -isystem /usr/lib64/gcc/x86_64-suse-linux/4.7/include -DGRUB_FILE=\"efiemu/loadcore32.c\" ... -c -o efiemu/efiemu_module-loadcore32.o test -f 'efiemu/loadcore32.c' || echo './'efiemu/loadcore32.c efiemu/loadcore32.c:22:22: fatal error: loadcore.c: No such file or directory
compilation terminated.
Change gentpl.py to emit dist_noinst_DATA instead. Automake collects them even when assignment is under false condition, so it ensures tarball always includes the same files on every platform.
It also changes data to emit dist_<directory>_DATA instead of using EXTRA_DIST.
--- conf/Makefile.common | 2 +- gentpl.py | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-)
conf/Makefile.common +1 -1
@@ -151,7 +151,7 @@ bin_PROGRAMS = platform_DATA = sbin_PROGRAMS = check_SCRIPTS = -grubconf_DATA = +dist_grubconf_DATA = check_PROGRAMS = noinst_SCRIPTS = noinst_PROGRAMS =
gentpl.py +7 -8
@@ -382,7 +382,7 @@ def module(platform): r += var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_MODULE) " + platform_ccasflags(platform)) # r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform)) - r += gvar_add("EXTRA_DIST", extra_dist()) + r += gvar_add("dist_noinst_DATA", extra_dist()) r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)") r += gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)")
@@ -410,7 +410,7 @@ def kernel(platform): r += var_set(cname() + "_STRIPFLAGS", "$(AM_STRIPFLAGS) $(STRIPFLAGS_KERNEL) " + platform_stripflags(platform)) # r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform)) - r += gvar_add("EXTRA_DIST", extra_dist()) + r += gvar_add("dist_noinst_DATA", extra_dist()) r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)") r += gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)")
@@ -443,7 +443,7 @@ def image(platform): r += var_set(cname() + "_OBJCOPYFLAGS", "$(OBJCOPYFLAGS_IMAGE) " + platform_objcopyflags(platform)) # r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform)) - r += gvar_add("EXTRA_DIST", extra_dist()) + r += gvar_add("dist_noinst_DATA", extra_dist()) r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)") r += gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)")
@@ -476,7 +476,7 @@ def library(platform): r += var_add(cname() + "_CCASFLAGS", first_time("$(AM_CCASFLAGS) $(CCASFLAGS_LIBRARY) ") + platform_ccasflags(platform)) # r += var_add(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform)) - r += gvar_add("EXTRA_DIST", extra_dist()) + r += gvar_add("dist_noinst_DATA", extra_dist()) r += first_time(gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)")) r += first_time(gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)")) return r
@@ -515,15 +515,14 @@ def program(platform, test=False): r += var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM) " + platform_ccasflags(platform)) # r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform)) - r += gvar_add("EXTRA_DIST", extra_dist()) + r += gvar_add("dist_noinst_DATA", extra_dist()) r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)") r += gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)") return r def data(platform): - r = gvar_add("EXTRA_DIST", platform_sources(platform)) - r += gvar_add("EXTRA_DIST", extra_dist()) - r += var_add(installdir() + "_DATA", platform_sources(platform)) + r = var_add("dist_" + installdir() + "_DATA", platform_sources(platform)) + r += gvar_add("dist_noinst_DATA", extra_dist()) return r def script(platform):
Signature · 1 line
tg: (936f633..) u/extra_dist (depends on: master)
Quoted 6 lines · Andrey Borzenkov
Currently
extra_distsources are emitted under enabled platform conditions. So if module/image/... is not enabled for every platform,extra_distfiles will not be included in tarball during "make dist" if module is not enabled for currently configured platform. As example, attempt to build i386-pc from tarball created under x86_64-efi fails with:
Quoted 9 lines
make[3]: Entering directory `/home/bor/build/grub/grub-2.00/grub-core'
gcc -DHAVE_CONFIG_H -I. -I.. -Wall -W -I../include -I../include -DGRUB_MACHINE_PCBIOS=1 -DGRUB_MACHINE=I386_PC -DGRUB_TARGET_CPU_I386=1 -m32 -nostdinc -isystem/usr/lib64/gcc/x86_64-suse-linux/4.7/include-DGRUB_FILE=\"efiemu/loadcore32.c\" ... -c -oefiemu/efiemu_module-loadcore32.otest -f 'efiemu/loadcore32.c' || echo './'efiemu/loadcore32.cefiemu/loadcore32.c:22:22: fatal error:loadcore.c: No such file or directory
compilation terminated.Change
gentpl.pyto emitdist_noinst_DATAinstead. Automake collects them even when assignment is under false condition, so it ensures tarball always includes the same files on every platform.
Go ahead.
Quoted 81 lines
It also changes data to emit dist_<directory>_DATA instead of using
EXTRA_DIST.Signed-off-by Andrey Borzenkov <[email protected]>--- conf/Makefile.common | 2 +- gentpl.py | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-)conf/Makefile.common +1
-1@@ -151,7 +151,7 @@ bin_PROGRAMS = platform_DATA = sbin_PROGRAMS = check_SCRIPTS = -grubconf_DATA = +dist_grubconf_DATA = check_PROGRAMS = noinst_SCRIPTS = noinst_PROGRAMS =gentpl.py +7
-8@@ -382,7 +382,7 @@ def module(platform): r += var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_MODULE) " + platform_ccasflags(platform)) # r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform)) - r += gvar_add("EXTRA_DIST", extra_dist()) + r += gvar_add("dist_noinst_DATA", extra_dist()) r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)") r += gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)")@@ -410,7 +410,7 @@ def kernel(platform): r += var_set(cname() + "_STRIPFLAGS", "$(AM_STRIPFLAGS) $(STRIPFLAGS_KERNEL) " + platform_stripflags(platform)) # r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform)) - r += gvar_add("EXTRA_DIST", extra_dist()) + r += gvar_add("dist_noinst_DATA", extra_dist()) r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)") r += gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)")@@ -443,7 +443,7 @@ def image(platform): r += var_set(cname() + "_OBJCOPYFLAGS", "$(OBJCOPYFLAGS_IMAGE) " + platform_objcopyflags(platform)) # r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform)) - r += gvar_add("EXTRA_DIST", extra_dist()) + r += gvar_add("dist_noinst_DATA", extra_dist()) r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)") r += gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)")@@ -476,7 +476,7 @@ def library(platform): r += var_add(cname() + "_CCASFLAGS", first_time("$(AM_CCASFLAGS) $(CCASFLAGS_LIBRARY) ") + platform_ccasflags(platform)) # r += var_add(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform)) - r += gvar_add("EXTRA_DIST", extra_dist()) + r += gvar_add("dist_noinst_DATA", extra_dist()) r += first_time(gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)")) r += first_time(gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)")) return r@@ -515,15 +515,14 @@ def program(platform, test=False): r += var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM) " + platform_ccasflags(platform)) # r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform)) - r += gvar_add("EXTRA_DIST", extra_dist()) + r += gvar_add("dist_noinst_DATA", extra_dist()) r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)") r += gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)") return r def data(platform): - r = gvar_add("EXTRA_DIST", platform_sources(platform)) - r += gvar_add("EXTRA_DIST", extra_dist()) - r += var_add(installdir() + "_DATA", platform_sources(platform)) + r = var_add("dist_" + installdir() + "_DATA", platform_sources(platform)) + r += gvar_add("dist_noinst_DATA", extra_dist()) return r def script(platform):