Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1NG8kl-0003f6-RV for mharc-grub-devel@gnu.org; Thu, 03 Dec 2009 05:17:39 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NG8ki-0003Zc-Bk for grub-devel@gnu.org; Thu, 03 Dec 2009 05:17:36 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NG8ke-0003SM-PO for grub-devel@gnu.org; Thu, 03 Dec 2009 05:17:34 -0500 Received: from [199.232.76.173] (port=47462 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NG8kd-0003Rt-To for grub-devel@gnu.org; Thu, 03 Dec 2009 05:17:32 -0500 Received: from 74-93-104-97-washington.hfc.comcastbusiness.net ([74.93.104.97]:45498 helo=sunset.davemloft.net) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NG8kd-0005aS-Dt for grub-devel@gnu.org; Thu, 03 Dec 2009 05:17:31 -0500 Received: from localhost (localhost [127.0.0.1]) by sunset.davemloft.net (Postfix) with ESMTP id 869F224C6E2 for ; Thu, 3 Dec 2009 02:17:29 -0800 (PST) Date: Thu, 03 Dec 2009 02:17:29 -0800 (PST) Message-Id: <20091203.021729.127643119.davem@davemloft.net> To: grub-devel@gnu.org From: David Miller X-Mailer: Mew version 6.2 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [PATCH]: Fix sparc64 build... X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Dec 2009 10:17:36 -0000 So I finally am about to have enough time to start looking into sparc64 support again. And, surprise! The trunk doesn't even build. :-) 2009-12-03 David S. Miller * conf/sparc64-ieee1275.rmk (grub_mkimage_SOURCES, grub_setup_SOURCES, grub_ofpathname_SOURCES): Add gnulib/progname.c * util/sparc64/ieee1275/grub-mkimage.c: Include 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 #include #include +#include #include #include #include @@ -34,6 +35,8 @@ #define _GNU_SOURCE 1 #include +#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 #include +#include + +#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 #include #include +#include #include #include #include @@ -49,6 +50,8 @@ #define _GNU_SOURCE 1 #include +#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);