* conf/Makefile.common (platform_SCRIPTS): New variable.

	(platform_PROGRAMS): Likewise.
	* gentpl.py: Mark *,module and *.image for install.
	* grub-core/gdb_grub.in: Add a notice of expected environment.
	* grub-core/Makefile.core.def (gdb_grub): Mark for install.
	(gmodule.pl): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 83948c937f4dcb69611b04970c94d467c9ee2db5..f2acda5e6f97a24ca04cb9a7f149a12043539d92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-02-18 Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * conf/Makefile.common (platform_SCRIPTS): New variable.
+       (platform_PROGRAMS): Likewise.
+       * gentpl.py: Mark *,module and *.image for install.
+       * grub-core/gdb_grub.in: Add a notice of expected environment.
+       * grub-core/Makefile.core.def (gdb_grub): Mark for install.
+       (gmodule.pl): Likewise.
+
 2012-02-18 Vladimir Serbinenko  <phcoder@gmail.com>
 
        Replace grub_checkkey with grub_getkey_noblock.

diff --git a/conf/Makefile.common b/conf/Makefile.common
index fd8454e59684924c89e57ce73e7efed8afcb589b..b960bdf81d982c7e89b38daa997f3a804245d664 100644 (file)
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -151,6 +151,8 @@ noinst_PROGRAMS =
 grubconf_SCRIPTS =
 noinst_LIBRARIES =
 dist_noinst_DATA =
+platform_SCRIPTS =
+platform_PROGRAMS =
 
 TESTS =
 EXTRA_DIST =

diff --git a/gentpl.py b/gentpl.py
index dbe79e7ee5af8cc224e5d8b94fa832a80ca09624..adbf6d492d24ecebd5212d03eed9cff7f0e3769c 100644 (file)
--- a/gentpl.py
+++ b/gentpl.py
@@ -370,7 +370,7 @@ def first_time(snippet):
 def module(platform):
     r = set_canonical_name_suffix(".module")
 
-    r += gvar_add("noinst_PROGRAMS", "[+ name +].module")
+    r += gvar_add("platform_PROGRAMS", "[+ name +].module")
     r += gvar_add("MODULE_FILES", "[+ name +].module$(EXEEXT)")
 
     r += var_set(cname() + "_SOURCES", platform_sources(platform) + " ## platform sources")
@@ -398,7 +398,7 @@ def module(platform):
 
 def kernel(platform):
     r = set_canonical_name_suffix(".exec")
-    r += gvar_add("noinst_PROGRAMS", "[+ name +].exec")
+    r += gvar_add("platform_PROGRAMS", "[+ name +].exec")
     r += var_set(cname() + "_SOURCES", platform_startup(platform))
     r += var_add(cname() + "_SOURCES", platform_sources(platform))
     r += var_set("nodist_" + cname() + "_SOURCES", platform_nodist_sources(platform) + " ## platform nodist sources")
@@ -423,7 +423,7 @@ def kernel(platform):
 
 def image(platform):
     r = set_canonical_name_suffix(".image")
-    r += gvar_add("noinst_PROGRAMS", "[+ name +].image")
+    r += gvar_add("platform_PROGRAMS", "[+ name +].image")
     r += var_set(cname() + "_SOURCES", platform_sources(platform))
     r += var_set("nodist_" + cname() + "_SOURCES", platform_nodist_sources(platform) + "## platform nodist sources")
     r += var_set(cname() + "_LDADD", platform_ldadd(platform))

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 28dc7c19211a6bb69a5251d8724230e4d1121edd..882c57cdfecee03962263f21c442d96a40944e84 100644 (file)
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -19,13 +19,13 @@ script = {
 };
 
 script = {
-  installdir = noinst;
+  installdir = platform;
   name = gmodule.pl;
   common = gmodule.pl.in;
 };
 
 script = {
-  installdir = noinst;
+  installdir = platform;
   name = gdb_grub;
   common = gdb_grub.in;
 };

diff --git a/grub-core/gdb_grub.in b/grub-core/gdb_grub.in
index 4a55233dad5fc3c9c04509f4770d8e1b635cb5c0..01ef3e15b75c148af861880d200a4c9e33d8c904 100644 (file)
--- a/grub-core/gdb_grub.in
+++ b/grub-core/gdb_grub.in
@@ -2,6 +2,9 @@
 ### Load debuging information about GNU GRUB 2 modules into GDB
 ### automatically. Needs readelf, Perl and gmodule.pl script
 ###
+### Has to be launched from the writable and trusted
+### directory containing *.image and *.module
+###
 ### $Id: .gdbinit,v 1.1 2006/05/14 11:38:08 lkundrak Exp $
 ### Lubomir Kundrak <lkudrak@skosi.org>
 ###