From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1JKgfY-0005fC-GN for mharc-grub-devel@gnu.org; Thu, 31 Jan 2008 16:10:00 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JKgfX-0005f6-0v for grub-devel@gnu.org; Thu, 31 Jan 2008 16:09:59 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JKgfW-0005eu-D6 for grub-devel@gnu.org; Thu, 31 Jan 2008 16:09:58 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JKgfW-0005er-9s for grub-devel@gnu.org; Thu, 31 Jan 2008 16:09:58 -0500 Received: from aybabtu.com ([69.60.117.155]) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JKgfV-00026x-UK for grub-devel@gnu.org; Thu, 31 Jan 2008 16:09:58 -0500 Received: from [192.168.10.6] (helo=thorin) by aybabtu.com with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1JKgdc-00071o-Me for grub-devel@gnu.org; Thu, 31 Jan 2008 22:08:06 +0100 Received: from rmh by thorin with local (Exim 4.63) (envelope-from ) id 1JKgbL-0004wb-WB for grub-devel@gnu.org; Thu, 31 Jan 2008 22:05:40 +0100 Date: Thu, 31 Jan 2008 22:05:39 +0100 From: Robert Millan To: The development of GRUB 2 Message-ID: <20080131210539.GA18986@thorin> References: <20080130232646.GA25637@nubol.oskuro.net> <20080131105522.GD10889@thorin> <20080131191215.GA27276@thorin> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="ikeVEW9yuYc//A+q" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20080131191215.GA27276@thorin> Organization: free as in freedom X-Message-Flag: Worried about Outlook viruses? Switch to Thunderbird! www.mozilla.com/thunderbird X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.13 (2006-08-11) X-detected-kernel: by monty-python.gnu.org: Genre and OS details not recognized. Subject: Re: powerpc fixes 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: Thu, 31 Jan 2008 21:09:59 -0000 --ikeVEW9yuYc//A+q Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit On Thu, Jan 31, 2008 at 08:12:15PM +0100, Robert Millan wrote: > On Thu, Jan 31, 2008 at 11:55:22AM +0100, Robert Millan wrote: > > > diff -Nuar grub2-1.95+20080128/conf/powerpc-ieee1275.mk buildd/grub2-1.95+20080128/conf/powerpc-ieee1275.mk > > > --- grub2-1.95+20080128/conf/powerpc-ieee1275.mk 2008-01-27 22:44:02.000000000 +0000 > > > +++ buildd/grub2-1.95+20080128/conf/powerpc-ieee1275.mk 2008-01-30 22:45:59.000000000 +0000 > > This should handle the .rmk part of the problem. It does also cleanup > some things and get rid of unused variables. > > Please can you test? New patch, hopefuly working for everyone now. -- Robert Millan I know my rights; I want my phone call! What use is a phone call… if you are unable to speak? (as seen on /.) --ikeVEW9yuYc//A+q Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="fixdeps.diff" 2008-01-31 Robert Millan * conf/i386-efi.rmk (normal/execute.c_DEPENDENCIES): Move to the top. (normal/command.c_DEPENDENCIES): New variable. (grub-emu_DEPENDENCIES, normal_mod_DEPENDENCIES): Remove variables. * conf/i386-ieee1275.rmk: Likewise. * conf/i386-linuxbios.rmk: Likewise. * conf/i386-pc.rmk: Likewise. * conf/sparc64-ieee1275.rmk: Likewise. * conf/powerpc-ieee1275.rmk: Likewise. (grub_emu_SOURCES): Add `fs/fshelp.c'. * genmk.rb: Add `$(#{src}_DEPENDENCIES)' in targets that require it. diff -x CVS -x '*~' -x '*.mk' -urp ../grub2/conf/i386-efi.rmk ./conf/i386-efi.rmk --- ../grub2/conf/i386-efi.rmk 2008-01-30 16:32:55.000000000 +0100 +++ ./conf/i386-efi.rmk 2008-01-31 16:56:45.000000000 +0100 @@ -4,6 +4,10 @@ COMMON_ASFLAGS = -nostdinc -fno-builtin COMMON_CFLAGS = -fno-builtin -m32 COMMON_LDFLAGS = -melf_i386 -nostdlib +# Used by various components. These rules need to precede them. +normal/execute.c_DEPENDENCIES = grub_script.tab.h +normal/command.c_DEPENDENCIES = grub_script.tab.h + # Utilities. bin_UTILITIES = grub-mkimage sbin_UTILITIES = grub-mkdevicemap @@ -29,8 +33,6 @@ grub_mkdevicemap_SOURCES = util/grub-mkd # For grub-emu. util/grub-emu.c_DEPENDENCIES = grub_emu_init.h -normal/execute.c_DEPENDENCIES = grub_script.tab.h -grub-emu_DEPENDENCIES = grub_script.tab.c grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \ commands/configfile.c commands/help.c \ commands/terminal.c commands/ls.c commands/test.c \ @@ -99,7 +101,6 @@ kernel_syms.lst: $(addprefix include/gru /bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1) # For normal.mod. -normal_mod_DEPENDENCIES = grub_script.tab.c grub_script.tab.h normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \ normal/completion.c normal/execute.c \ normal/function.c normal/lexer.c normal/main.c normal/menu.c \ diff -x CVS -x '*~' -x '*.mk' -urp ../grub2/conf/i386-ieee1275.rmk ./conf/i386-ieee1275.rmk --- ../grub2/conf/i386-ieee1275.rmk 2008-01-30 16:32:55.000000000 +0100 +++ ./conf/i386-ieee1275.rmk 2008-01-31 16:55:57.000000000 +0100 @@ -4,6 +4,10 @@ COMMON_ASFLAGS = -m32 -nostdinc -fno-bui COMMON_CFLAGS = -ffreestanding -mrtd -mregparm=3 COMMON_LDFLAGS = -nostdlib -static -lgcc +# Used by various components. These rules need to precede them. +normal/execute.c_DEPENDENCIES = grub_script.tab.h +normal/command.c_DEPENDENCIES = grub_script.tab.h + # Images. pkglib_PROGRAMS = kernel.elf @@ -54,8 +58,6 @@ grub_mkdevicemap_SOURCES = util/grub-mkd # For grub-emu. util/grub-emu.c_DEPENDENCIES = grub_emu_init.h -normal/execute.c_DEPENDENCIES = grub_script.tab.h -grub-emu_DEPENDENCIES = grub_script.tab.c grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \ commands/configfile.c commands/echo.c commands/help.c \ commands/terminal.c commands/ls.c commands/test.c \ @@ -93,7 +95,6 @@ pkglib_MODULES = normal.mod halt.mod reb multiboot.mod _multiboot.mod serial.mod # For normal.mod. -normal_mod_DEPENDENCIES = grub_script.tab.c grub_script.tab.h normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \ normal/completion.c normal/execute.c \ normal/function.c normal/lexer.c normal/main.c normal/menu.c \ diff -x CVS -x '*~' -x '*.mk' -urp ../grub2/conf/i386-linuxbios.rmk ./conf/i386-linuxbios.rmk --- ../grub2/conf/i386-linuxbios.rmk 2008-01-30 16:32:55.000000000 +0100 +++ ./conf/i386-linuxbios.rmk 2008-01-31 16:57:11.000000000 +0100 @@ -4,6 +4,10 @@ COMMON_ASFLAGS = -m32 -nostdinc -fno-bui COMMON_CFLAGS = -ffreestanding -mrtd -mregparm=3 COMMON_LDFLAGS = -nostdlib -static -lgcc +# Used by various components. These rules need to precede them. +normal/execute.c_DEPENDENCIES = grub_script.tab.h +normal/command.c_DEPENDENCIES = grub_script.tab.h + # Images. pkglib_PROGRAMS = kernel.elf @@ -53,8 +57,6 @@ grub_mkdevicemap_SOURCES = util/grub-mkd # For grub-emu. util/grub-emu.c_DEPENDENCIES = grub_emu_init.h -normal/execute.c_DEPENDENCIES = grub_script.tab.h -grub-emu_DEPENDENCIES = grub_script.tab.c grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \ commands/configfile.c commands/echo.c commands/help.c \ commands/terminal.c commands/ls.c commands/test.c \ @@ -103,7 +105,6 @@ linux_mod_CFLAGS = $(COMMON_CFLAGS) linux_mod_LDFLAGS = $(COMMON_LDFLAGS) # For normal.mod. -normal_mod_DEPENDENCIES = grub_script.tab.c grub_script.tab.h normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \ normal/completion.c normal/execute.c \ normal/function.c normal/lexer.c normal/main.c normal/menu.c \ diff -x CVS -x '*~' -x '*.mk' -urp ../grub2/conf/i386-pc.rmk ./conf/i386-pc.rmk --- ../grub2/conf/i386-pc.rmk 2008-01-30 16:32:56.000000000 +0100 +++ ./conf/i386-pc.rmk 2008-01-31 16:56:51.000000000 +0100 @@ -89,8 +89,6 @@ grub_mkdevicemap_SOURCES = util/grub-mkd # For grub-emu. util/grub-emu.c_DEPENDENCIES = grub_emu_init.h -normal/execute.c_DEPENDENCIES = grub_script.tab.h -grub-emu_DEPENDENCIES = grub_script.tab.c grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \ commands/configfile.c commands/echo.c commands/help.c \ commands/terminal.c commands/ls.c commands/test.c \ @@ -166,7 +164,6 @@ linux_mod_CFLAGS = $(COMMON_CFLAGS) linux_mod_LDFLAGS = $(COMMON_LDFLAGS) # For normal.mod. -normal_mod_DEPENDENCIES = grub_script.tab.c grub_script.tab.h normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \ normal/completion.c normal/execute.c \ normal/function.c normal/lexer.c normal/main.c normal/menu.c \ diff -x CVS -x '*~' -x '*.mk' -urp ../grub2/conf/powerpc-ieee1275.rmk ./conf/powerpc-ieee1275.rmk --- ../grub2/conf/powerpc-ieee1275.rmk 2008-01-30 16:32:56.000000000 +0100 +++ ./conf/powerpc-ieee1275.rmk 2008-01-31 17:02:45.000000000 +0100 @@ -5,6 +5,10 @@ COMMON_ASFLAGS = -nostdinc -D__ASSEMBLY_ COMMON_CFLAGS = -ffreestanding -msoft-float COMMON_LDFLAGS += -nostdlib +# Used by various components. These rules need to precede them. +normal/execute.c_DEPENDENCIES = grub_script.tab.h +normal/command.c_DEPENDENCIES = grub_script.tab.h + # Images. MOSTLYCLEANFILES += kernel_elf_symlist.c kernel_syms.lst @@ -41,8 +45,6 @@ grub_mkdevicemap_SOURCES = util/grub-mkd # For grub-emu util/grub-emu.c_DEPENDENCIES = grub_emu_init.h -normal/execute.c_DEPENDENCIES = grub_script.tab.h -grub-emu_DEPENDENCIES = grub_script.tab.c grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \ commands/configfile.c commands/help.c \ commands/search.c commands/terminal.c commands/test.c \ @@ -59,7 +61,7 @@ grub_emu_SOURCES = commands/boot.c comma kern/device.c kern/disk.c kern/dl.c kern/elf.c kern/env.c \ kern/err.c kern/file.c kern/fs.c kern/loader.c kern/main.c \ kern/misc.c kern/parser.c kern/partition.c kern/rescue.c \ - kern/term.c \ + kern/term.c fs/fshelp.c \ normal/arg.c normal/cmdline.c normal/command.c \ normal/completion.c normal/execute.c \ normal/function.c normal/lexer.c normal/main.c normal/menu.c \ @@ -114,7 +116,6 @@ linux_mod_CFLAGS = $(COMMON_CFLAGS) linux_mod_LDFLAGS = $(COMMON_LDFLAGS) # For normal.mod. -normal_mod_DEPENDENCIES = grub_script.tab.c grub_script.tab.h normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \ normal/completion.c normal/execute.c \ normal/function.c normal/lexer.c normal/main.c normal/menu.c \ diff -x CVS -x '*~' -x '*.mk' -urp ../grub2/conf/sparc64-ieee1275.rmk ./conf/sparc64-ieee1275.rmk --- ../grub2/conf/sparc64-ieee1275.rmk 2007-12-25 10:09:43.000000000 +0100 +++ ./conf/sparc64-ieee1275.rmk 2008-01-31 16:57:39.000000000 +0100 @@ -5,6 +5,10 @@ COMMON_ASFLAGS = -nostdinc COMMON_CFLAGS = -ggdb -ffreestanding -m64 -mno-app-regs COMMON_LDFLAGS = -melf64_sparc -nostdlib +# Used by various components. These rules need to precede them. +normal/execute.c_DEPENDENCIES = grub_script.tab.h +normal/command.c_DEPENDENCIES = grub_script.tab.h + # Images. MOSTLYCLEANFILES += kernel_elf_symlist.c kernel_syms.lst @@ -151,7 +155,6 @@ sfs_mod_LDFLAGS = $(COMMON_LDFLAGS) #linux_mod_LDFLAGS = $(COMMON_LDFLAGS) # For normal.mod. -normal_mod_DEPENDENCIES = grub_script.tab.c grub_script.tab.h normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \ normal/completion.c normal/execute.c \ normal/function.c normal/lexer.c normal/main.c normal/menu.c \ diff -x CVS -x '*~' -x '*.mk' -urp ../grub2/genmk.rb ./genmk.rb --- ../grub2/genmk.rb 2008-01-25 23:33:56.000000000 +0100 +++ ./genmk.rb 2008-01-31 22:00:28.000000000 +0100 @@ -70,7 +70,7 @@ MOSTLYCLEANFILES += #{deps_str} extra_flags = if /\.S$/ =~ src then '-DASM_FILE=1' else '' end dir = File.dirname(src) - "#{obj}: #{src} + "#{obj}: #{src} $(#{src}_DEPENDENCIES) $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -MD -c -o $@ $< -include #{dep} @@ -146,7 +146,7 @@ endif extra_flags = if /\.S$/ =~ src then '-DASM_FILE=1' else '' end dir = File.dirname(src) - "#{obj}: #{src} + "#{obj}: #{src} $(#{src}_DEPENDENCIES) $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -MD -c -o $@ $< -include #{dep} @@ -154,12 +154,12 @@ CLEANFILES += #{command} #{fs} COMMANDFILES += #{command} FSFILES += #{fs} -#{command}: #{src} gencmdlist.sh +#{command}: #{src} $(#{src}_DEPENDENCIES) gencmdlist.sh set -e; \ $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \ | sh $(srcdir)/gencmdlist.sh #{symbolic_name} > $@ || (rm -f $@; exit 1) -#{fs}: #{src} genfslist.sh +#{fs}: #{src} $(#{src}_DEPENDENCIES) genfslist.sh set -e; \ $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \ | sh $(srcdir)/genfslist.sh #{symbolic_name} > $@ || (rm -f $@; exit 1) @@ -237,7 +237,7 @@ MOSTLYCLEANFILES += #{deps_str} dep = deps[i] dir = File.dirname(src) - "#{obj}: #{src} + "#{obj}: #{src} $(#{src}_DEPENDENCIES) $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(#{prefix}_CFLAGS) -MD -c -o $@ $< -include #{dep} @@ -264,7 +264,7 @@ class Script "CLEANFILES += #{@name} -#{@name}: #{src} config.status +#{@name}: #{src} $(#{src}_DEPENDENCIES) config.status ./config.status --file=#{name}:#{src} chmod +x $@ --ikeVEW9yuYc//A+q--