vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* gentpl.py: Don't generate platform-dependent conditionals for

Browse source 
platform-independent targets.
This commit is contained in:
Vladimir Serbinenko 2013-11-27 14:06:14 +01:00
parent 16ef26fd3a
commit b1f742c103
2 changed files with 33 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-11-27 Vladimir Serbinenko <phcoder@gmail.com>
* gentpl.py: Don't generate platform-dependent conditionals for
platform-independent targets.
2013-11-27 Colin Watson <cjwatson@ubuntu.com> 2013-11-27 Colin Watson <cjwatson@ubuntu.com>
* grub-core/osdep/unix/exec.c (grub_util_exec_redirect): Remove * grub-core/osdep/unix/exec.c (grub_util_exec_redirect): Remove

31
gentpl.py
View file

@ -638,6 +638,28 @@ def first_time(defn, snippet):
return snippet return snippet
return '' return ''
def is_platform_independent(defn):
if 'enable' in defn:
return False
for suffix in [ "", "_nodist" ]:
template = platform_values(defn, GRUB_PLATFORMS[0], suffix)
for platform in GRUB_PLATFORMS[1:]:
if template != platform_values(defn, platform, suffix):
return False
for suffix in [ "startup", "ldadd", "dependencies", "cflags", "ldflags", "cppflags", "ccasflags", "stripflags", "objcopyflags", "condition" ]:
template = platform_specific_values(defn, GRUB_PLATFORMS[0], "_" + suffix, suffix)
for platform in GRUB_PLATFORMS[1:]:
if template != platform_specific_values(defn, platform, "_" + suffix, suffix):
return False
for tag in [ "nostrip" ]:
template = platform_tagged(defn, GRUB_PLATFORMS[0], tag)
for platform in GRUB_PLATFORMS[1:]:
if template != platform_tagged(defn, platform, tag):
return False
return True
def module(defn, platform): def module(defn, platform):
name = defn['name'] name = defn['name']
set_canonical_name_suffix(".module") set_canonical_name_suffix(".module")
@ -825,9 +847,12 @@ def rules(target, closure):
seen_vars.clear() seen_vars.clear()
for defn in defparser.definitions.find_all(target): for defn in defparser.definitions.find_all(target):
foreach_enabled_platform( if is_platform_independent(defn):
defn, under_platform_specific_conditionals(defn, GRUB_PLATFORMS[0], closure)
lambda p: under_platform_specific_conditionals(defn, p, closure)) else:
foreach_enabled_platform(
defn,
lambda p: under_platform_specific_conditionals(defn, p, closure))
# Remember that we've seen this target. # Remember that we've seen this target.
seen_target.add(defn['name']) seen_target.add(defn['name'])