Re: [PATCH]: Fix sparc64 build...

["Vladimir 'φ-coder/phcoder' Serbinenko" <phcoder@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 3974 bytes --]

Hello, nice to see you again.
David Miller wrote:
> So I finally am about to have enough time to start looking into
> sparc64 support again.
>
>   

> And, surprise!  The trunk doesn't even build. :-)
>   
Committed. BTW in experimental we merged sparc64's and i386's
grub-install. Do you think it would make sense to merge some other tools
as well?
> 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.
>
> === modified file 'conf/sparc64-ieee1275.rmk'
> --- conf/sparc64-ieee1275.rmk	2009-11-26 00:45:53 +0000
> +++ conf/sparc64-ieee1275.rmk	2009-12-03 10:06:44 +0000
> @@ -63,7 +63,7 @@
>  
>  # 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 @@
>  	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
>
> === modified file 'util/sparc64/ieee1275/grub-mkimage.c'
> --- util/sparc64/ieee1275/grub-mkimage.c	2009-11-25 23:10:02 +0000
> +++ util/sparc64/ieee1275/grub-mkimage.c	2009-12-03 09:59:51 +0000
> @@ -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)
>
> === modified file 'util/sparc64/ieee1275/grub-ofpathname.c'
> --- util/sparc64/ieee1275/grub-ofpathname.c	2009-11-25 23:10:02 +0000
> +++ util/sparc64/ieee1275/grub-ofpathname.c	2009-12-03 10:06:14 +0000
> @@ -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;
>
> === modified file 'util/sparc64/ieee1275/grub-setup.c'
> --- util/sparc64/ieee1275/grub-setup.c	2009-11-25 23:10:02 +0000
> +++ util/sparc64/ieee1275/grub-setup.c	2009-12-03 10:04:44 +0000
> @@ -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 @@
>    -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);
>  
>
>
>
> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> http://lists.gnu.org/mailman/listinfo/grub-devel
>
>   


-- 
Regards
Vladimir 'φ-coder/phcoder' Serbinenko



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 293 bytes --]