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

Remove improper use of program_transform_name on pkglibrootdir.

Browse source 
* configure.ac (pkglibrootdir): Removed.
	(grub-mkimage): Replace PKGLIBROOTDIR with PKGLIBDIR.
	* util/grub-mkimage.c: Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-27 10:35:37 +01:00
parent b4a6a53310
commit 8151bc82f7
4 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,11 @@
2012-02-27 Vladimir Serbinenko <phcoder@gmail.com>
Remove improper use of program_transform_name on pkglibrootdir.
* configure.ac (pkglibrootdir): Removed.
(grub-mkimage): Replace PKGLIBROOTDIR with PKGLIBDIR.
* util/grub-mkimage.c: Likewise.
2012-02-27 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-27 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/normal/menu_text.c (grub_print_message_indented_real): Fix a * grub-core/normal/menu_text.c (grub_print_message_indented_real): Fix a
@ -15,7 +23,7 @@
(grub_freebsd_boot): Pass zfs UUID. (grub_freebsd_boot): Pass zfs UUID.
(grub_cmd_freebsd): Set zfs UUID. (grub_cmd_freebsd): Set zfs UUID.
2012-02-27 Mike Gilbert <floppym@gentoo.org> 2012-02-27 Vladimir Serbinenko <phcoder@gmail.com>
* conf/Makefile.common (platformdir): Base on pkglibdir and not * conf/Makefile.common (platformdir): Base on pkglibdir and not
pkglibrootdir. pkglibrootdir.

2
Makefile.util.def
View file

@ -152,7 +152,7 @@ program = {
ldadd = grub-core/gnulib/libgnu.a; ldadd = grub-core/gnulib/libgnu.a;
ldadd = '$(LIBLZMA)'; ldadd = '$(LIBLZMA)';
ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)'; ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
cppflags = '-DGRUB_PKGLIBROOTDIR=\"$(pkglibrootdir)\"'; cppflags = '-DGRUB_PKGLIBDIR=\"$(pkglibdir)\"';
}; };
program = { program = {

3
configure.ac
View file

@ -1049,9 +1049,6 @@ AC_SUBST([LIBNVPAIR])
LIBS="" LIBS=""
pkglibrootdir='$(libdir)'/`echo $PACKAGE | sed "$program_transform_name"`
AC_SUBST(pkglibrootdir)
AC_SUBST([FONT_SOURCE]) AC_SUBST([FONT_SOURCE])
AS_IF([test x$target_cpu = xi386 -a x$platform = xqemu], AS_IF([test x$target_cpu = xi386 -a x$platform = xqemu],
[AC_SUBST([GRUB_BOOT_MACHINE_LINK_ADDR], 0xffe00)]) [AC_SUBST([GRUB_BOOT_MACHINE_LINK_ADDR], 0xffe00)])

12
util/grub-mkimage.c
View file

@ -1663,7 +1663,7 @@ help_filter (int key, const char *text, void *input __attribute__ ((unused)))
switch (key) switch (key)
{ {
case 'd': case 'd':
return xasprintf (text, GRUB_PKGLIBROOTDIR); return xasprintf (text, GRUB_PKGLIBDIR);
case 'p': case 'p':
return xasprintf (text, DEFAULT_DIRECTORY); return xasprintf (text, DEFAULT_DIRECTORY);
case 'O': case 'O':
@ -1861,13 +1861,13 @@ main (int argc, char *argv[])
if (!arguments.dir) if (!arguments.dir)
{ {
arguments.dir = xmalloc (sizeof (GRUB_PKGLIBROOTDIR) arguments.dir = xmalloc (sizeof (GRUB_PKGLIBDIR)
+ grub_strlen (arguments.image_target->dirname) + grub_strlen (arguments.image_target->dirname)
+ 1); + 1);
memcpy (arguments.dir, GRUB_PKGLIBROOTDIR, memcpy (arguments.dir, GRUB_PKGLIBDIR,
sizeof (GRUB_PKGLIBROOTDIR) - 1); sizeof (GRUB_PKGLIBDIR) - 1);
*(arguments.dir + sizeof (GRUB_PKGLIBROOTDIR) - 1) = '/'; *(arguments.dir + sizeof (GRUB_PKGLIBDIR) - 1) = '/';
strcpy (arguments.dir + sizeof (GRUB_PKGLIBROOTDIR), strcpy (arguments.dir + sizeof (GRUB_PKGLIBDIR),
arguments.image_target->dirname); arguments.image_target->dirname);
} }