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

Fix make dist on non-pc.

Browse source
This commit is contained in:
Andrey Borzenkov 2013-06-07 18:23:08 +02:00 committed by Vladimir 'phcoder' Serbinenko
parent b8578da640
commit cc28411296
5 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,4 +1,8 @@
2013-06-02 Francesco Lavra <francescolavra.fl@gmail.com> 2013-06-07 Andrey Borzenkov <arvidjaar@gmail.com>
Fix make dist on non-pc.
2013-06-07 Francesco Lavra <francescolavra.fl@gmail.com>
* grub-core/kern/corecmd.c (grub_core_cmd_ls): Fix handling of paths * grub-core/kern/corecmd.c (grub_core_cmd_ls): Fix handling of paths
without a device name. without a device name.

9
grub-core/Makefile.am
View file

@ -45,9 +45,9 @@ gensm712: video/sm712.c
CLEANFILES += gensm712 CLEANFILES += gensm712
# trigtables.c # trigtables.c
sm712_start.S: gensm712 video/sm712.c $(top_srcdir)/configure.ac sm712_start.h: gensm712 video/sm712.c $(top_srcdir)/configure.ac
$(builddir)/gensm712 > $@ $(builddir)/gensm712 > $@
CLEANFILES += sm712_start.S CLEANFILES += sm712_start.h
# XXX Use Automake's LEX & YACC support # XXX Use Automake's LEX & YACC support
grub_script.tab.h: script/parser.y grub_script.tab.h: script/parser.y
@ -60,12 +60,9 @@ grub_script.yy.h: script/yylex.l
$(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $< $(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $<
grub_script.yy.c: grub_script.yy.h grub_script.yy.c: grub_script.yy.h
rs_decoder.S: $(srcdir)/lib/reed_solomon.c rs_decoder.h: $(srcdir)/lib/reed_solomon.c
$(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Os -I$(top_builddir) -S -DSTANDALONE -o $@ $< -g0 -mregparm=3 -ffreestanding $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Os -I$(top_builddir) -S -DSTANDALONE -o $@ $< -g0 -mregparm=3 -ffreestanding
boot/i386/pc/startup_raw.S: $(builddir)/rs_decoder.S
boot/mips/loongson/fwstart.S: $(builddir)/sm712_start.S
CLEANFILES += grub_script.yy.c grub_script.yy.h CLEANFILES += grub_script.yy.c grub_script.yy.h
include $(srcdir)/Makefile.core.am include $(srcdir)/Makefile.core.am

2
grub-core/Makefile.core.def
View file

@ -394,6 +394,7 @@ image = {
image = { image = {
name = lzma_decompress; name = lzma_decompress;
i386_pc = boot/i386/pc/startup_raw.S; i386_pc = boot/i386/pc/startup_raw.S;
i386_pc_nodist = rs_decoder.h;
objcopyflags = '-O binary'; objcopyflags = '-O binary';
ldflags = '$(TARGET_IMG_LDFLAGS) $(TARGET_IMG_BASE_LDOPT),0x8200'; ldflags = '$(TARGET_IMG_LDFLAGS) $(TARGET_IMG_BASE_LDOPT),0x8200';
@ -403,6 +404,7 @@ image = {
image = { image = {
name = fwstart; name = fwstart;
mips_loongson = boot/mips/loongson/fwstart.S; mips_loongson = boot/mips/loongson/fwstart.S;
mips_loongson_nodist = sm712_start.h;
objcopyflags = '-O binary'; objcopyflags = '-O binary';
ldflags = '-static-libgcc -lgcc -Wl,-N,-S,-Ttext,0xbfc00000,-Bstatic'; ldflags = '-static-libgcc -lgcc -Wl,-N,-S,-Ttext,0xbfc00000,-Bstatic';
enable = mips_loongson; enable = mips_loongson;

2
grub-core/boot/i386/pc/startup_raw.S
View file

@ -119,7 +119,7 @@ LOCAL (codestart):
#include "../../../kern/i386/realmode.S" #include "../../../kern/i386/realmode.S"
#include <rs_decoder.S> #include <rs_decoder.h>
.text .text

2
grub-core/boot/mips/loongson/fwstart.S
View file

@ -886,7 +886,7 @@ table_cont:
b init_end b init_end
nop nop
init_table: init_table:
#include "sm712_start.S" #include "sm712_start.h"
init_table_end: init_table_end:
.align 4 .align 4
init_end: init_end: