From 80a7121355da4694ddb7bc157337bc0a76311426 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Sat, 18 Feb 2012 20:25:11 +0100 Subject: [PATCH] * 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. --- ChangeLog | 9 +++++++++ conf/Makefile.common | 2 ++ gentpl.py | 6 +++--- grub-core/Makefile.core.def | 4 ++-- grub-core/gdb_grub.in | 3 +++ 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83948c937..f2acda5e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2012-02-18 Vladimir Serbinenko + + * 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 Replace grub_checkkey with grub_getkey_noblock. diff --git a/conf/Makefile.common b/conf/Makefile.common index fd8454e59..b960bdf81 100644 --- 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 dbe79e7ee..adbf6d492 100644 --- 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 28dc7c192..882c57cdf 100644 --- 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 4a55233da..01ef3e15b 100644 --- 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 ###