2009-12-03 David S. Miller <davem@sunset.davemloft.net>

	* conf/sparc64-ieee1275.rmk (grub_mkimage_SOURCES,
	grub_setup_SOURCES, grub_ofpathname_SOURCES): Add gnulib/progname.c
	* util/sparc64/ieee1275/grub-mkimage.c: Include <grub/i18n.h> and
	"progname.h"
	* util/sparc64/ieee1275/grub-ofpathname.c: Likewise.
	* util/sparc64/ieee1275/grub-setup.c: Likewise.
	(usage): Add missing comma in printf.

diff --git a/ChangeLog b/ChangeLog
index db94fca9ef49b6c61ecca01daa04c62d2b3fe7bd..9ceebeb41da3837c9029393ba27e49073a1be89f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-03  David S. Miller  <davem@sunset.davemloft.net>
+
+       * conf/sparc64-ieee1275.rmk (grub_mkimage_SOURCES,
+       grub_setup_SOURCES, grub_ofpathname_SOURCES): Add gnulib/progname.c
+       * util/sparc64/ieee1275/grub-mkimage.c: Include <grub/i18n.h> and
+       "progname.h"
+       * util/sparc64/ieee1275/grub-ofpathname.c: Likewise.
+       * util/sparc64/ieee1275/grub-setup.c: Likewise.
+       (usage): Add missing comma in printf.
+
 2009-12-02  Robert Millan  <rmh.grub@aybabtu.com>
 
        Use the same reboot approach on i386 coreboot and qemu as we do on

diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index 8c8bf27e6c1afdec66a6c584490f56813299575c..d19e927a5a76c8387e18640510456184b823a11b 100644 (file)
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -63,7 +63,7 @@ sbin_UTILITIES = grub-setup grub-ofpathname
 
 # For grub-mkimage.
 grub_mkimage_SOURCES = util/sparc64/ieee1275/grub-mkimage.c util/misc.c \
-        util/resolve.c
+        util/resolve.c gnulib/progname.c
 
 # For grub-setup.
 util/sparc64/ieee1275/grub-setup.c_DEPENDENCIES = grub_setup_init.h
@@ -82,12 +82,12 @@ grub_setup_SOURCES = util/sparc64/ieee1275/grub-setup.c util/hostdisk.c     \
        partmap/sun.c partmap/acorn.c                           \
        \
        disk/raid.c disk/mdraid_linux.c disk/lvm.c              \
-       util/raid.c util/lvm.c                                  \
+       util/raid.c util/lvm.c gnulib/progname.c                \
        grub_setup_init.c
 
 # For grub-ofpathname.
 grub_ofpathname_SOURCES = util/sparc64/ieee1275/grub-ofpathname.c \
-       util/ieee1275/ofpath.c util/misc.c
+       util/ieee1275/ofpath.c util/misc.c gnulib/progname.c
 
 # Scripts.
 sbin_SCRIPTS = grub-install

diff --git a/util/sparc64/ieee1275/grub-mkimage.c b/util/sparc64/ieee1275/grub-mkimage.c
index 5260996f6c044dde28dac607d648359e4229c18d..d756586af9eb5580d6f1ac5dfe1cca6211bfd23b 100644 (file)
--- a/util/sparc64/ieee1275/grub-mkimage.c
+++ b/util/sparc64/ieee1275/grub-mkimage.c
@@ -21,6 +21,7 @@
 #include <grub/machine/boot.h>
 #include <grub/machine/kernel.h>
 #include <grub/kernel.h>
+#include <grub/i18n.h>
 #include <grub/disk.h>
 #include <grub/util/misc.h>
 #include <grub/util/resolve.h>
@@ -34,6 +35,8 @@
 #define _GNU_SOURCE    1
 #include <getopt.h>
 
+#include "progname.h"
+
 static void
 compress_kernel (char *kernel_img, size_t kernel_size,
                 char **core_img, size_t *core_size)

diff --git a/util/sparc64/ieee1275/grub-ofpathname.c b/util/sparc64/ieee1275/grub-ofpathname.c
index 4b852698f981175725f43a961621eea440899ff7..166ce4cbe9347f993f8b6ecae5f60658ff560eba 100644 (file)
--- a/util/sparc64/ieee1275/grub-ofpathname.c
+++ b/util/sparc64/ieee1275/grub-ofpathname.c
@@ -20,6 +20,10 @@
 #include <grub/util/misc.h>
 #include <grub/util/ofpath.h>
 
+#include <grub/i18n.h>
+
+#include "progname.h"
+
 int main(int argc, char **argv)
 {
   char *of_path;

diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c
index 6ce8cdf6d2a2401bdcb4d3492fde0ae60f1049b9..ade1bd595c27c8758b9066f81ba22f2d111a6706 100644 (file)
--- a/util/sparc64/ieee1275/grub-setup.c
+++ b/util/sparc64/ieee1275/grub-setup.c
@@ -21,6 +21,7 @@
 #include <grub/types.h>
 #include <grub/util/misc.h>
 #include <grub/device.h>
+#include <grub/i18n.h>
 #include <grub/disk.h>
 #include <grub/file.h>
 #include <grub/fs.h>
@@ -49,6 +50,8 @@
 #define _GNU_SOURCE    1
 #include <getopt.h>
 
+#include "progname.h"
+
 /* This program fills in various fields inside of the 'boot' and 'core'
  * image files.
  *
@@ -419,7 +422,7 @@ DEVICE must be a GRUB device (e.g. ``(hd0,1)'').\n\
   -v, --verbose           print verbose messages\n\
 \n\
 Report bugs to <%s>.\n\
-", program_name
+", program_name,
            DEFAULT_BOOT_FILE, DEFAULT_CORE_FILE, DEFAULT_DIRECTORY,
            DEFAULT_DEVICE_MAP, PACKAGE_BUGREPORT);