Skip to contentSkip to conversation

add elfXX.c as extra_dist to grub-core/Makefile.core.def

PATCH In review Andrey Borzenkov 2 participants 3 messages Apr 6, 2013 – Apr 9, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 add elfXX.c as extra_dist to grub-core/Makefile.core.def

[ 327s] gcc -E -DGRUB_LST_GENERATOR -Dgrub_fs_register=FS_LIST_MARKER -Dgrub_video_register=VIDEO_LIST_MARKER -Dgrub_parttool_register=PARTTOOL_LIST_MARKER -Dgrub_partition_map_register=PARTMAP_LIST_MARKER \
'-Dgrub_term_register_input(...)=INPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)' '-Dgrub_term_register_output(...)=OUTPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)' '-Dgrub_register_command(...)=COMMAND_LIST_MARKER(__VA_ARGS__)' '-Dgrub_register_extcmd(...)=EXTCOMMAND_LIST_MARKER(__VA_ARGS__)' '-Dgrub_register_command_p1(...)=P1COMMAND_LIST_MARKER(__VA_ARGS__)' \
-DHAVE_CONFIG_H -I. -I../../grub-core -I.. -Wall -W -I../../include -I../include -DGRUB_MACHINE_EFI=1 -DGRUB_MACHINE=X86_64_EFI -DGRUB_TARGET_CPU_X86_64=1 -m64 -nostdinc -isystem /usr/lib64/gcc/x86_64-suse-linux/4.7/include -DGRUB_FILE=\"kern/elf.c\" -I. -I../../grub-core -I.. -I../.. -I../../include -I../include -I../../grub-core/lib/libgcrypt-grub/include -I../../grub-core/lib/libgcrypt-grub/src/ ../../grub-core/kern/elf.c > elf.marker.new || (rm -f elf.marker; exit 1)
[ 327s] ../../grub-core/kern/elf.c:132:19: fatal error: elfXX.c: No such file or directory

---
 ChangeLog                   | 5 +++++
 grub-core/Makefile.core.def | 2 ++
 2 files changed, 7 insertions(+)
ChangeLog +5 -0
index 9163911..486271b 100644
@@ -1,3 +1,8 @@
+2013-04-07  Andrey Borzenkov <[email protected]>
+
+	* grub-core/Makefile.core.def: Add kern/elfXX.c to elf module
+	as extra_dist.
+
 2013-04-06  Andrey Borzenkov <[email protected]>
 
 	* conf/Makefile.extra-dist (EXTRA_DIST): Add
