2002-12-27 08:53:07 +00:00
|
|
|
#! /usr/bin/ruby -w
|
|
|
|
#
|
2004-12-27 Marco Gerards <metgerards@student.han.nl>
* genmk.rb: Handle the `Program' class in the main loop. Written
by Johan Rydberg <jrydberg@gnu.org>.
(Program): New class.
(programs): New variable.
* boot/powerpc/ieee1275/cmain.c: Include <grub/machine/ieee1275.h>
instead of "grub/machine/ieee1275.h". Include <grub/kernel.h>
instead of "grub/kernel.h". Include <grub/machine/init.h>.
(help_arch): Function removed.
* conf/powerpc-ieee1275.rmk (grubof_HEADERS): Add
`powerpc/libgcc.h' and `loader.h'.
(pkgdata_PROGRAMS): New variable.
(sbin_UTILITIES): Variable removed.
(grub_emu_SOURCES): Added kern/powerpc/cache.S.
(grubof_SOURCES): Variable re-defined so it only includes the
core functionality.
(grubof_CFLAGS): Remove `-DGRUBOF'.
(pkgdata_MODULES, fshelp_mod_SOURCES, fshelp_mod_CFLAGS,
(fat_mod_SOURCES, fat_mod_CFLAGS, ext2_mod_SOURCES)
(ext2_mod_CFLAGS, ufs_mod_SOURCES, ufs_mod_CFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, hfs_mod_SOURCES)
(hfs_mod_CFLAGS, jfs_mod_SOURCES, jfs_mod_CFLAGS)
(iso9660_mod_SOURCES, iso9660_mod_CFLAGS, _linux_mod_SOURCES)
(_linux_mod_CFLAGS, linux_mod_SOURCES, linux_mod_CFLAGS)
(normal_mod_SOURCES, normal_mod_CFLAGS, normal_mod_ASFLAGS)
(hello_mod_SOURCES, hello_mod_CFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, terminal_mod_SOURCES, terminal_mod_CFLAGS)
(ls_mod_SOURCES, ls_mod_CFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cat_mod_SOURCES, cat_mod_CFLAGS, font_mod_SOURCES)
(font_mod_CFLAGS, amiga_mod_SOURCES, amiga_mod_CFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, pc_mod_SOURCES)
(pc_mod_CFLAGS): New variables.
* disk/powerpc/ieee1275/ofdisk.c: Include <grub/machine/init.h>.
(grub_ofdisk_iterate): Add a prototype for `dev_iterate'.
* include/grub/dl.h (grub_arch_dl_sync_caches): New prototype.
* include/grub/loader.h (grub_os_area_addr, grub_os_area_size):
Moved from here...
* include/grub/i386/pc/init.h (grub_os_area_addr)
(rub_os_area_size): ... to here.
* include/grub/powerpc/ieee1275/ieee1275.h
(grub_ieee1275_entry_fn): Export symbol.
* include/grub/powerpc/ieee1275/init.h: New file.
* include/grub/powerpc/libgcc.h: Likewise.
* include/grub/cache.h: Likewise.
* kern/powerpc/cache.S: Likewise. Written by Hollis Blanchard
<hollis@penguinppc.org>.
* kern/dl.c: Include <grub/cache.h>.
(grub_dl_flush_cache): New function.
(grub_dl_load_core): Call `grub_dl_flush_cache' to flush the cache
for this module.
* kern/powerpc/ieee1275/init.c (grub_ofdisk_init)
(grub_console_init): Removed prototypes.
(grub_machine_init): Don't initialize the modules anymore.
* kern/powerpc/ieee1275/openfw.c (grub_map): Make the function
static.
* include/grub/powerpc/types.h (GRUB_HOST_WORDS_LITTLEENDIAN):
Macro undef removed.
(GRUB_HOST_WORDS_BIGENDIAN): New macro.
* kern/powerpc/dl.c (grub_arch_dl_relocate_symbols): Add
relocation `R_PPC_REL32'. Return an error when the relocation is
unknown.
* Makefile.in (DATA): Add `$(pkgdata_PROGRAMS)'.
* kern/i386/pc/init.c (grub_arch_sync_caches): New function.
* util/misc.c (grub_arch_sync_caches): Likewise.
2004-12-27 13:46:20 +00:00
|
|
|
# Copyright (C) 2002,2003,2004 Free Software Foundation, Inc.
|
2002-12-27 08:53:07 +00:00
|
|
|
#
|
|
|
|
# This genmk.rb is free software; the author
|
|
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
#
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
|
|
|
|
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
|
|
|
# PARTICULAR PURPOSE.
|
|
|
|
|
|
|
|
module Enumerable
|
|
|
|
def collect_with_index
|
|
|
|
ret = []
|
|
|
|
self.each_with_index do |item, index|
|
|
|
|
ret.push(yield(item, index))
|
|
|
|
end
|
|
|
|
ret
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
class String
|
|
|
|
def to_var
|
|
|
|
self.gsub(/[^a-zA-Z0-9_@]/, '_')
|
|
|
|
end
|
|
|
|
|
|
|
|
def suffix(str)
|
|
|
|
self.sub(/\.[^\.]*$/, '') + '.' + str
|
|
|
|
end
|
|
|
|
|
|
|
|
def to_obj
|
|
|
|
self.sub(/\.[^\.]*$/, '').to_var + '.o'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
class Image
|
|
|
|
def initialize(dir, name)
|
|
|
|
@dir = dir
|
|
|
|
@name = name
|
|
|
|
end
|
|
|
|
attr_reader :dir, :name
|
|
|
|
|
|
|
|
def rule(sources)
|
|
|
|
prefix = @name.to_var
|
|
|
|
exe = @name.suffix('exec')
|
|
|
|
objs = sources.collect do |src|
|
|
|
|
raise "unknown source file `#{src}'" if /\.[cS]$/ !~ src
|
|
|
|
prefix + '-' + src.to_obj
|
|
|
|
end
|
|
|
|
objs_str = objs.join(' ')
|
|
|
|
deps = objs.collect {|obj| obj.suffix('d')}
|
|
|
|
deps_str = deps.join(' ')
|
|
|
|
|
|
|
|
"CLEANFILES += #{@name} #{exe} #{objs_str}
|
|
|
|
MOSTLYCLEANFILES += #{deps_str}
|
|
|
|
|
|
|
|
#{@name}: #{exe}
|
|
|
|
$(OBJCOPY) -O binary -R .note -R .comment $< $@
|
|
|
|
|
|
|
|
#{exe}: #{objs_str}
|
2003-01-31 03:26:56 +00:00
|
|
|
$(CC) -o $@ $^ $(LDFLAGS) $(#{prefix}_LDFLAGS)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
" + objs.collect_with_index do |obj, i|
|
|
|
|
src = sources[i]
|
|
|
|
fake_obj = File.basename(src).suffix('o')
|
|
|
|
dep = deps[i]
|
|
|
|
flag = if /\.c$/ =~ src then 'CFLAGS' else 'ASFLAGS' end
|
|
|
|
extra_flags = if /\.S$/ =~ src then '-DASM_FILE=1' else '' end
|
|
|
|
dir = File.dirname(src)
|
|
|
|
|
|
|
|
"#{obj}: #{src}
|
|
|
|
$(CC) -I#{dir} -I$(srcdir)/#{dir} $(CPPFLAGS) #{extra_flags} $(#{flag}) $(#{prefix}_#{flag}) -c -o $@ $<
|
|
|
|
|
|
|
|
#{dep}: #{src}
|
|
|
|
set -e; \
|
|
|
|
$(CC) -I#{dir} -I$(srcdir)/#{dir} $(CPPFLAGS) #{extra_flags} $(#{flag}) $(#{prefix}_#{flag}) -M $< \
|
|
|
|
| sed 's,#{Regexp.quote(fake_obj)}[ :]*,#{obj} $@ : ,g' > $@; \
|
|
|
|
[ -s $@ ] || rm -f $@
|
|
|
|
|
|
|
|
-include #{dep}
|
|
|
|
|
|
|
|
"
|
|
|
|
end.join('')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
# Use PModule instead Module, to avoid name conflicting.
|
|
|
|
class PModule
|
|
|
|
def initialize(dir, name)
|
|
|
|
@dir = dir
|
|
|
|
@name = name
|
|
|
|
end
|
|
|
|
attr_reader :dir, :name
|
|
|
|
|
|
|
|
def rule(sources)
|
|
|
|
prefix = @name.to_var
|
|
|
|
objs = sources.collect do |src|
|
|
|
|
raise "unknown source file `#{src}'" if /\.[cS]$/ !~ src
|
|
|
|
prefix + '-' + src.to_obj
|
|
|
|
end
|
|
|
|
objs_str = objs.join(' ')
|
|
|
|
deps = objs.collect {|obj| obj.suffix('d')}
|
|
|
|
deps_str = deps.join(' ')
|
|
|
|
pre_obj = 'pre-' + @name.suffix('o')
|
|
|
|
mod_src = 'mod-' + @name.suffix('c')
|
|
|
|
mod_obj = mod_src.suffix('o')
|
|
|
|
defsym = 'def-' + @name.suffix('lst')
|
|
|
|
undsym = 'und-' + @name.suffix('lst')
|
|
|
|
mod_name = File.basename(@name, '.mod')
|
|
|
|
|
|
|
|
"CLEANFILES += #{@name} #{mod_obj} #{mod_src} #{pre_obj} #{objs_str} #{defsym} #{undsym}
|
|
|
|
MOSTLYCLEANFILES += #{deps_str}
|
|
|
|
DEFSYMFILES += #{defsym}
|
|
|
|
UNDSYMFILES += #{undsym}
|
|
|
|
|
|
|
|
#{@name}: #{pre_obj} #{mod_obj}
|
|
|
|
-rm -f $@
|
2005-01-20 17:33:09 +00:00
|
|
|
$(LD) -r -d -o $@ $^
|
2004-04-04 13:46:03 +00:00
|
|
|
$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
#{pre_obj}: #{objs_str}
|
|
|
|
-rm -f $@
|
2005-01-20 17:33:09 +00:00
|
|
|
$(LD) -r -d -o $@ $^
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
#{mod_obj}: #{mod_src}
|
2002-12-28 07:16:30 +00:00
|
|
|
$(CC) $(CPPFLAGS) $(CFLAGS) $(#{prefix}_CFLAGS) -c -o $@ $<
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
#{mod_src}: moddep.lst genmodsrc.sh
|
|
|
|
sh $(srcdir)/genmodsrc.sh '#{mod_name}' $< > $@ || (rm -f $@; exit 1)
|
|
|
|
|
|
|
|
#{defsym}: #{pre_obj}
|
|
|
|
$(NM) -g --defined-only -P -p $< | sed 's/^\\([^ ]*\\).*/\\1 #{mod_name}/' > $@
|
|
|
|
|
|
|
|
#{undsym}: #{pre_obj}
|
|
|
|
echo '#{mod_name}' > $@
|
2003-09-25 20:29:32 +00:00
|
|
|
$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
" + objs.collect_with_index do |obj, i|
|
|
|
|
src = sources[i]
|
|
|
|
fake_obj = File.basename(src).suffix('o')
|
|
|
|
dep = deps[i]
|
|
|
|
flag = if /\.c$/ =~ src then 'CFLAGS' else 'ASFLAGS' end
|
|
|
|
dir = File.dirname(src)
|
|
|
|
|
|
|
|
"#{obj}: #{src}
|
|
|
|
$(CC) -I#{dir} -I$(srcdir)/#{dir} $(CPPFLAGS) $(#{flag}) $(#{prefix}_#{flag}) -c -o $@ $<
|
|
|
|
|
|
|
|
#{dep}: #{src}
|
|
|
|
set -e; \
|
|
|
|
$(CC) -I#{dir} -I$(srcdir)/#{dir} $(CPPFLAGS) $(#{flag}) $(#{prefix}_#{flag}) -M $< \
|
|
|
|
| sed 's,#{Regexp.quote(fake_obj)}[ :]*,#{obj} $@ : ,g' > $@; \
|
|
|
|
[ -s $@ ] || rm -f $@
|
|
|
|
|
|
|
|
-include #{dep}
|
|
|
|
|
|
|
|
"
|
|
|
|
end.join('')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
class Utility
|
|
|
|
def initialize(dir, name)
|
|
|
|
@dir = dir
|
|
|
|
@name = name
|
|
|
|
end
|
|
|
|
attr_reader :dir, :name
|
|
|
|
|
|
|
|
def rule(sources)
|
|
|
|
prefix = @name.to_var
|
|
|
|
objs = sources.collect do |src|
|
2004-03-28 21:52:02 +00:00
|
|
|
raise "unknown source file `#{src}'" if /\.[cS]$/ !~ src
|
2002-12-27 08:53:07 +00:00
|
|
|
prefix + '-' + src.to_obj
|
|
|
|
end
|
|
|
|
objs_str = objs.join(' ');
|
|
|
|
deps = objs.collect {|obj| obj.suffix('d')}
|
|
|
|
deps_str = deps.join(' ');
|
|
|
|
|
|
|
|
"CLEANFILES += #{@name} #{objs_str}
|
|
|
|
MOSTLYCLEANFILES += #{deps_str}
|
|
|
|
|
|
|
|
#{@name}: #{objs_str}
|
2003-01-31 03:26:56 +00:00
|
|
|
$(BUILD_CC) -o $@ $^ $(BUILD_LDFLAGS) $(#{prefix}_LDFLAGS)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
" + objs.collect_with_index do |obj, i|
|
|
|
|
src = sources[i]
|
|
|
|
fake_obj = File.basename(src).suffix('o')
|
|
|
|
dep = deps[i]
|
|
|
|
dir = File.dirname(src)
|
|
|
|
|
|
|
|
"#{obj}: #{src}
|
2004-04-04 13:46:03 +00:00
|
|
|
$(BUILD_CC) -I#{dir} -I$(srcdir)/#{dir} $(BUILD_CPPFLAGS) $(BUILD_CFLAGS) -DGRUB_UTIL=1 $(#{prefix}_CFLAGS) -c -o $@ $<
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
#{dep}: #{src}
|
|
|
|
set -e; \
|
2004-04-04 13:46:03 +00:00
|
|
|
$(BUILD_CC) -I#{dir} -I$(srcdir)/#{dir} $(BUILD_CPPFLAGS) $(BUILD_CFLAGS) -DGRUB_UTIL=1 $(#{prefix}_CFLAGS) -M $< \
|
2002-12-27 08:53:07 +00:00
|
|
|
| sed 's,#{Regexp.quote(fake_obj)}[ :]*,#{obj} $@ : ,g' > $@; \
|
|
|
|
[ -s $@ ] || rm -f $@
|
|
|
|
|
|
|
|
-include #{dep}
|
|
|
|
|
|
|
|
"
|
|
|
|
end.join('')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2004-12-27 Marco Gerards <metgerards@student.han.nl>
* genmk.rb: Handle the `Program' class in the main loop. Written
by Johan Rydberg <jrydberg@gnu.org>.
(Program): New class.
(programs): New variable.
* boot/powerpc/ieee1275/cmain.c: Include <grub/machine/ieee1275.h>
instead of "grub/machine/ieee1275.h". Include <grub/kernel.h>
instead of "grub/kernel.h". Include <grub/machine/init.h>.
(help_arch): Function removed.
* conf/powerpc-ieee1275.rmk (grubof_HEADERS): Add
`powerpc/libgcc.h' and `loader.h'.
(pkgdata_PROGRAMS): New variable.
(sbin_UTILITIES): Variable removed.
(grub_emu_SOURCES): Added kern/powerpc/cache.S.
(grubof_SOURCES): Variable re-defined so it only includes the
core functionality.
(grubof_CFLAGS): Remove `-DGRUBOF'.
(pkgdata_MODULES, fshelp_mod_SOURCES, fshelp_mod_CFLAGS,
(fat_mod_SOURCES, fat_mod_CFLAGS, ext2_mod_SOURCES)
(ext2_mod_CFLAGS, ufs_mod_SOURCES, ufs_mod_CFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, hfs_mod_SOURCES)
(hfs_mod_CFLAGS, jfs_mod_SOURCES, jfs_mod_CFLAGS)
(iso9660_mod_SOURCES, iso9660_mod_CFLAGS, _linux_mod_SOURCES)
(_linux_mod_CFLAGS, linux_mod_SOURCES, linux_mod_CFLAGS)
(normal_mod_SOURCES, normal_mod_CFLAGS, normal_mod_ASFLAGS)
(hello_mod_SOURCES, hello_mod_CFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, terminal_mod_SOURCES, terminal_mod_CFLAGS)
(ls_mod_SOURCES, ls_mod_CFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cat_mod_SOURCES, cat_mod_CFLAGS, font_mod_SOURCES)
(font_mod_CFLAGS, amiga_mod_SOURCES, amiga_mod_CFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, pc_mod_SOURCES)
(pc_mod_CFLAGS): New variables.
* disk/powerpc/ieee1275/ofdisk.c: Include <grub/machine/init.h>.
(grub_ofdisk_iterate): Add a prototype for `dev_iterate'.
* include/grub/dl.h (grub_arch_dl_sync_caches): New prototype.
* include/grub/loader.h (grub_os_area_addr, grub_os_area_size):
Moved from here...
* include/grub/i386/pc/init.h (grub_os_area_addr)
(rub_os_area_size): ... to here.
* include/grub/powerpc/ieee1275/ieee1275.h
(grub_ieee1275_entry_fn): Export symbol.
* include/grub/powerpc/ieee1275/init.h: New file.
* include/grub/powerpc/libgcc.h: Likewise.
* include/grub/cache.h: Likewise.
* kern/powerpc/cache.S: Likewise. Written by Hollis Blanchard
<hollis@penguinppc.org>.
* kern/dl.c: Include <grub/cache.h>.
(grub_dl_flush_cache): New function.
(grub_dl_load_core): Call `grub_dl_flush_cache' to flush the cache
for this module.
* kern/powerpc/ieee1275/init.c (grub_ofdisk_init)
(grub_console_init): Removed prototypes.
(grub_machine_init): Don't initialize the modules anymore.
* kern/powerpc/ieee1275/openfw.c (grub_map): Make the function
static.
* include/grub/powerpc/types.h (GRUB_HOST_WORDS_LITTLEENDIAN):
Macro undef removed.
(GRUB_HOST_WORDS_BIGENDIAN): New macro.
* kern/powerpc/dl.c (grub_arch_dl_relocate_symbols): Add
relocation `R_PPC_REL32'. Return an error when the relocation is
unknown.
* Makefile.in (DATA): Add `$(pkgdata_PROGRAMS)'.
* kern/i386/pc/init.c (grub_arch_sync_caches): New function.
* util/misc.c (grub_arch_sync_caches): Likewise.
2004-12-27 13:46:20 +00:00
|
|
|
class Program
|
|
|
|
def initialize(dir, name)
|
|
|
|
@dir = dir
|
|
|
|
@name = name
|
|
|
|
end
|
|
|
|
attr_reader :dir, :name
|
|
|
|
|
|
|
|
def rule(sources)
|
|
|
|
prefix = @name.to_var
|
|
|
|
objs = sources.collect do |src|
|
|
|
|
raise "unknown source file `#{src}'" if /\.[cS]$/ !~ src
|
|
|
|
prefix + '-' + src.to_obj
|
|
|
|
end
|
|
|
|
objs_str = objs.join(' ');
|
|
|
|
deps = objs.collect {|obj| obj.suffix('d')}
|
|
|
|
deps_str = deps.join(' ');
|
|
|
|
|
|
|
|
"CLEANFILES += #{@name} #{objs_str}
|
|
|
|
MOSTLYCLEANFILES += #{deps_str}
|
|
|
|
|
|
|
|
#{@name}: #{objs_str}
|
|
|
|
$(BUILD_CC) -o $@ $^ $(BUILD_LDFLAGS) $(#{prefix}_LDFLAGS)
|
|
|
|
|
|
|
|
" + objs.collect_with_index do |obj, i|
|
|
|
|
src = sources[i]
|
|
|
|
fake_obj = File.basename(src).suffix('o')
|
|
|
|
dep = deps[i]
|
|
|
|
dir = File.dirname(src)
|
|
|
|
|
|
|
|
"#{obj}: #{src}
|
|
|
|
$(CC) -I#{dir} -I$(srcdir)/#{dir} $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(#{prefix}_CFLAGS) -c -o $@ $<
|
|
|
|
|
|
|
|
#{dep}: #{src}
|
|
|
|
set -e; \
|
|
|
|
$(CC) -I#{dir} -I$(srcdir)/#{dir} $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(#{prefix}_CFLAGS) -M $< \
|
|
|
|
| sed 's,#{Regexp.quote(fake_obj)}[ :]*,#{obj} $@ : ,g' > $@; \
|
|
|
|
[ -s $@ ] || rm -f $@
|
|
|
|
|
|
|
|
-include #{dep}
|
|
|
|
|
|
|
|
"
|
|
|
|
end.join('')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2002-12-27 08:53:07 +00:00
|
|
|
images = []
|
|
|
|
utils = []
|
|
|
|
pmodules = []
|
2004-12-27 Marco Gerards <metgerards@student.han.nl>
* genmk.rb: Handle the `Program' class in the main loop. Written
by Johan Rydberg <jrydberg@gnu.org>.
(Program): New class.
(programs): New variable.
* boot/powerpc/ieee1275/cmain.c: Include <grub/machine/ieee1275.h>
instead of "grub/machine/ieee1275.h". Include <grub/kernel.h>
instead of "grub/kernel.h". Include <grub/machine/init.h>.
(help_arch): Function removed.
* conf/powerpc-ieee1275.rmk (grubof_HEADERS): Add
`powerpc/libgcc.h' and `loader.h'.
(pkgdata_PROGRAMS): New variable.
(sbin_UTILITIES): Variable removed.
(grub_emu_SOURCES): Added kern/powerpc/cache.S.
(grubof_SOURCES): Variable re-defined so it only includes the
core functionality.
(grubof_CFLAGS): Remove `-DGRUBOF'.
(pkgdata_MODULES, fshelp_mod_SOURCES, fshelp_mod_CFLAGS,
(fat_mod_SOURCES, fat_mod_CFLAGS, ext2_mod_SOURCES)
(ext2_mod_CFLAGS, ufs_mod_SOURCES, ufs_mod_CFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, hfs_mod_SOURCES)
(hfs_mod_CFLAGS, jfs_mod_SOURCES, jfs_mod_CFLAGS)
(iso9660_mod_SOURCES, iso9660_mod_CFLAGS, _linux_mod_SOURCES)
(_linux_mod_CFLAGS, linux_mod_SOURCES, linux_mod_CFLAGS)
(normal_mod_SOURCES, normal_mod_CFLAGS, normal_mod_ASFLAGS)
(hello_mod_SOURCES, hello_mod_CFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, terminal_mod_SOURCES, terminal_mod_CFLAGS)
(ls_mod_SOURCES, ls_mod_CFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cat_mod_SOURCES, cat_mod_CFLAGS, font_mod_SOURCES)
(font_mod_CFLAGS, amiga_mod_SOURCES, amiga_mod_CFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, pc_mod_SOURCES)
(pc_mod_CFLAGS): New variables.
* disk/powerpc/ieee1275/ofdisk.c: Include <grub/machine/init.h>.
(grub_ofdisk_iterate): Add a prototype for `dev_iterate'.
* include/grub/dl.h (grub_arch_dl_sync_caches): New prototype.
* include/grub/loader.h (grub_os_area_addr, grub_os_area_size):
Moved from here...
* include/grub/i386/pc/init.h (grub_os_area_addr)
(rub_os_area_size): ... to here.
* include/grub/powerpc/ieee1275/ieee1275.h
(grub_ieee1275_entry_fn): Export symbol.
* include/grub/powerpc/ieee1275/init.h: New file.
* include/grub/powerpc/libgcc.h: Likewise.
* include/grub/cache.h: Likewise.
* kern/powerpc/cache.S: Likewise. Written by Hollis Blanchard
<hollis@penguinppc.org>.
* kern/dl.c: Include <grub/cache.h>.
(grub_dl_flush_cache): New function.
(grub_dl_load_core): Call `grub_dl_flush_cache' to flush the cache
for this module.
* kern/powerpc/ieee1275/init.c (grub_ofdisk_init)
(grub_console_init): Removed prototypes.
(grub_machine_init): Don't initialize the modules anymore.
* kern/powerpc/ieee1275/openfw.c (grub_map): Make the function
static.
* include/grub/powerpc/types.h (GRUB_HOST_WORDS_LITTLEENDIAN):
Macro undef removed.
(GRUB_HOST_WORDS_BIGENDIAN): New macro.
* kern/powerpc/dl.c (grub_arch_dl_relocate_symbols): Add
relocation `R_PPC_REL32'. Return an error when the relocation is
unknown.
* Makefile.in (DATA): Add `$(pkgdata_PROGRAMS)'.
* kern/i386/pc/init.c (grub_arch_sync_caches): New function.
* util/misc.c (grub_arch_sync_caches): Likewise.
2004-12-27 13:46:20 +00:00
|
|
|
programs = []
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
cont = false
|
|
|
|
s = nil
|
|
|
|
while l = gets
|
|
|
|
if cont
|
|
|
|
s += l
|
|
|
|
else
|
|
|
|
s = l
|
|
|
|
end
|
|
|
|
|
|
|
|
print l
|
|
|
|
cont = (/\\$/ =~ l)
|
|
|
|
unless cont
|
|
|
|
s.gsub!(/\\\n/, ' ')
|
|
|
|
|
|
|
|
if /^([a-zA-Z0-9_]+)\s*=\s*(.*?)\s*$/ =~ s
|
|
|
|
var, args = $1, $2
|
|
|
|
|
|
|
|
if var =~ /^([a-zA-Z0-9_]+)_([A-Z]+)$/
|
|
|
|
prefix, type = $1, $2
|
|
|
|
|
|
|
|
case type
|
|
|
|
when 'IMAGES'
|
|
|
|
images += args.split(/\s+/).collect do |img|
|
|
|
|
Image.new(prefix, img)
|
|
|
|
end
|
|
|
|
|
|
|
|
when 'MODULES'
|
|
|
|
pmodules += args.split(/\s+/).collect do |pmod|
|
|
|
|
PModule.new(prefix, pmod)
|
|
|
|
end
|
|
|
|
|
|
|
|
when 'UTILITIES'
|
|
|
|
utils += args.split(/\s+/).collect do |util|
|
|
|
|
Utility.new(prefix, util)
|
|
|
|
end
|
|
|
|
|
2004-12-27 Marco Gerards <metgerards@student.han.nl>
* genmk.rb: Handle the `Program' class in the main loop. Written
by Johan Rydberg <jrydberg@gnu.org>.
(Program): New class.
(programs): New variable.
* boot/powerpc/ieee1275/cmain.c: Include <grub/machine/ieee1275.h>
instead of "grub/machine/ieee1275.h". Include <grub/kernel.h>
instead of "grub/kernel.h". Include <grub/machine/init.h>.
(help_arch): Function removed.
* conf/powerpc-ieee1275.rmk (grubof_HEADERS): Add
`powerpc/libgcc.h' and `loader.h'.
(pkgdata_PROGRAMS): New variable.
(sbin_UTILITIES): Variable removed.
(grub_emu_SOURCES): Added kern/powerpc/cache.S.
(grubof_SOURCES): Variable re-defined so it only includes the
core functionality.
(grubof_CFLAGS): Remove `-DGRUBOF'.
(pkgdata_MODULES, fshelp_mod_SOURCES, fshelp_mod_CFLAGS,
(fat_mod_SOURCES, fat_mod_CFLAGS, ext2_mod_SOURCES)
(ext2_mod_CFLAGS, ufs_mod_SOURCES, ufs_mod_CFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, hfs_mod_SOURCES)
(hfs_mod_CFLAGS, jfs_mod_SOURCES, jfs_mod_CFLAGS)
(iso9660_mod_SOURCES, iso9660_mod_CFLAGS, _linux_mod_SOURCES)
(_linux_mod_CFLAGS, linux_mod_SOURCES, linux_mod_CFLAGS)
(normal_mod_SOURCES, normal_mod_CFLAGS, normal_mod_ASFLAGS)
(hello_mod_SOURCES, hello_mod_CFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, terminal_mod_SOURCES, terminal_mod_CFLAGS)
(ls_mod_SOURCES, ls_mod_CFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cat_mod_SOURCES, cat_mod_CFLAGS, font_mod_SOURCES)
(font_mod_CFLAGS, amiga_mod_SOURCES, amiga_mod_CFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, pc_mod_SOURCES)
(pc_mod_CFLAGS): New variables.
* disk/powerpc/ieee1275/ofdisk.c: Include <grub/machine/init.h>.
(grub_ofdisk_iterate): Add a prototype for `dev_iterate'.
* include/grub/dl.h (grub_arch_dl_sync_caches): New prototype.
* include/grub/loader.h (grub_os_area_addr, grub_os_area_size):
Moved from here...
* include/grub/i386/pc/init.h (grub_os_area_addr)
(rub_os_area_size): ... to here.
* include/grub/powerpc/ieee1275/ieee1275.h
(grub_ieee1275_entry_fn): Export symbol.
* include/grub/powerpc/ieee1275/init.h: New file.
* include/grub/powerpc/libgcc.h: Likewise.
* include/grub/cache.h: Likewise.
* kern/powerpc/cache.S: Likewise. Written by Hollis Blanchard
<hollis@penguinppc.org>.
* kern/dl.c: Include <grub/cache.h>.
(grub_dl_flush_cache): New function.
(grub_dl_load_core): Call `grub_dl_flush_cache' to flush the cache
for this module.
* kern/powerpc/ieee1275/init.c (grub_ofdisk_init)
(grub_console_init): Removed prototypes.
(grub_machine_init): Don't initialize the modules anymore.
* kern/powerpc/ieee1275/openfw.c (grub_map): Make the function
static.
* include/grub/powerpc/types.h (GRUB_HOST_WORDS_LITTLEENDIAN):
Macro undef removed.
(GRUB_HOST_WORDS_BIGENDIAN): New macro.
* kern/powerpc/dl.c (grub_arch_dl_relocate_symbols): Add
relocation `R_PPC_REL32'. Return an error when the relocation is
unknown.
* Makefile.in (DATA): Add `$(pkgdata_PROGRAMS)'.
* kern/i386/pc/init.c (grub_arch_sync_caches): New function.
* util/misc.c (grub_arch_sync_caches): Likewise.
2004-12-27 13:46:20 +00:00
|
|
|
when 'PROGRAMS'
|
|
|
|
programs += args.split(/\s+/).collect do |util|
|
|
|
|
Program.new(prefix, util)
|
|
|
|
end
|
|
|
|
|
2002-12-27 08:53:07 +00:00
|
|
|
when 'SOURCES'
|
|
|
|
if img = images.detect() {|i| i.name.to_var == prefix}
|
|
|
|
print img.rule(args.split(/\s+/))
|
|
|
|
elsif pmod = pmodules.detect() {|m| m.name.to_var == prefix}
|
|
|
|
print pmod.rule(args.split(/\s+/))
|
|
|
|
elsif util = utils.detect() {|u| u.name.to_var == prefix}
|
|
|
|
print util.rule(args.split(/\s+/))
|
2004-12-27 Marco Gerards <metgerards@student.han.nl>
* genmk.rb: Handle the `Program' class in the main loop. Written
by Johan Rydberg <jrydberg@gnu.org>.
(Program): New class.
(programs): New variable.
* boot/powerpc/ieee1275/cmain.c: Include <grub/machine/ieee1275.h>
instead of "grub/machine/ieee1275.h". Include <grub/kernel.h>
instead of "grub/kernel.h". Include <grub/machine/init.h>.
(help_arch): Function removed.
* conf/powerpc-ieee1275.rmk (grubof_HEADERS): Add
`powerpc/libgcc.h' and `loader.h'.
(pkgdata_PROGRAMS): New variable.
(sbin_UTILITIES): Variable removed.
(grub_emu_SOURCES): Added kern/powerpc/cache.S.
(grubof_SOURCES): Variable re-defined so it only includes the
core functionality.
(grubof_CFLAGS): Remove `-DGRUBOF'.
(pkgdata_MODULES, fshelp_mod_SOURCES, fshelp_mod_CFLAGS,
(fat_mod_SOURCES, fat_mod_CFLAGS, ext2_mod_SOURCES)
(ext2_mod_CFLAGS, ufs_mod_SOURCES, ufs_mod_CFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, hfs_mod_SOURCES)
(hfs_mod_CFLAGS, jfs_mod_SOURCES, jfs_mod_CFLAGS)
(iso9660_mod_SOURCES, iso9660_mod_CFLAGS, _linux_mod_SOURCES)
(_linux_mod_CFLAGS, linux_mod_SOURCES, linux_mod_CFLAGS)
(normal_mod_SOURCES, normal_mod_CFLAGS, normal_mod_ASFLAGS)
(hello_mod_SOURCES, hello_mod_CFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, terminal_mod_SOURCES, terminal_mod_CFLAGS)
(ls_mod_SOURCES, ls_mod_CFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cat_mod_SOURCES, cat_mod_CFLAGS, font_mod_SOURCES)
(font_mod_CFLAGS, amiga_mod_SOURCES, amiga_mod_CFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, pc_mod_SOURCES)
(pc_mod_CFLAGS): New variables.
* disk/powerpc/ieee1275/ofdisk.c: Include <grub/machine/init.h>.
(grub_ofdisk_iterate): Add a prototype for `dev_iterate'.
* include/grub/dl.h (grub_arch_dl_sync_caches): New prototype.
* include/grub/loader.h (grub_os_area_addr, grub_os_area_size):
Moved from here...
* include/grub/i386/pc/init.h (grub_os_area_addr)
(rub_os_area_size): ... to here.
* include/grub/powerpc/ieee1275/ieee1275.h
(grub_ieee1275_entry_fn): Export symbol.
* include/grub/powerpc/ieee1275/init.h: New file.
* include/grub/powerpc/libgcc.h: Likewise.
* include/grub/cache.h: Likewise.
* kern/powerpc/cache.S: Likewise. Written by Hollis Blanchard
<hollis@penguinppc.org>.
* kern/dl.c: Include <grub/cache.h>.
(grub_dl_flush_cache): New function.
(grub_dl_load_core): Call `grub_dl_flush_cache' to flush the cache
for this module.
* kern/powerpc/ieee1275/init.c (grub_ofdisk_init)
(grub_console_init): Removed prototypes.
(grub_machine_init): Don't initialize the modules anymore.
* kern/powerpc/ieee1275/openfw.c (grub_map): Make the function
static.
* include/grub/powerpc/types.h (GRUB_HOST_WORDS_LITTLEENDIAN):
Macro undef removed.
(GRUB_HOST_WORDS_BIGENDIAN): New macro.
* kern/powerpc/dl.c (grub_arch_dl_relocate_symbols): Add
relocation `R_PPC_REL32'. Return an error when the relocation is
unknown.
* Makefile.in (DATA): Add `$(pkgdata_PROGRAMS)'.
* kern/i386/pc/init.c (grub_arch_sync_caches): New function.
* util/misc.c (grub_arch_sync_caches): Likewise.
2004-12-27 13:46:20 +00:00
|
|
|
elsif program = programs.detect() {|u| u.name.to_var == prefix}
|
|
|
|
print program.rule(args.split(/\s+/))
|
2002-12-27 08:53:07 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
puts "CLEANFILES += moddep.lst"
|
|
|
|
puts "pkgdata_DATA += moddep.lst"
|
|
|
|
puts "moddep.lst: $(DEFSYMFILES) $(UNDSYMFILES) genmoddep"
|
|
|
|
puts " cat $(DEFSYMFILES) /dev/null | ./genmoddep $(UNDSYMFILES) > $@ \\"
|
|
|
|
puts " || (rm -f $@; exit 1)"
|