From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1Ed6bQ-0004XP-Bb for mharc-grub-devel@gnu.org; Fri, 18 Nov 2005 08:48:32 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ed6bN-0004Wb-Qk for grub-devel@gnu.org; Fri, 18 Nov 2005 08:48:30 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Ed6bG-0004Uy-Oj for grub-devel@gnu.org; Fri, 18 Nov 2005 08:48:27 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ed6bG-0004Um-7Q for grub-devel@gnu.org; Fri, 18 Nov 2005 08:48:22 -0500 Received: from [145.74.66.11] (helo=mail-cn.han.nl) by monty-python.gnu.org with esmtp (Exim 4.34) id 1Ed6bG-0001hn-7i for grub-devel@gnu.org; Fri, 18 Nov 2005 08:48:22 -0500 Received: from vscan-cn.han.nl (venus.han.nl [145.74.65.6]) by mail-cn.han.nl (Postfix) with ESMTP id E44CC8AEB for ; Fri, 18 Nov 2005 14:47:45 +0100 (CET) Received: from mail-cn.han.nl ([145.74.66.11]) by vscan-cn.han.nl (venus.han.nl [145.74.65.6]) (amavisd-new, port 10024) with ESMTP id 15773-05 for ; Fri, 18 Nov 2005 14:47:45 +0100 (CET) Received: from mail1.han.nl (mail1.han.nl [145.74.103.11]) by mail-cn.han.nl (Postfix) with ESMTP id ED4258AC4 for ; Fri, 18 Nov 2005 14:47:44 +0100 (CET) Received: from localhost.localdomain (mgerards.xs4all.nl [82.92.27.129]) by mail1.han.nl (Postfix) with ESMTP id A5EC9C048 for ; Fri, 18 Nov 2005 14:47:44 +0100 (CET) Mail-Copies-To: metgerards@student.han.nl To: The development of GRUB 2 References: <200511132106.37668.T.E.Baldwin99@members.leeds.ac.uk> <200511152213.47689.T.E.Baldwin99@members.leeds.ac.uk> <87y83pxf28.fsf@student.han.nl> <200511171925.42940.T.E.Baldwin99@members.leeds.ac.uk> From: Marco Gerards Date: Fri, 18 Nov 2005 14:47:45 +0100 In-Reply-To: <200511171925.42940.T.E.Baldwin99@members.leeds.ac.uk> (Timothy Baldwin's message of "Thu, 17 Nov 2005 19:25:34 +0000") Message-ID: <87psoy3w5a.fsf@student.han.nl> User-Agent: Gnus/5.1007 (Gnus v5.10.7) Emacs/21.4 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Virus-Scanned: by amavisd-new (2.2.0) at vscan-cn.han.nl Subject: Re: Support for including *.mk files X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Nov 2005 13:48:31 -0000 Timothy Baldwin writes: > On Wednesday 16 Nov 2005 06:49, Marco Gerards wrote: >> Timothy Baldwin writes: >> > On Sunday 13 Nov 2005 21:16, Marco Gerards wrote: >> >> It would be nice if you can >> >> send in the patch that actually splits up the rmk files so I can see >> >> why you made some changes in this patch. >> > >> > Here it is, and I have included the previous patch, as the tabs got >> > changed to spaces. >> >> Nice! Can you include the changelog entry for the second patch? > > Here it is, with revised patch as I split out to much. It doesn't compile. I was about to commit it, but I had the following problem: ccache gcc-4.0 -Iutil -I./util -I. -Iinclude -I./include -Wall -W -DGRUB_DATADIR=\"/usr/local/share/grub/i386-pc\" -g -O2 -DGRUB_UTIL=1 -c -o genmoddep-util_genmoddep.o util/genmoddep.c ccache gcc-4.0 -o genmoddep genmoddep-util_genmoddep.o cat kernel_syms.lst def-_chain.lst def-chain.lst def-_linux.lst def-linux.lst def-normal.lst def-reboot.lst def-halt.lst def-vga.lst def-_multiboot.lst def-multiboot.lst def-vbe.lst def-vesafb.lst def-vbeinfo.lst def-vbetest.lst /dev/null | ./genmoddep und-_chain.lst und-chain.lst und-_linux.lst und-linux.lst und-normal.lst und-reboot.lst und-halt.lst und-vga.lst und-_multiboot.lst und-multiboot.lst und-vbe.lst und-vesafb.lst und-vbeinfo.lst und-vbetest.lst > moddep.lst \ || (rm -f moddep.lst; exit 1) genmoddep: error: grub_font_get_glyph in vga is not defined make: *** [moddep.lst] Error 1 It seems that the -def.lst files are not correctly generated and/or used. Can you please fix that. I have changed your ChangeLog a bit. I'm including that so you can build on that for the next patch. 2005-11-18 Timothy Baldwin * Makefile.in (RMKFILES): Add common.rmk and sparc64-ieee1275.rmk. * conf/common.rmk: New file. * conf/i386-pc.rmk: Include conf/common.mk. (pkgdata_MODULES): Removed fshelp.mod, fat.mod, ext2.mod, ufs.mod, minux.mod, hfs.mod, jfs.mod, xfs.mod, affs.mod, sfs.mod, hello.mod, boot.mod, terminal.mod, ls.mod, cmp.mod, cat.mod, help.mod, font.mod, terminfo.mod, amiga.mod, apple.mod, pc.mod, sun.mod, acorn.mod, loopback.mod, default.mod, timeout.mod, configfile.mod, search.mod, gzio.mod and test.mod. (symlist.c, grub_script.tab.c, grub_script.tab.h, kernel_syms.lst) (grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c, (fshelp_mod_SOURCES, fshelp_mod_CFLAGS, fshelp_mod_LDFLAGS) (fat_mod_SOURCES, fat_mod_CFLAGS, fat_mod_LDFLAGS) (ext2_mod_SOURCES, ext2_mod_CFLAGS, ext2_mod_LDFLAGS) (ufs_mod_SOURCES, ufs_mod_CFLAGS, ufs_mod_LDFLAGS) (minix_mod_SOURCES, minix_mod_CFLAGS, minix_mod_LDFLAGS) (hfs_mod_SOURCES, hfs_mod_CFLAGS, hfs_mod_LDFLAGS, jfs_mod_SOURCES) (jfs_mod_CFLAGS, jfs_mod_LDFLAGS, iso9660_mod_SOURCES) (iso9660_mod_CFLAGS, iso9660_mod_LDFLAGS, xfs_mod_SOURCES) (xfs_mod_CFLAGS, xfs_mod_LDFLAGS, affs_mod_SOURCES) (affs_mod_CFLAGS, affs_mod_LDFLAGS, sfs_mod_SOURCES) (sfs_mod_CFLAGS, sfs_mod_LDFLAGS, hello_mod_SOURCES) (hello_mod_CFLAGS, hello_mod_LDFLAGS, boot_mod_SOURCES) (boot_mod_CFLAGS, boot_mod_LDFLAGS, terminal_mod_SOURCES) (terminal_mod_CFLAGS, terminal_mod_LDFLAGS, ls_mod_SOURCES) (ls_mod_CFLAGS, ls_mod_LDFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS) (cmp_mod_LDFLAGS, cat_mod_SOURCES, cat_mod_CFLAGS, cat_mod_LDFLAGS) (help_mod_SOURCES, help_mod_CFLAGS, help_mod_LDFLAGS) (font_mod_SOURCES, font_mod_CFLAGS, font_mod_LDFLAGS) (terminfo_mod_SOURCES, terminfo_mod_CFLAGS, terminfo_mod_LDFLAGS) (amiga_mod_SOURCES, amiga_mod_CFLAGS, amiga_mod_LDFLAGS) (apple_mod_SOURCES, apple_mod_CFLAGS, apple_mod_LDFLAG): Move from here... * conf/common.rmk: ... to here. New file. Thanks, Marco