grub-core/Makefile.core.def +2 -0
index 4b4c024..fece882 100644
@@ -1316,6 +1316,8 @@ module = {
 module = {
   name = elf;
   common = kern/elf.c;
+
+  extra_dist = kern/elfXX.c;
 };
 
 module = {
Signature · 1 line
tg: (a636801..) u/elfXX (depends on: master)
#1 lore raw

В Sun, 7 Apr 2013 00:22:33 +0400
Andrey Borzenkov <[email protected]> пишет:

Quoted 5 lines

[ 327s] gcc -E -DGRUB_LST_GENERATOR -Dgrub_fs_register=FS_LIST_MARKER -Dgrub_video_register=VIDEO_LIST_MARKER -Dgrub_parttool_register=PARTTOOL_LIST_MARKER -Dgrub_partition_map_register=PARTMAP_LIST_MARKER \
'-Dgrub_term_register_input(...)=INPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)' '-Dgrub_term_register_output(...)=OUTPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)' '-Dgrub_register_command(...)=COMMAND_LIST_MARKER(__VA_ARGS__)' '-Dgrub_register_extcmd(...)=EXTCOMMAND_LIST_MARKER(__VA_ARGS__)' '-Dgrub_register_command_p1(...)=P1COMMAND_LIST_MARKER(__VA_ARGS__)' \
-DHAVE_CONFIG_H -I. -I../../grub-core -I.. -Wall -W -I../../include -I../include -DGRUB_MACHINE_EFI=1 -DGRUB_MACHINE=X86_64_EFI -DGRUB_TARGET_CPU_X86_64=1 -m64 -nostdinc -isystem /usr/lib64/gcc/x86_64-suse-linux/4.7/include -DGRUB_FILE=\"kern/elf.c\" -I. -I../../grub-core -I.. -I../.. -I../../include -I../include -I../../grub-core/lib/libgcrypt-grub/include -I../../grub-core/lib/libgcrypt-grub/src/ ../../grub-core/kern/elf.c > elf.marker.new || (rm -f elf.marker; exit 1)
[ 327s] ../../grub-core/kern/elf.c:132:19: fatal error: elfXX.c: No such file or directory

Ping. This makes it impossible to compile from dist tarball.

I wish we had something like extra_deps instead (to correctly trigger make when included file changes) but I'm not yet sure about proper make magic.

Quoted 33 lines
---
 ChangeLog                   | 5 +++++
 grub-core/Makefile.core.def | 2 ++
 2 files changed, 7 insertions(+)
ChangeLog +5 -0
index 9163911..486271b 100644
@@ -1,3 +1,8 @@
+2013-04-07  Andrey Borzenkov <[email protected]>
+
+	* grub-core/Makefile.core.def: Add kern/elfXX.c to elf module
+	as extra_dist.
+
 2013-04-06  Andrey Borzenkov <[email protected]>
 
 	* conf/Makefile.extra-dist (EXTRA_DIST): Add
grub-core/Makefile.core.def +2 -0
index 4b4c024..fece882 100644
@@ -1316,6 +1316,8 @@ module = {
 module = {
   name = elf;
   common = kern/elf.c;
+
+  extra_dist = kern/elfXX.c;
 };
 
 module = {
#2 lore raw
Quoted 10 lines · Andrey Borzenkov

В Sun, 7 Apr 2013 00:22:33 +0400
Andrey Borzenkov <[email protected]> пишет:

Quoted 5 lines

[ 327s] gcc -E -DGRUB_LST_GENERATOR -Dgrub_fs_register=FS_LIST_MARKER -Dgrub_video_register=VIDEO_LIST_MARKER -Dgrub_parttool_register=PARTTOOL_LIST_MARKER -Dgrub_partition_map_register=PARTMAP_LIST_MARKER \
'-Dgrub_term_register_input(...)=INPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)' '-Dgrub_term_register_output(...)=OUTPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)' '-Dgrub_register_command(...)=COMMAND_LIST_MARKER(__VA_ARGS__)' '-Dgrub_register_extcmd(...)=EXTCOMMAND_LIST_MARKER(__VA_ARGS__)' '-Dgrub_register_command_p1(...)=P1COMMAND_LIST_MARKER(__VA_ARGS__)' \
-DHAVE_CONFIG_H -I. -I../../grub-core -I.. -Wall -W -I../../include -I../include -DGRUB_MACHINE_EFI=1 -DGRUB_MACHINE=X86_64_EFI -DGRUB_TARGET_CPU_X86_64=1 -m64 -nostdinc -isystem /usr/lib64/gcc/x86_64-suse-linux/4.7/include -DGRUB_FILE=\"kern/elf.c\" -I. -I../../grub-core -I.. -I../.. -I../../include -I../include -I../../grub-core/lib/libgcrypt-grub/include -I../../grub-core/lib/libgcrypt-grub/src/ ../../grub-core/kern/elf.c > elf.marker.new || (rm -f elf.marker; exit 1)
[ 327s] ../../grub-core/kern/elf.c:132:19: fatal error: elfXX.c: No such file or directory

Ping. This makes it impossible to compile from dist tarball.

Pong? It's already committed

Quoted 44 lines

I wish we had something like extra_deps instead (to correctly trigger make when included file changes) but I'm not yet sure about proper make magic.

Quoted 25 lines
---
 ChangeLog                   | 5 +++++
 grub-core/Makefile.core.def | 2 ++
 2 files changed, 7 insertions(+)
ChangeLog +5 -0
index 9163911..486271b 100644
@@ -1,3 +1,8 @@
+2013-04-07  Andrey Borzenkov <[email protected]>
+
+	* grub-core/Makefile.core.def: Add kern/elfXX.c to elf module
+	as extra_dist.
+
 2013-04-06  Andrey Borzenkov <[email protected]>
 
 	* conf/Makefile.extra-dist (EXTRA_DIST): Add
grub-core/Makefile.core.def +0 -0
index 4b4c024..fece882 100644

grub-core/Makefile.core.def module = { · line 1323

Quoted 8 lines
grub-core/Makefile.core.def +2 -0
@@ -1316,6 +1316,8 @@ module = {
 module = {
   name = elf;
   common = kern/elf.c;
+
+  extra_dist = kern/elfXX.c;
 };
 
 module = {

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