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

merge mainline into newreloc

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-08-29 17:24:00 +02:00
commit 853231bc06
3 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2010-08-29 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/misc.c (grub_real_dprintf): Always refresh after
dprintf.
2010-08-29 BVK Chaitanya <bvk.groups@gmail.com>
* Makefile.util.def: Use ldadd instead of ldflags for libraries.
2010-08-28 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/normal/term.c (print_more): Fix a memory leak.

28
Makefile.util.def
View file

@ -99,7 +99,7 @@ program = {
name = grub-bin2h;
common = util/bin2h.c;
ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
mansection = 1;
};
@ -112,7 +112,7 @@ program = {
extra_dist = util/grub-mkimagexx.c;
ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
cppflags = '-DGRUB_PKGLIBROOTDIR=\"$(pkglibrootdir)\"';
};
@ -123,7 +123,7 @@ program = {
common = util/grub-mkrelpath.c;
ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
};
program = {
@ -133,7 +133,7 @@ program = {
common = util/grub-script-check.c;
ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
};
program = {
@ -143,7 +143,7 @@ program = {
common = util/grub-editenv.c;
ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
};
program = {
@ -153,7 +153,7 @@ program = {
common = util/grub-mkpasswd-pbkdf2.c;
ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
cflags = '$(CFLAGS_GCRY)';
cppflags = '$(CPPFLAGS_GCRY)';
};
@ -171,7 +171,7 @@ program = {
common = util/grub-pe2elf.c;
ldadd = libgrub.a;
ldflags = '$(LIBINTL)';
ldadd = '$(LIBINTL)';
condition = COND_GRUB_PE2ELF;
};
@ -181,7 +181,7 @@ program = {
common = util/grub-fstest.c;
ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
condition = COND_GRUB_FSTEST;
};
@ -194,8 +194,8 @@ program = {
cflags = '$(freetype_cflags)';
ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
ldflags = '$(freetype_libs)';
ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
ldadd = '$(freetype_libs)';
condition = COND_GRUB_MKFONT;
};
@ -212,7 +212,7 @@ program = {
sparc64_ieee1275 = util/ieee1275/devicemap.c;
ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
};
program = {
@ -222,7 +222,7 @@ program = {
common = util/grub-probe.c;
ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
};
program = {
@ -239,7 +239,7 @@ program = {
sparc64_ieee1275 = util/lvm.c;
ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
enable = i386_pc;
enable = sparc64_ieee1275;
@ -507,5 +507,5 @@ program = {
common = grub-core/tests/lib/test.c;
cflags = -Wno-format;
ldadd = libgrub.a;
ldflags = '$(LIBDEVMAPPER)';
ldadd = '$(LIBDEVMAPPER)';
};

1
grub-core/kern/misc.c
View file

@ -184,6 +184,7 @@ grub_real_dprintf (const char *file, const int line, const char *condition,
va_start (args, fmt);
grub_vprintf (fmt, args);
va_end (args);
grub_refresh ();
}
}