Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-22 15:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge mainline into newreloc

Browse Source
This commit is contained in:
Vladimir 'phcoder' Serbinenko committed 2010-08-29 17:24:00 +02:00
2 parents 506e4d1e7f 3626810e53
commit 853231bc06
3 files changed
+24 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ChangeLog
+9
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> 2010-08-28 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/normal/term.c (print_more): Fix a memory leak. * grub-core/normal/term.c (print_more): Fix a memory leak.
Makefile.util.def
+14 -14
View File
@@ -99,7 +99,7 @@ program = {
name = grub-bin2h; name = grub-bin2h;
common = util/bin2h.c; common = util/bin2h.c;
ldadd = libgrub.a; ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER)'; ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
mansection = 1; mansection = 1;
}; };
@@ -112,7 +112,7 @@ program = {
extra_dist = util/grub-mkimagexx.c; extra_dist = util/grub-mkimagexx.c;
ldadd = libgrub.a; ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER)'; ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
cppflags = '-DGRUB_PKGLIBROOTDIR=\"$(pkglibrootdir)\"'; cppflags = '-DGRUB_PKGLIBROOTDIR=\"$(pkglibrootdir)\"';
}; };
@@ -123,7 +123,7 @@ program = {
common = util/grub-mkrelpath.c; common = util/grub-mkrelpath.c;
ldadd = libgrub.a; ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER)'; ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
}; };
program = { program = {
@@ -133,7 +133,7 @@ program = {
common = util/grub-script-check.c; common = util/grub-script-check.c;
ldadd = libgrub.a; ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER)'; ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
}; };
program = { program = {
@@ -143,7 +143,7 @@ program = {
common = util/grub-editenv.c; common = util/grub-editenv.c;
ldadd = libgrub.a; ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER)'; ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
}; };
program = { program = {
@@ -153,7 +153,7 @@ program = {
common = util/grub-mkpasswd-pbkdf2.c; common = util/grub-mkpasswd-pbkdf2.c;
ldadd = libgrub.a; ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER)'; ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
cflags = '$(CFLAGS_GCRY)'; cflags = '$(CFLAGS_GCRY)';
cppflags = '$(CPPFLAGS_GCRY)'; cppflags = '$(CPPFLAGS_GCRY)';
}; };
@@ -171,7 +171,7 @@ program = {
common = util/grub-pe2elf.c; common = util/grub-pe2elf.c;
ldadd = libgrub.a; ldadd = libgrub.a;
ldflags = '$(LIBINTL)'; ldadd = '$(LIBINTL)';
condition = COND_GRUB_PE2ELF; condition = COND_GRUB_PE2ELF;
}; };
@@ -181,7 +181,7 @@ program = {
common = util/grub-fstest.c; common = util/grub-fstest.c;
ldadd = libgrub.a; ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER)'; ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
condition = COND_GRUB_FSTEST; condition = COND_GRUB_FSTEST;
}; };
@@ -194,8 +194,8 @@ program = {
cflags = '$(freetype_cflags)'; cflags = '$(freetype_cflags)';
ldadd = libgrub.a; ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER)'; ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
ldflags = '$(freetype_libs)'; ldadd = '$(freetype_libs)';
condition = COND_GRUB_MKFONT; condition = COND_GRUB_MKFONT;
}; };
@@ -212,7 +212,7 @@ program = {
sparc64_ieee1275 = util/ieee1275/devicemap.c; sparc64_ieee1275 = util/ieee1275/devicemap.c;
ldadd = libgrub.a; ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)'; ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
}; };
program = { program = {
@@ -222,7 +222,7 @@ program = {
common = util/grub-probe.c; common = util/grub-probe.c;
ldadd = libgrub.a; ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)'; ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
}; };
program = { program = {
@@ -239,7 +239,7 @@ program = {
sparc64_ieee1275 = util/lvm.c; sparc64_ieee1275 = util/lvm.c;
ldadd = libgrub.a; ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)'; ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
enable = i386_pc; enable = i386_pc;
enable = sparc64_ieee1275; enable = sparc64_ieee1275;
@@ -507,5 +507,5 @@ program = {
common = grub-core/tests/lib/test.c; common = grub-core/tests/lib/test.c;
cflags = -Wno-format; cflags = -Wno-format;
ldadd = libgrub.a; ldadd = libgrub.a;
ldflags = '$(LIBDEVMAPPER)'; ldadd = '$(LIBDEVMAPPER)';
}; };
grub-core/kern/misc.c
+1
View File
@@ -184,6 +184,7 @@ grub_real_dprintf (const char *file, const int line, const char *condition,
va_start (args, fmt); va_start (args, fmt);
grub_vprintf (fmt, args); grub_vprintf (fmt, args);
va_end (args); va_end (args);
grub_refresh ();
} }
} }