f4917dfdd6
* kern/rescue.c (grub_rescue_cmd_rmmod): If the reference count is negative, unload the module. * util/i386/pc/grub-setup.c (setup): The name of the PC partition map is "pc_partition_map" but not "pc". (usage): Fix the description. The options are --boot-image and --core-image but not --boot-file or --core-file. (main): If not specified explicitly, make BOOT_FILE and CORE_FILE based on DEFAULT_BOOT_FILE and DEFAULT_CORE_FILE with DIR or DEFAULT_DIRECTORY. * util/i386/pc/grub-install.in: Do not specify --boot-file or --core-file. Specify INSTALL_DEVICE as an argument. * util/console.c: Include config.h. [HAVE_NCURSeS_CURSES_H]: Include ncurses/curses.h. [HAVE_NCURSES_H]: Include ncurses.h. [HAVE_CURSES_H]: Include curses.h. [!A_NORMAL] (A_NORMAL): Defined as zero. [!A_STANDOUT] (A_STANDOUT): Likewise. * conf/i386-pc.rmk (grub_emu_LDFLAGS): Use $(LIBCURSES) instead of -lncurses. * conf/powerpc-ieee1275.rmk (grub_emu_LDFLAGS): Likewise. * configure.ac: Check for curses libraries and headers. * Makefile.in (LIBCURSES): New variable. * genmk.rb (Script::rule): Set the executable bits. * util/i386/pc/biosdisk.c (grub_util_biosdisk_get_grub_dev): The name of the PC partition map is "pc_partition_map" but not "pc".
380 lines
9.3 KiB
Ruby
380 lines
9.3 KiB
Ruby
#! /usr/bin/ruby -w
|
|
#
|
|
# Copyright (C) 2002,2003,2004,2005 Free Software Foundation, Inc.
|
|
#
|
|
# 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}
|
|
$(CC) -o $@ $^ $(LDFLAGS) $(#{prefix}_LDFLAGS)
|
|
|
|
" + 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')
|
|
symbolic_name = mod_name.sub(/\.[^\.]*$/, '')
|
|
|
|
"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 $@
|
|
$(LD) -r -d -o $@ $^
|
|
$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
|
|
|
|
#{pre_obj}: #{objs_str}
|
|
-rm -f $@
|
|
$(LD) -r -d -o $@ $^
|
|
|
|
#{mod_obj}: #{mod_src}
|
|
$(CC) $(CPPFLAGS) $(CFLAGS) $(#{prefix}_CFLAGS) -c -o $@ $<
|
|
|
|
#{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}' > $@
|
|
$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
|
|
|
|
" + objs.collect_with_index do |obj, i|
|
|
src = sources[i]
|
|
fake_obj = File.basename(src).suffix('o')
|
|
command = 'cmd-' + fake_obj.suffix('lst')
|
|
fs = 'fs-' + fake_obj.suffix('lst')
|
|
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}
|
|
|
|
CLEANFILES += #{command} #{fs}
|
|
COMMANDFILES += #{command}
|
|
FSFILES += #{fs}
|
|
|
|
#{command}: #{src} gencmdlist.sh
|
|
set -e; \
|
|
$(CC) -I#{dir} -I$(srcdir)/#{dir} $(CPPFLAGS) $(#{flag}) $(#{prefix}_#{flag}) -E $< \
|
|
| sh $(srcdir)/gencmdlist.sh #{symbolic_name} > $@ || (rm -f $@; exit 1)
|
|
|
|
#{fs}: #{src} genfslist.sh
|
|
set -e; \
|
|
$(CC) -I#{dir} -I$(srcdir)/#{dir} $(CPPFLAGS) $(#{flag}) $(#{prefix}_#{flag}) -E $< \
|
|
| sh $(srcdir)/genfslist.sh #{symbolic_name} > $@ || (rm -f $@; exit 1)
|
|
|
|
|
|
"
|
|
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|
|
|
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}
|
|
$(BUILD_CC) -I#{dir} -I$(srcdir)/#{dir} $(BUILD_CPPFLAGS) $(BUILD_CFLAGS) -DGRUB_UTIL=1 $(#{prefix}_CFLAGS) -c -o $@ $<
|
|
|
|
#{dep}: #{src}
|
|
set -e; \
|
|
$(BUILD_CC) -I#{dir} -I$(srcdir)/#{dir} $(BUILD_CPPFLAGS) $(BUILD_CFLAGS) -DGRUB_UTIL=1 $(#{prefix}_CFLAGS) -M $< \
|
|
| sed 's,#{Regexp.quote(fake_obj)}[ :]*,#{obj} $@ : ,g' > $@; \
|
|
[ -s $@ ] || rm -f $@
|
|
|
|
-include #{dep}
|
|
|
|
"
|
|
end.join('')
|
|
end
|
|
end
|
|
|
|
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}
|
|
$(CC) -o $@ $^ $(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) $(#{prefix}_CFLAGS) -c -o $@ $<
|
|
|
|
#{dep}: #{src}
|
|
set -e; \
|
|
$(CC) -I#{dir} -I$(srcdir)/#{dir} $(CPPFLAGS) $(CFLAGS) $(#{prefix}_CFLAGS) -M $< \
|
|
| sed 's,#{Regexp.quote(fake_obj)}[ :]*,#{obj} $@ : ,g' > $@; \
|
|
[ -s $@ ] || rm -f $@
|
|
|
|
-include #{dep}
|
|
|
|
"
|
|
end.join('')
|
|
end
|
|
end
|
|
|
|
class Script
|
|
def initialize(dir, name)
|
|
@dir = dir
|
|
@name = name
|
|
end
|
|
attr_reader :dir, :name
|
|
|
|
def rule(sources)
|
|
if sources.length != 1
|
|
raise "only a single source file must be specified for a script"
|
|
end
|
|
src = sources[0]
|
|
if /\.in$/ !~ src
|
|
raise "unknown source file `#{src}'"
|
|
end
|
|
|
|
"CLEANFILES += #{@name}
|
|
|
|
#{@name}: #{src} config.status
|
|
./config.status --file=#{name}:#{src}
|
|
chmod +x $@
|
|
|
|
"
|
|
end
|
|
end
|
|
|
|
images = []
|
|
utils = []
|
|
pmodules = []
|
|
programs = []
|
|
scripts = []
|
|
|
|
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
|
|
|
|
when 'PROGRAMS'
|
|
programs += args.split(/\s+/).collect do |prog|
|
|
Program.new(prefix, prog)
|
|
end
|
|
|
|
when 'SCRIPTS'
|
|
scripts += args.split(/\s+/).collect do |script|
|
|
Script.new(prefix, script)
|
|
end
|
|
|
|
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+/))
|
|
elsif program = programs.detect() {|u| u.name.to_var == prefix}
|
|
print program.rule(args.split(/\s+/))
|
|
elsif script = scripts.detect() {|s| s.name.to_var == prefix}
|
|
print script.rule(args.split(/\s+/))
|
|
end
|
|
end
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
puts "CLEANFILES += moddep.lst command.lst fs.lst"
|
|
puts "pkgdata_DATA += moddep.lst command.lst fs.lst"
|
|
puts "moddep.lst: $(DEFSYMFILES) $(UNDSYMFILES) genmoddep"
|
|
puts " cat $(DEFSYMFILES) /dev/null | ./genmoddep $(UNDSYMFILES) > $@ \\"
|
|
puts " || (rm -f $@; exit 1)"
|
|
puts ""
|
|
puts "command.lst: $(COMMANDFILES)"
|
|
puts " cat $^ /dev/null | sort > $@"
|
|
puts ""
|
|
puts "fs.lst: $(FSFILES)"
|
|
puts " cat $^ /dev/null | sort > $@"
|