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

* gentpl.py (kernel): Rewrite Apple part.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-29 19:07:32 +01:00
parent a132afc371
commit 22899b9c03
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2012-02-29 Vladimir Serbinenko <phcoder@gmail.com>
* gentpl.py (kernel): Rewrite Apple part.
2012-02-29 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-29 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/kernel.h (FOR_MODULES): Check module magic. * include/grub/kernel.h (FOR_MODULES): Check module magic.

16
gentpl.py
View file

@ -417,8 +417,20 @@ def kernel(platform):
r += gvar_add("platform_DATA", "[+ name +].img") r += gvar_add("platform_DATA", "[+ name +].img")
r += gvar_add("CLEANFILES", "[+ name +].img") r += gvar_add("CLEANFILES", "[+ name +].img")
r += rule("[+ name +].img", "[+ name +].exec$(EXEEXT)", r += rule("[+ name +].img", "[+ name +].exec$(EXEEXT)",
if_platform_tagged(platform, "nostrip", "cp $< $@", if_platform_tagged(platform, "nostrip",
"$(STRIP) $(" + cname() + "_STRIPFLAGS) -o $@ $<")) """if test x$(USE_APPLE_CC_FIXES) = xyes; then \
$(OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -ed2031 -ed2022 -wd1106 -nu -nd $< $@; \
elif test ! -z '$(TARGET_OBJ2ELF)'; then \
cp $< $@.bin; $(TARGET_OBJ2ELF) $@.bin && cp $@.bin $@ || (rm -f $@.bin; exit 1); \
else cp $< $@; fi""",
"""if test x$(USE_APPLE_CC_FIXES) = xyes; then \
$(STRIP) $(""" + cname() + """) -o $@.bin $<; \
$(OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -ed2031 -ed2022 -wd1106 -nu -nd $@.bin $@; \
elif test ! -z '$(TARGET_OBJ2ELF)'; then \
$(STRIP) $(""" + cname() + """_STRIPFLAGS) -o $@ $<;\
$(TARGET_OBJ2ELF) $@.bin && cp $@.bin $@ || (rm -f $@.bin; exit 1); \
else """ + "$(STRIP) $(" + cname() + "_STRIPFLAGS) -o $@ $<; \
fi"""))
return r return r
def image(platform): def image(platform):