Big cleanups and code reduction.
This commit is contained in:
gord
parent
8fa9d1fb3a
commit
90ed71c809
37 changed files with 494 additions and 387 deletions
71
ChangeLog
71
ChangeLog
|
|
@ -1,3 +1,74 @@
|
|||
1999-03-08 Gordon Matzigkeit <gord@trick.fig.org>
|
||||
|
||||
* shared_src/asm.S (_start): New explicit symbol to supress
|
||||
warnings.
|
||||
|
||||
* e2fs_stage1_5/Makefile.am (NO_FANCY_STUFF): Renamed to STAGE1_5,
|
||||
since that describes this conditional more accurately.
|
||||
* fat_stage1_5/Makefile.am: Likewise.
|
||||
* ffs_stage1_5/Makefile.am: Likewise.
|
||||
* shared_src/asm.S: Likewise.
|
||||
* shared_src/char_io.c: Likewise.
|
||||
* shared_src/common.c: Likewise.
|
||||
* shared_src/disk_io.c: Likewise.
|
||||
* shared_src/fsys_ext2fs.c: Likewise.
|
||||
* shared_src/fsys_ffs.c: Likewise.
|
||||
* shared_src/shared.h: Likewise.
|
||||
|
||||
1999-03-07 Gordon Matzigkeit <gord@trick.fig.org>
|
||||
|
||||
* configure.in (SHARED_SRC_RULES): Automatically generate
|
||||
Makefile dependencies for files in shared_src.
|
||||
e2fs_stage1_5/Makefile.am: Use them.
|
||||
fat_stage1_5/Makefile.am: Likewise.
|
||||
ffs_stage1_5/Makefile.am: Likewise.
|
||||
grub/Makefile.am: Likewise.
|
||||
stage2/Makefile.am: Likewise.
|
||||
stage2_debug/Makefile.am: Likewise.
|
||||
|
||||
* shared_src/disk_inode.h: Fix typo: i_ic shouldn't be defined.
|
||||
|
||||
* shared_src/fsys_ffs.c (block_map): Make static, since this
|
||||
function isn't used outside of its defining file.
|
||||
|
||||
* shared_src/disk_io.c [NO_FANCY_STUFF]: Eliminate a whole bunch
|
||||
more functions from the stage1.5. From OKUJI Yoshinori.
|
||||
* shared_src/fsys_ffs.c: Likewise.
|
||||
* shared_src/char_io.c: Likewise.
|
||||
|
||||
1999-03-05 Gordon Matzigkeit <gord@trick.fig.org>
|
||||
|
||||
* shared_src/char_io.c (getkey): Don't set BUF_DRIVE to -1.
|
||||
BUF_DRIVE has nothing at all to do with getkey.
|
||||
|
||||
* shared_src/common.c (err_list): Change description of ERR_GEOM
|
||||
to be more informative.
|
||||
|
||||
* Makefile.am (configure): Depend on debian/changelog.
|
||||
|
||||
* configure.in (host_cpu): Make all fully i386-compatible CPUs be
|
||||
identified as i386.
|
||||
(AM_INIT_AUTOMAKE): Fetch values for PACKAGE and VERSION from
|
||||
debian/changelog, so that we only have one file to update.
|
||||
|
||||
* shared_src/asm.S (get_diskinfo): Fix a few bit-twiddling bugs in
|
||||
the BIOS extension detection code.
|
||||
(biosdisk) [AWARD_INT13_EXTENSIONS]: Preliminary implementation
|
||||
of Award's encoding of cylinder bits 10 and 11.
|
||||
(biosdisk) [NO_INT13_FALLBACK]: If defined, don't use the standard
|
||||
disk interface if the extended interface fails.
|
||||
|
||||
* configure.in: Make sure $(host_cpu) and $(host_vendor) are
|
||||
substituted into the Makefile.
|
||||
|
||||
* e2fs_stage1_5/Makefile.am (pkgdatadir): Install files in
|
||||
$(datadir)/grub/$(host_cpu)-$(host_vendor).
|
||||
* fat_stage1_5/Makefile.am: Likewise.
|
||||
* ffs_stage1_5/Makefile.am: Likewise.
|
||||
* stage1/Makefile.am: Likewise.
|
||||
* stage2/Makefile.am: Likewise.
|
||||
* stage2_debug/Makefile.am: Likewise.
|
||||
|
||||
1999-03-03 Gordon Matzigkeit <gord@trick.fig.org>
|
||||
|
||||
* shared_src/asm.S (biosdisk): Use LBA mode if high nibble of
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
AUTOMAKE_OPTIONS = gnits
|
||||
SUBDIRS = grub stage1 stage2 stage2_debug \
|
||||
e2fs_stage1_5 fat_stage1_5 ffs_stage1_5 \
|
||||
docs shared_src debian
|
||||
DISTCLEANFILES = ssrcrules.mk
|
||||
|
||||
# We get $(PACKAGE) and $(VERSION) from debian/changelog.
|
||||
configure: debian/changelog
|
||||
|
|
|
|||
14
Makefile.in
14
Makefile.in
|
|
@ -65,10 +65,11 @@ MAKEINFO = @MAKEINFO@
|
|||
OBJCOPY = @OBJCOPY@
|
||||
PACKAGE = @PACKAGE@
|
||||
VERSION = @VERSION@
|
||||
host_cpu = @host_cpu@
|
||||
host_vendor = @host_vendor@
|
||||
sbingrub = @sbingrub@
|
||||
stage2debug = @stage2debug@
|
||||
|
||||
AUTOMAKE_OPTIONS = gnits
|
||||
SUBDIRS = grub stage1 stage2 stage2_debug \
|
||||
e2fs_stage1_5 fat_stage1_5 ffs_stage1_5 \
|
||||
docs shared_src debian
|
||||
|
|
@ -89,7 +90,7 @@ all: all-recursive all-am
|
|||
|
||||
.SUFFIXES:
|
||||
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
||||
cd $(top_srcdir) && $(AUTOMAKE) --gnits Makefile
|
||||
cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
|
||||
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
|
||||
cd $(top_builddir) \
|
||||
|
|
@ -201,10 +202,6 @@ dist-all: distdir
|
|||
GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
|
||||
-rm -rf $(distdir)
|
||||
distdir: $(DISTFILES)
|
||||
@if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" > /dev/null; then :; else \
|
||||
echo "NEWS not updated; not releasing" 1>&2; \
|
||||
exit 1; \
|
||||
fi
|
||||
-rm -rf $(distdir)
|
||||
mkdir $(distdir)
|
||||
-chmod 777 $(distdir)
|
||||
|
|
@ -212,7 +209,7 @@ distdir: $(DISTFILES)
|
|||
top_distdir=`cd $(distdir) && pwd`; \
|
||||
distdir=`cd $(distdir) && pwd`; \
|
||||
cd $(top_srcdir) \
|
||||
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits Makefile
|
||||
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
|
||||
@for file in $(DISTFILES); do \
|
||||
d=$(srcdir); \
|
||||
test -f $(distdir)/$$file \
|
||||
|
|
@ -297,6 +294,9 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
|
|||
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
|
||||
|
||||
|
||||
# We get $(PACKAGE) and $(VERSION) from debian/changelog.
|
||||
configure: debian/changelog
|
||||
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
.NOEXPORT:
|
||||
|
|
|
|||
4
NEWS
4
NEWS
|
|
@ -1,9 +1,11 @@
|
|||
NEWS - list of user-visible changes between releases of GRUB
|
||||
|
||||
New in XXX:
|
||||
* The GRUB stage2 uses LBA mode and AWARD extensions if they are supported.
|
||||
|
||||
New in 0.5.90 - 1999-03-01, Gordon Matzigkeit:
|
||||
* Bug fixes.
|
||||
* GRUB understands symlinks on ext2fs (but still not ffs).
|
||||
* The GRUB stage2 uses LBA mode and AWARD extensions if they are supported.
|
||||
* Many source code and build cleanups to comply with GNU standards.
|
||||
|
||||
New in 0.5 - 1998-08-20, Erich Boleyn:
|
||||
|
|
|
|||
141
configure
vendored
141
configure
vendored
|
|
@ -691,7 +691,9 @@ fi
|
|||
|
||||
PACKAGE=grub
|
||||
|
||||
VERSION=0.5.90
|
||||
|
||||
VERSION=0.5.91
|
||||
|
||||
|
||||
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
|
||||
{ echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
|
||||
|
|
@ -708,7 +710,7 @@ EOF
|
|||
|
||||
missing_dir=`cd $ac_aux_dir && pwd`
|
||||
echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
|
||||
echo "configure:712: checking for working aclocal" >&5
|
||||
echo "configure:714: checking for working aclocal" >&5
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
# Redirect stdin to placate older versions of autoconf. Sigh.
|
||||
|
|
@ -721,7 +723,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
|
||||
echo "configure:725: checking for working autoconf" >&5
|
||||
echo "configure:727: checking for working autoconf" >&5
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
# Redirect stdin to placate older versions of autoconf. Sigh.
|
||||
|
|
@ -734,7 +736,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for working automake""... $ac_c" 1>&6
|
||||
echo "configure:738: checking for working automake" >&5
|
||||
echo "configure:740: checking for working automake" >&5
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
# Redirect stdin to placate older versions of autoconf. Sigh.
|
||||
|
|
@ -747,7 +749,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
|
||||
echo "configure:751: checking for working autoheader" >&5
|
||||
echo "configure:753: checking for working autoheader" >&5
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
# Redirect stdin to placate older versions of autoconf. Sigh.
|
||||
|
|
@ -760,7 +762,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
|
||||
echo "configure:764: checking for working makeinfo" >&5
|
||||
echo "configure:766: checking for working makeinfo" >&5
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
# Redirect stdin to placate older versions of autoconf. Sigh.
|
||||
|
|
@ -775,14 +777,13 @@ fi
|
|||
|
||||
|
||||
|
||||
|
||||
# Make sure we can run config.sub.
|
||||
if $ac_config_sub sun4 >/dev/null 2>&1; then :
|
||||
else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
|
||||
fi
|
||||
|
||||
echo $ac_n "checking host system type""... $ac_c" 1>&6
|
||||
echo "configure:786: checking host system type" >&5
|
||||
echo "configure:787: checking host system type" >&5
|
||||
|
||||
host_alias=$host
|
||||
case "$host_alias" in
|
||||
|
|
@ -804,10 +805,13 @@ echo "$ac_t""$host" 1>&6
|
|||
|
||||
|
||||
case "$host_cpu" in
|
||||
i[3456]86) ;;
|
||||
i[3456]86) host_cpu=i386 ;;
|
||||
*) { echo "configure: error: unsupported CPU type" 1>&2; exit 1; } ;;
|
||||
esac
|
||||
|
||||
|
||||
|
||||
|
||||
#
|
||||
# Options
|
||||
#
|
||||
|
|
@ -834,68 +838,8 @@ fi
|
|||
# Programs
|
||||
#
|
||||
|
||||
# Find a good install program. We prefer a C program (faster),
|
||||
# so one script is as good as another. But avoid the broken or
|
||||
# incompatible versions:
|
||||
# SysV /etc/install, /usr/sbin/install
|
||||
# SunOS /usr/etc/install
|
||||
# IRIX /sbin/install
|
||||
# AIX /bin/install
|
||||
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
|
||||
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
||||
# ./install, which can be erroneously created by make from ./install.sh.
|
||||
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
|
||||
echo "configure:849: checking for a BSD compatible install" >&5
|
||||
if test -z "$INSTALL"; then
|
||||
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:"
|
||||
for ac_dir in $PATH; do
|
||||
# Account for people who put trailing slashes in PATH elements.
|
||||
case "$ac_dir/" in
|
||||
/|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
|
||||
*)
|
||||
# OSF1 and SCO ODT 3.0 have their own names for install.
|
||||
for ac_prog in ginstall installbsd scoinst install; do
|
||||
if test -f $ac_dir/$ac_prog; then
|
||||
if test $ac_prog = install &&
|
||||
grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
|
||||
# AIX install. It has an incompatible calling convention.
|
||||
# OSF/1 installbsd also uses dspmsg, but is usable.
|
||||
:
|
||||
else
|
||||
ac_cv_path_install="$ac_dir/$ac_prog -c"
|
||||
break 2
|
||||
fi
|
||||
fi
|
||||
done
|
||||
;;
|
||||
esac
|
||||
done
|
||||
IFS="$ac_save_IFS"
|
||||
|
||||
fi
|
||||
if test "${ac_cv_path_install+set}" = set; then
|
||||
INSTALL="$ac_cv_path_install"
|
||||
else
|
||||
# As a last resort, use the slow shell script. We don't cache a
|
||||
# path for INSTALL within a source directory, because that will
|
||||
# break other packages using the cache if that directory is
|
||||
# removed, or if the path is relative.
|
||||
INSTALL="$ac_install_sh"
|
||||
fi
|
||||
fi
|
||||
echo "$ac_t""$INSTALL" 1>&6
|
||||
|
||||
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
|
||||
# It thinks the first close brace ends the variable substitution.
|
||||
test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
|
||||
|
||||
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
||||
|
||||
echo $ac_n "checking build system type""... $ac_c" 1>&6
|
||||
echo "configure:899: checking build system type" >&5
|
||||
echo "configure:843: checking build system type" >&5
|
||||
|
||||
build_alias=$build
|
||||
case "$build_alias" in
|
||||
|
|
@ -921,7 +865,7 @@ fi
|
|||
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}gcc; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:925: checking for $ac_word" >&5
|
||||
echo "configure:869: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -952,7 +896,7 @@ fi
|
|||
# Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}ld; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:956: checking for $ac_word" >&5
|
||||
echo "configure:900: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -983,7 +927,7 @@ fi
|
|||
# Extract the first word of "${ac_tool_prefix}objcopy", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}objcopy; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:987: checking for $ac_word" >&5
|
||||
echo "configure:931: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1016,7 +960,7 @@ fi
|
|||
# Extract the first word of "gcc", so it can be a program name with args.
|
||||
set dummy gcc; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1020: checking for $ac_word" >&5
|
||||
echo "configure:964: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1045,7 +989,7 @@ if test -z "$CC"; then
|
|||
# Extract the first word of "cc", so it can be a program name with args.
|
||||
set dummy cc; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1049: checking for $ac_word" >&5
|
||||
echo "configure:993: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1093,7 +1037,7 @@ fi
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
||||
echo "configure:1097: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
||||
echo "configure:1041: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
||||
|
||||
ac_ext=c
|
||||
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
|
||||
|
|
@ -1103,11 +1047,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
|
|||
cross_compiling=$ac_cv_prog_cc_cross
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1107 "configure"
|
||||
#line 1051 "configure"
|
||||
#include "confdefs.h"
|
||||
main(){return(0);}
|
||||
EOF
|
||||
if { (eval echo configure:1111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:1055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
ac_cv_prog_cc_works=yes
|
||||
# If we can't run a trivial program, we are probably using a cross compiler.
|
||||
if (./conftest; exit) 2>/dev/null; then
|
||||
|
|
@ -1127,12 +1071,12 @@ if test $ac_cv_prog_cc_works = no; then
|
|||
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
|
||||
fi
|
||||
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
|
||||
echo "configure:1131: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
||||
echo "configure:1075: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
||||
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
|
||||
cross_compiling=$ac_cv_prog_cc_cross
|
||||
|
||||
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
|
||||
echo "configure:1136: checking whether we are using GNU C" >&5
|
||||
echo "configure:1080: checking whether we are using GNU C" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1141,7 +1085,7 @@ else
|
|||
yes;
|
||||
#endif
|
||||
EOF
|
||||
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
||||
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1089: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
||||
ac_cv_prog_gcc=yes
|
||||
else
|
||||
ac_cv_prog_gcc=no
|
||||
|
|
@ -1156,7 +1100,7 @@ if test $ac_cv_prog_gcc = yes; then
|
|||
ac_save_CFLAGS="$CFLAGS"
|
||||
CFLAGS=
|
||||
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
|
||||
echo "configure:1160: checking whether ${CC-cc} accepts -g" >&5
|
||||
echo "configure:1104: checking whether ${CC-cc} accepts -g" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1185,7 +1129,7 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking symbol names produced by ${CC-cc}""... $ac_c" 1>&6
|
||||
echo "configure:1189: checking symbol names produced by ${CC-cc}" >&5
|
||||
echo "configure:1133: checking symbol names produced by ${CC-cc}" >&5
|
||||
if eval "test \"`echo '$''{'grub_cv_asm_ext_c'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1198,7 +1142,7 @@ func (int *list)
|
|||
}
|
||||
EOF
|
||||
|
||||
if { ac_try='${CC-cc} -S conftest.c'; { (eval echo configure:1202: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.s; then :
|
||||
if { ac_try='${CC-cc} -S conftest.c'; { (eval echo configure:1146: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.s; then :
|
||||
else
|
||||
{ echo "configure: error: ${CC-cc} failed to produce assembly code" 1>&2; exit 1; }
|
||||
fi
|
||||
|
|
@ -1226,7 +1170,7 @@ EOF
|
|||
|
||||
|
||||
echo $ac_n "checking whether ${OBJCOPY} works for absolute addresses""... $ac_c" 1>&6
|
||||
echo "configure:1230: checking whether ${OBJCOPY} works for absolute addresses" >&5
|
||||
echo "configure:1174: checking whether ${OBJCOPY} works for absolute addresses" >&5
|
||||
if eval "test \"`echo '$''{'grub_cv_prog_objcopy_absolute'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1238,21 +1182,21 @@ blah (void)
|
|||
}
|
||||
EOF
|
||||
|
||||
if { (eval echo configure:1242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then :
|
||||
if { (eval echo configure:1186: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then :
|
||||
else
|
||||
{ echo "configure: error: ${CC-cc} cannot compile C source code" 1>&2; exit 1; }
|
||||
fi
|
||||
grub_cv_prog_objcopy_absolute=yes
|
||||
for link_addr in 2000 8000 7C00; do
|
||||
if { ac_try='${LD-ld} -N -Ttext $link_addr conftest.o -o conftest.exec'; { (eval echo configure:1248: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then :
|
||||
if { ac_try='${LD-ld} -N -Ttext $link_addr conftest.o -o conftest.exec'; { (eval echo configure:1192: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then :
|
||||
else
|
||||
{ echo "configure: error: ${LD-ld} cannot link at address $link_addr" 1>&2; exit 1; }
|
||||
fi
|
||||
if { ac_try='${OBJCOPY-objcopy} -O binary conftest.exec conftest'; { (eval echo configure:1252: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then :
|
||||
if { ac_try='${OBJCOPY-objcopy} -O binary conftest.exec conftest'; { (eval echo configure:1196: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then :
|
||||
else
|
||||
{ echo "configure: error: ${OBJCOPY-objcopy} cannot create binary files" 1>&2; exit 1; }
|
||||
fi
|
||||
if test ! -f conftest.old || { ac_try='cmp -s conftest.old conftest'; { (eval echo configure:1256: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
|
||||
if test ! -f conftest.old || { ac_try='cmp -s conftest.old conftest'; { (eval echo configure:1200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
|
||||
mv -f conftest conftest.old
|
||||
else
|
||||
grub_cv_prog_objcopy_absolute=no
|
||||
|
|
@ -1269,7 +1213,7 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for .code16 addr32 assembler support""... $ac_c" 1>&6
|
||||
echo "configure:1273: checking for .code16 addr32 assembler support" >&5
|
||||
echo "configure:1217: checking for .code16 addr32 assembler support" >&5
|
||||
if eval "test \"`echo '$''{'grub_cv_asm_addr32'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1279,7 +1223,7 @@ l1: addr32
|
|||
movb %al, l1
|
||||
EOF
|
||||
|
||||
if { ac_try='${CC-cc} -c conftest.s'; { (eval echo configure:1283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then
|
||||
if { ac_try='${CC-cc} -c conftest.s'; { (eval echo configure:1227: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then
|
||||
grub_cv_asm_addr32=yes
|
||||
else
|
||||
grub_cv_asm_addr32=no
|
||||
|
|
@ -1300,7 +1244,12 @@ cat > $SHARED_SRC_RULES <<EOF
|
|||
# $SHARED_SRC_RULES - Rules for building objects from files in shared_src.
|
||||
# Generated automatically by configure.
|
||||
asm.o: \$(top_srcdir)/shared_src/asm.S
|
||||
\$(COMPILE) -c \$(top_srcdir)/shared_src/asm.S
|
||||
@echo '\$(COMPILE) -c \$(top_srcdir)/shared_src/asm.S'; \\
|
||||
if test -d .deps; then \\
|
||||
\$(COMPILE) -Wp,-MD,.deps/asm.P -c \$(top_srcdir)/shared_src/asm.S; \\
|
||||
else \\
|
||||
\$(COMPILE) -c \$(top_srcdir)/shared_src/asm.S; \\
|
||||
fi
|
||||
EOF
|
||||
for f in boot common char_io cmdline disk_io gunzip fsys_ffs \
|
||||
fsys_ext2fs fsys_fat stage1_5 stage2; do
|
||||
|
|
@ -1308,7 +1257,13 @@ for f in boot common char_io cmdline disk_io gunzip fsys_ffs \
|
|||
cat >> $SHARED_SRC_RULES <<EOF
|
||||
|
||||
$f.o: \$(top_srcdir)/shared_src/$f.c
|
||||
\$(COMPILE) -c \$(top_srcdir)/shared_src/$f.c
|
||||
@echo '\$(COMPILE) -c \$(top_srcdir)/shared_src/$f.c'; \\
|
||||
if test -d .deps; then \\
|
||||
\$(COMPILE) -Wp,-MD,.deps/$f.P -c \$(top_srcdir)/shared_src/$f.c; \\
|
||||
else \\
|
||||
\$(COMPILE) -c \$(top_srcdir)/shared_src/$f.c; \\
|
||||
fi
|
||||
|
||||
EOF
|
||||
done
|
||||
|
||||
|
|
|
|||
25
configure.in
25
configure.in
|
|
@ -13,16 +13,22 @@ dnl LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE
|
|||
dnl USE OF THIS SOFTWARE.
|
||||
|
||||
AC_INIT(shared_src/fsys_ext2fs.c)
|
||||
AM_INIT_AUTOMAKE(grub,0.5.90)
|
||||
dnl Grab the package and version from the top debian/changelog entry.
|
||||
AM_INIT_AUTOMAKE(
|
||||
esyscmd([sed 's/ .*$//; q' debian/changelog]),
|
||||
esyscmd([sed 's/^.*(\(.*\)).*$/\1/; q' debian/changelog]))dnl
|
||||
AC_PREREQ(2.12)
|
||||
|
||||
AC_CANONICAL_HOST
|
||||
|
||||
case "$host_cpu" in
|
||||
i[[3456]]86) ;;
|
||||
i[[3456]]86) host_cpu=i386 ;;
|
||||
*) AC_MSG_ERROR([unsupported CPU type]) ;;
|
||||
esac
|
||||
|
||||
AC_SUBST(host_cpu)
|
||||
AC_SUBST(host_vendor)
|
||||
|
||||
#
|
||||
# Options
|
||||
#
|
||||
|
|
@ -68,7 +74,12 @@ cat > $SHARED_SRC_RULES <<EOF
|
|||
# $SHARED_SRC_RULES - Rules for building objects from files in shared_src.
|
||||
# Generated automatically by configure.
|
||||
asm.o: \$(top_srcdir)/shared_src/asm.S
|
||||
\$(COMPILE) -c \$(top_srcdir)/shared_src/asm.S
|
||||
@echo '\$(COMPILE) -c \$(top_srcdir)/shared_src/asm.S'; \\
|
||||
if test -d .deps; then \\
|
||||
\$(COMPILE) -Wp,-MD,.deps/asm.P -c \$(top_srcdir)/shared_src/asm.S; \\
|
||||
else \\
|
||||
\$(COMPILE) -c \$(top_srcdir)/shared_src/asm.S; \\
|
||||
fi
|
||||
EOF
|
||||
for f in boot common char_io cmdline disk_io gunzip fsys_ffs \
|
||||
fsys_ext2fs fsys_fat stage1_5 stage2; do
|
||||
|
|
@ -76,7 +87,13 @@ for f in boot common char_io cmdline disk_io gunzip fsys_ffs \
|
|||
cat >> $SHARED_SRC_RULES <<EOF
|
||||
|
||||
$f.o: \$(top_srcdir)/shared_src/$f.c
|
||||
\$(COMPILE) -c \$(top_srcdir)/shared_src/$f.c
|
||||
@echo '\$(COMPILE) -c \$(top_srcdir)/shared_src/$f.c'; \\
|
||||
if test -d .deps; then \\
|
||||
\$(COMPILE) -Wp,-MD,.deps/$f.P -c \$(top_srcdir)/shared_src/$f.c; \\
|
||||
else \\
|
||||
\$(COMPILE) -c \$(top_srcdir)/shared_src/$f.c; \\
|
||||
fi
|
||||
|
||||
EOF
|
||||
done
|
||||
|
||||
|
|
|
|||
2
debian/Makefile.in
vendored
2
debian/Makefile.in
vendored
|
|
@ -65,6 +65,8 @@ MAKEINFO = @MAKEINFO@
|
|||
OBJCOPY = @OBJCOPY@
|
||||
PACKAGE = @PACKAGE@
|
||||
VERSION = @VERSION@
|
||||
host_cpu = @host_cpu@
|
||||
host_vendor = @host_vendor@
|
||||
sbingrub = @sbingrub@
|
||||
stage2debug = @stage2debug@
|
||||
|
||||
|
|
|
|||
2
debian/README.debian
vendored
2
debian/README.debian
vendored
|
|
@ -15,6 +15,6 @@ edit any configuration files or run a special installation program.
|
|||
NOTE: GRUB does not yet have an automatic installation program, but
|
||||
we're working on this, so please don't report it as a bug. Until
|
||||
then, read the documentation (starting with docs/grub.html or
|
||||
docs/install.html), and use the binary files in /lib/grub.
|
||||
docs/install.html), and use the binary files in /share/grub.
|
||||
|
||||
Gordon Matzigkeit <gord@debian.org>, Fri, 12 Feb 1999 00:41:23 -0600
|
||||
|
|
|
|||
3
debian/changelog
vendored
3
debian/changelog
vendored
|
|
@ -1,6 +1,7 @@
|
|||
grub (0.5.91) unstable; urgency=low
|
||||
|
||||
* Added support for LBA mode and BIOS extensions.
|
||||
* Added support for LBA mode and AWARD/AMI hard disk BIOS extensions.
|
||||
* GRUB data now installed in /share/grub/$(host_cpu)-$(host_vendor).
|
||||
|
||||
--
|
||||
|
||||
|
|
|
|||
|
|
@ -65,6 +65,8 @@ MAKEINFO = @MAKEINFO@
|
|||
OBJCOPY = @OBJCOPY@
|
||||
PACKAGE = @PACKAGE@
|
||||
VERSION = @VERSION@
|
||||
host_cpu = @host_cpu@
|
||||
host_vendor = @host_vendor@
|
||||
sbingrub = @sbingrub@
|
||||
stage2debug = @stage2debug@
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,5 @@
|
|||
Get /sbin/grub to work.
|
||||
|
||||
Automatically generate source dependencies. This might involve some
|
||||
patches to Automake (if so, we should also fix the fact that we
|
||||
currently need dummy.c in _SOURCES in order to get the C compiler flag
|
||||
variables).
|
||||
|
||||
Change partition syntax to correspond with BSD ``slice'' syntax
|
||||
(`(hd0,1a)' -> `/dev/hd0s2a').
|
||||
|
||||
|
|
@ -14,7 +9,7 @@ type''. We need this for clean Hurd install floppies.
|
|||
Find out the size restrictions for FAT and ext2fs stage1.5 boot
|
||||
blocks. Enforce all arbitrary limits using the Makefiles.
|
||||
|
||||
Add/Finish LBA and/or Int13 extensions support.
|
||||
Finish LBA and int13 extensions support.
|
||||
|
||||
Add a real scripting language, possibly retain backward compatibility
|
||||
so that old config files can be used.
|
||||
|
|
@ -27,7 +22,7 @@ feasible.
|
|||
Add support/delays so that a floppy can be installed from another
|
||||
floppy.
|
||||
|
||||
Add bootable CDROM support (this probably means I have to support
|
||||
Add bootable CDROM support (this probably means we have to support
|
||||
ISO-9660 plus maybe even the Rock Ridge extensions... ugh).
|
||||
|
||||
Make symbolic links work for BSD FFS.
|
||||
|
|
|
|||
|
|
@ -1,15 +1,13 @@
|
|||
AUTOMAKE_OPTIONS = gnits
|
||||
|
||||
IMPORTANT_SIZE_LIMIT = 7168
|
||||
|
||||
pkglibdir = $(exec_prefix)/lib/$(PACKAGE)
|
||||
pkglib_DATA = e2fs_stage1_5
|
||||
CLEANFILES = $(pkglib_DATA) $(pkglib_DATA)T
|
||||
pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
|
||||
pkgdata_DATA = e2fs_stage1_5
|
||||
CLEANFILES = $(pkgdata_DATA) $(pkgdata_DATA)T
|
||||
noinst_PROGRAMS = e2fs_stage1_5.exec
|
||||
|
||||
# We can't use builtins or standard includes.
|
||||
COMPILE = $(CC) -fno-builtin -nostdinc -DFSYS_EXT2FS=1 -DNO_DECOMPRESSION=1 \
|
||||
-DNO_FANCY_STUFF=1 -DNO_BLOCK_FILES=1 \
|
||||
-DSTAGE1_5=1 -DNO_BLOCK_FILES=1 \
|
||||
-DCONFIG_FILE_ASM='.string "/boot/grub/stage2"' \
|
||||
$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
|
||||
INCLUDES = -I$(top_srcdir)/shared_src
|
||||
|
|
@ -17,6 +15,9 @@ INCLUDES = -I$(top_srcdir)/shared_src
|
|||
# asm.o absolutely needs to come first!
|
||||
e2fs_stage1_5_exec_LDADD = asm.o common.o char_io.o disk_io.o \
|
||||
stage1_5.o fsys_ext2fs.o
|
||||
|
||||
# FIXME: Automake hackery.
|
||||
DEP_FILES = .deps/dummy.P $(wildcard .deps/*.P)
|
||||
e2fs_stage1_5_exec_SOURCES = dummy.c # needed to drag in C Makefile variables
|
||||
DISTFILES = $(DIST_COMMON)
|
||||
|
||||
|
|
|
|||
|
|
@ -33,8 +33,7 @@ includedir = @includedir@
|
|||
oldincludedir = /usr/include
|
||||
|
||||
DISTDIR =
|
||||
|
||||
pkgdatadir = $(datadir)/@PACKAGE@
|
||||
pkglibdir = $(libdir)/@PACKAGE@
|
||||
pkgincludedir = $(includedir)/@PACKAGE@
|
||||
|
||||
top_builddir = ..
|
||||
|
|
@ -64,21 +63,21 @@ MAKEINFO = @MAKEINFO@
|
|||
OBJCOPY = @OBJCOPY@
|
||||
PACKAGE = @PACKAGE@
|
||||
VERSION = @VERSION@
|
||||
host_cpu = @host_cpu@
|
||||
host_vendor = @host_vendor@
|
||||
sbingrub = @sbingrub@
|
||||
stage2debug = @stage2debug@
|
||||
|
||||
AUTOMAKE_OPTIONS = gnits
|
||||
|
||||
IMPORTANT_SIZE_LIMIT = 7168
|
||||
|
||||
pkglibdir = $(exec_prefix)/lib/$(PACKAGE)
|
||||
pkglib_DATA = e2fs_stage1_5
|
||||
CLEANFILES = $(pkglib_DATA) $(pkglib_DATA)T
|
||||
pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
|
||||
pkgdata_DATA = e2fs_stage1_5
|
||||
CLEANFILES = $(pkgdata_DATA) $(pkgdata_DATA)T
|
||||
noinst_PROGRAMS = e2fs_stage1_5.exec
|
||||
|
||||
# We can't use builtins or standard includes.
|
||||
COMPILE = $(CC) -fno-builtin -nostdinc -DFSYS_EXT2FS=1 -DNO_DECOMPRESSION=1 \
|
||||
-DNO_FANCY_STUFF=1 -DNO_BLOCK_FILES=1 \
|
||||
-DSTAGE1_5=1 -DNO_BLOCK_FILES=1 \
|
||||
-DCONFIG_FILE_ASM='.string "/boot/grub/stage2"' \
|
||||
$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
|
||||
INCLUDES = -I$(top_srcdir)/shared_src
|
||||
|
|
@ -86,6 +85,9 @@ INCLUDES = -I$(top_srcdir)/shared_src
|
|||
# asm.o absolutely needs to come first!
|
||||
e2fs_stage1_5_exec_LDADD = asm.o common.o char_io.o disk_io.o \
|
||||
stage1_5.o fsys_ext2fs.o
|
||||
|
||||
# FIXME: Automake hackery.
|
||||
DEP_FILES = .deps/dummy.P $(wildcard .deps/*.P)
|
||||
e2fs_stage1_5_exec_SOURCES = dummy.c # needed to drag in C Makefile variables
|
||||
DISTFILES = $(DIST_COMMON)
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
|
|
@ -103,14 +105,13 @@ stage1_5.o fsys_ext2fs.o
|
|||
e2fs_stage1_5_exec_LDFLAGS =
|
||||
CFLAGS = @CFLAGS@
|
||||
LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
|
||||
DATA = $(pkglib_DATA)
|
||||
DATA = $(pkgdata_DATA)
|
||||
|
||||
DIST_COMMON = Makefile.am Makefile.in
|
||||
|
||||
|
||||
TAR = tar
|
||||
GZIP = --best
|
||||
DEP_FILES = .deps/dummy.P
|
||||
SOURCES = $(e2fs_stage1_5_exec_SOURCES)
|
||||
OBJECTS = $(e2fs_stage1_5_exec_OBJECTS)
|
||||
|
||||
|
|
@ -119,7 +120,7 @@ all: Makefile $(PROGRAMS) $(DATA)
|
|||
.SUFFIXES:
|
||||
.SUFFIXES: .S .c .o .s
|
||||
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
||||
cd $(top_srcdir) && $(AUTOMAKE) --gnits e2fs_stage1_5/Makefile
|
||||
cd $(top_srcdir) && $(AUTOMAKE) --gnu e2fs_stage1_5/Makefile
|
||||
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
|
||||
cd $(top_builddir) \
|
||||
|
|
@ -151,23 +152,23 @@ distclean-compile:
|
|||
|
||||
maintainer-clean-compile:
|
||||
|
||||
install-pkglibDATA: $(pkglib_DATA)
|
||||
install-pkgdataDATA: $(pkgdata_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
|
||||
@list='$(pkglib_DATA)'; for p in $$list; do \
|
||||
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
|
||||
@list='$(pkgdata_DATA)'; for p in $$list; do \
|
||||
if test -f $(srcdir)/$$p; then \
|
||||
echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$p"; \
|
||||
$(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$p; \
|
||||
echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p"; \
|
||||
$(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
|
||||
else if test -f $$p; then \
|
||||
echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
|
||||
$(INSTALL_DATA) $$p $(DESTDIR)$(pkglibdir)/$$p; \
|
||||
echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
|
||||
$(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \
|
||||
fi; fi; \
|
||||
done
|
||||
|
||||
uninstall-pkglibDATA:
|
||||
uninstall-pkgdataDATA:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
list='$(pkglib_DATA)'; for p in $$list; do \
|
||||
rm -f $(DESTDIR)$(pkglibdir)/$$p; \
|
||||
list='$(pkgdata_DATA)'; for p in $$list; do \
|
||||
rm -f $(DESTDIR)$(pkgdatadir)/$$p; \
|
||||
done
|
||||
|
||||
tags: TAGS
|
||||
|
|
@ -204,7 +205,7 @@ distdir: $(DISTFILES)
|
|||
top_distdir=`cd $(top_distdir) && pwd`; \
|
||||
distdir=`cd $(distdir) && pwd`; \
|
||||
cd $(top_srcdir) \
|
||||
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits e2fs_stage1_5/Makefile
|
||||
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu e2fs_stage1_5/Makefile
|
||||
@for file in $(DISTFILES); do \
|
||||
d=$(srcdir); \
|
||||
test -f $(distdir)/$$file \
|
||||
|
|
@ -240,21 +241,21 @@ dvi:
|
|||
check: all
|
||||
$(MAKE)
|
||||
installcheck:
|
||||
install-exec: install-pkglibDATA
|
||||
install-exec:
|
||||
@$(NORMAL_INSTALL)
|
||||
|
||||
install-data:
|
||||
install-data: install-pkgdataDATA
|
||||
@$(NORMAL_INSTALL)
|
||||
|
||||
install: install-exec install-data all
|
||||
@:
|
||||
|
||||
uninstall: uninstall-pkglibDATA
|
||||
uninstall: uninstall-pkgdataDATA
|
||||
|
||||
install-strip:
|
||||
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
|
||||
installdirs:
|
||||
$(mkinstalldirs) $(DATADIR)$(pkglibdir)
|
||||
$(mkinstalldirs) $(DATADIR)$(pkgdatadir)
|
||||
|
||||
|
||||
mostlyclean-generic:
|
||||
|
|
@ -291,7 +292,7 @@ maintainer-clean: maintainer-clean-noinstPROGRAMS \
|
|||
.PHONY: mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
|
||||
clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
|
||||
mostlyclean-compile distclean-compile clean-compile \
|
||||
maintainer-clean-compile uninstall-pkglibDATA install-pkglibDATA tags \
|
||||
maintainer-clean-compile uninstall-pkgdataDATA install-pkgdataDATA tags \
|
||||
mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
|
||||
distdir mostlyclean-depend distclean-depend clean-depend \
|
||||
maintainer-clean-depend info dvi installcheck install-exec install-data \
|
||||
|
|
|
|||
|
|
@ -1,21 +1,22 @@
|
|||
AUTOMAKE_OPTIONS = gnits
|
||||
|
||||
IMPORTANT_SIZE_LIMIT = 7168
|
||||
|
||||
pkglibdir = $(exec_prefix)/lib/$(PACKAGE)
|
||||
pkglib_DATA = fat_stage1_5
|
||||
CLEANFILES = $(pkglib_DATA) $(pkglib_DATA)T
|
||||
pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
|
||||
pkgdata_DATA = fat_stage1_5
|
||||
CLEANFILES = $(pkgdata_DATA) $(pkgdata_DATA)T
|
||||
noinst_PROGRAMS = fat_stage1_5.exec
|
||||
|
||||
# We can't use builtins or standard includes.
|
||||
COMPILE = $(CC) -fno-builtin -nostdinc -DFSYS_FAT=1 -DNO_DECOMPRESSION=1 \
|
||||
-DNO_FANCY_STUFF=1 -DCONFIG_FILE_ASM='.string "/boot/grub/stage2"' \
|
||||
-DSTAGE1_5=1 -DCONFIG_FILE_ASM='.string "/boot/grub/stage2"' \
|
||||
$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
|
||||
INCLUDES = -I$(top_srcdir)/shared_src
|
||||
|
||||
# asm.o absolutely needs to come first!
|
||||
fat_stage1_5_exec_LDADD = asm.o common.o char_io.o disk_io.o \
|
||||
stage1_5.o fsys_fat.o
|
||||
|
||||
# FIXME: Automake hackery.
|
||||
DEP_FILES = .deps/dummy.P $(wildcard .deps/*.P)
|
||||
fat_stage1_5_exec_SOURCES = dummy.c # needed to drag in C Makefile variables
|
||||
DISTFILES = $(DIST_COMMON)
|
||||
|
||||
|
|
|
|||
|
|
@ -33,8 +33,7 @@ includedir = @includedir@
|
|||
oldincludedir = /usr/include
|
||||
|
||||
DISTDIR =
|
||||
|
||||
pkgdatadir = $(datadir)/@PACKAGE@
|
||||
pkglibdir = $(libdir)/@PACKAGE@
|
||||
pkgincludedir = $(includedir)/@PACKAGE@
|
||||
|
||||
top_builddir = ..
|
||||
|
|
@ -64,27 +63,30 @@ MAKEINFO = @MAKEINFO@
|
|||
OBJCOPY = @OBJCOPY@
|
||||
PACKAGE = @PACKAGE@
|
||||
VERSION = @VERSION@
|
||||
host_cpu = @host_cpu@
|
||||
host_vendor = @host_vendor@
|
||||
sbingrub = @sbingrub@
|
||||
stage2debug = @stage2debug@
|
||||
|
||||
AUTOMAKE_OPTIONS = gnits
|
||||
|
||||
IMPORTANT_SIZE_LIMIT = 7168
|
||||
|
||||
pkglibdir = $(exec_prefix)/lib/$(PACKAGE)
|
||||
pkglib_DATA = fat_stage1_5
|
||||
CLEANFILES = $(pkglib_DATA) $(pkglib_DATA)T
|
||||
pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
|
||||
pkgdata_DATA = fat_stage1_5
|
||||
CLEANFILES = $(pkgdata_DATA) $(pkgdata_DATA)T
|
||||
noinst_PROGRAMS = fat_stage1_5.exec
|
||||
|
||||
# We can't use builtins or standard includes.
|
||||
COMPILE = $(CC) -fno-builtin -nostdinc -DFSYS_FAT=1 -DNO_DECOMPRESSION=1 \
|
||||
-DNO_FANCY_STUFF=1 -DCONFIG_FILE_ASM='.string "/boot/grub/stage2"' \
|
||||
-DSTAGE1_5=1 -DCONFIG_FILE_ASM='.string "/boot/grub/stage2"' \
|
||||
$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
|
||||
INCLUDES = -I$(top_srcdir)/shared_src
|
||||
|
||||
# asm.o absolutely needs to come first!
|
||||
fat_stage1_5_exec_LDADD = asm.o common.o char_io.o disk_io.o \
|
||||
stage1_5.o fsys_fat.o
|
||||
|
||||
# FIXME: Automake hackery.
|
||||
DEP_FILES = .deps/dummy.P $(wildcard .deps/*.P)
|
||||
fat_stage1_5_exec_SOURCES = dummy.c # needed to drag in C Makefile variables
|
||||
DISTFILES = $(DIST_COMMON)
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
|
|
@ -102,14 +104,13 @@ stage1_5.o fsys_fat.o
|
|||
fat_stage1_5_exec_LDFLAGS =
|
||||
CFLAGS = @CFLAGS@
|
||||
LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
|
||||
DATA = $(pkglib_DATA)
|
||||
DATA = $(pkgdata_DATA)
|
||||
|
||||
DIST_COMMON = Makefile.am Makefile.in
|
||||
|
||||
|
||||
TAR = tar
|
||||
GZIP = --best
|
||||
DEP_FILES = .deps/dummy.P
|
||||
SOURCES = $(fat_stage1_5_exec_SOURCES)
|
||||
OBJECTS = $(fat_stage1_5_exec_OBJECTS)
|
||||
|
||||
|
|
@ -118,7 +119,7 @@ all: Makefile $(PROGRAMS) $(DATA)
|
|||
.SUFFIXES:
|
||||
.SUFFIXES: .S .c .o .s
|
||||
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
||||
cd $(top_srcdir) && $(AUTOMAKE) --gnits fat_stage1_5/Makefile
|
||||
cd $(top_srcdir) && $(AUTOMAKE) --gnu fat_stage1_5/Makefile
|
||||
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
|
||||
cd $(top_builddir) \
|
||||
|
|
@ -150,23 +151,23 @@ distclean-compile:
|
|||
|
||||
maintainer-clean-compile:
|
||||
|
||||
install-pkglibDATA: $(pkglib_DATA)
|
||||
install-pkgdataDATA: $(pkgdata_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
|
||||
@list='$(pkglib_DATA)'; for p in $$list; do \
|
||||
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
|
||||
@list='$(pkgdata_DATA)'; for p in $$list; do \
|
||||
if test -f $(srcdir)/$$p; then \
|
||||
echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$p"; \
|
||||
$(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$p; \
|
||||
echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p"; \
|
||||
$(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
|
||||
else if test -f $$p; then \
|
||||
echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
|
||||
$(INSTALL_DATA) $$p $(DESTDIR)$(pkglibdir)/$$p; \
|
||||
echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
|
||||
$(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \
|
||||
fi; fi; \
|
||||
done
|
||||
|
||||
uninstall-pkglibDATA:
|
||||
uninstall-pkgdataDATA:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
list='$(pkglib_DATA)'; for p in $$list; do \
|
||||
rm -f $(DESTDIR)$(pkglibdir)/$$p; \
|
||||
list='$(pkgdata_DATA)'; for p in $$list; do \
|
||||
rm -f $(DESTDIR)$(pkgdatadir)/$$p; \
|
||||
done
|
||||
|
||||
tags: TAGS
|
||||
|
|
@ -203,7 +204,7 @@ distdir: $(DISTFILES)
|
|||
top_distdir=`cd $(top_distdir) && pwd`; \
|
||||
distdir=`cd $(distdir) && pwd`; \
|
||||
cd $(top_srcdir) \
|
||||
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits fat_stage1_5/Makefile
|
||||
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu fat_stage1_5/Makefile
|
||||
@for file in $(DISTFILES); do \
|
||||
d=$(srcdir); \
|
||||
test -f $(distdir)/$$file \
|
||||
|
|
@ -239,21 +240,21 @@ dvi:
|
|||
check: all
|
||||
$(MAKE)
|
||||
installcheck:
|
||||
install-exec: install-pkglibDATA
|
||||
install-exec:
|
||||
@$(NORMAL_INSTALL)
|
||||
|
||||
install-data:
|
||||
install-data: install-pkgdataDATA
|
||||
@$(NORMAL_INSTALL)
|
||||
|
||||
install: install-exec install-data all
|
||||
@:
|
||||
|
||||
uninstall: uninstall-pkglibDATA
|
||||
uninstall: uninstall-pkgdataDATA
|
||||
|
||||
install-strip:
|
||||
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
|
||||
installdirs:
|
||||
$(mkinstalldirs) $(DATADIR)$(pkglibdir)
|
||||
$(mkinstalldirs) $(DATADIR)$(pkgdatadir)
|
||||
|
||||
|
||||
mostlyclean-generic:
|
||||
|
|
@ -290,7 +291,7 @@ maintainer-clean: maintainer-clean-noinstPROGRAMS \
|
|||
.PHONY: mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
|
||||
clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
|
||||
mostlyclean-compile distclean-compile clean-compile \
|
||||
maintainer-clean-compile uninstall-pkglibDATA install-pkglibDATA tags \
|
||||
maintainer-clean-compile uninstall-pkgdataDATA install-pkgdataDATA tags \
|
||||
mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
|
||||
distdir mostlyclean-depend distclean-depend clean-depend \
|
||||
maintainer-clean-depend info dvi installcheck install-exec install-data \
|
||||
|
|
|
|||
|
|
@ -1,15 +1,13 @@
|
|||
AUTOMAKE_OPTIONS = gnits
|
||||
|
||||
IMPORTANT_SIZE_LIMIT = 7168
|
||||
|
||||
pkglibdir = $(exec_prefix)/lib/$(PACKAGE)
|
||||
pkglib_DATA = ffs_stage1_5
|
||||
CLEANFILES = $(pkglib_DATA) $(pkglib_DATA)T
|
||||
pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
|
||||
pkgdata_DATA = ffs_stage1_5
|
||||
CLEANFILES = $(pkgdata_DATA) $(pkgdata_DATA)T
|
||||
noinst_PROGRAMS = ffs_stage1_5.exec
|
||||
|
||||
# We can't use builtins or standard includes.
|
||||
COMPILE = $(CC) -fno-builtin -nostdinc -DFSYS_FFS=1 -DNO_DECOMPRESSION=1 \
|
||||
-DNO_FANCY_STUFF=1 -DNO_BLOCK_FILES=1 \
|
||||
-DSTAGE1_5=1 -DNO_BLOCK_FILES=1 \
|
||||
-DCONFIG_FILE_ASM='.string "/boot/grub/stage2"' \
|
||||
$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
|
||||
INCLUDES = -I$(top_srcdir)/shared_src
|
||||
|
|
@ -17,6 +15,9 @@ INCLUDES = -I$(top_srcdir)/shared_src
|
|||
# asm.o absolutely needs to come first!
|
||||
ffs_stage1_5_exec_LDADD = asm.o common.o char_io.o disk_io.o \
|
||||
stage1_5.o fsys_ffs.o
|
||||
|
||||
# FIXME: Automake hackery.
|
||||
DEP_FILES = .deps/dummy.c $(wildcard .deps/*.P)
|
||||
ffs_stage1_5_exec_SOURCES = dummy.c # needed to drag in C Makefile variables
|
||||
DISTFILES = $(DIST_COMMON)
|
||||
|
||||
|
|
|
|||
|
|
@ -33,8 +33,7 @@ includedir = @includedir@
|
|||
oldincludedir = /usr/include
|
||||
|
||||
DISTDIR =
|
||||
|
||||
pkgdatadir = $(datadir)/@PACKAGE@
|
||||
pkglibdir = $(libdir)/@PACKAGE@
|
||||
pkgincludedir = $(includedir)/@PACKAGE@
|
||||
|
||||
top_builddir = ..
|
||||
|
|
@ -64,21 +63,21 @@ MAKEINFO = @MAKEINFO@
|
|||
OBJCOPY = @OBJCOPY@
|
||||
PACKAGE = @PACKAGE@
|
||||
VERSION = @VERSION@
|
||||
host_cpu = @host_cpu@
|
||||
host_vendor = @host_vendor@
|
||||
sbingrub = @sbingrub@
|
||||
stage2debug = @stage2debug@
|
||||
|
||||
AUTOMAKE_OPTIONS = gnits
|
||||
|
||||
IMPORTANT_SIZE_LIMIT = 7168
|
||||
|
||||
pkglibdir = $(exec_prefix)/lib/$(PACKAGE)
|
||||
pkglib_DATA = ffs_stage1_5
|
||||
CLEANFILES = $(pkglib_DATA) $(pkglib_DATA)T
|
||||
pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
|
||||
pkgdata_DATA = ffs_stage1_5
|
||||
CLEANFILES = $(pkgdata_DATA) $(pkgdata_DATA)T
|
||||
noinst_PROGRAMS = ffs_stage1_5.exec
|
||||
|
||||
# We can't use builtins or standard includes.
|
||||
COMPILE = $(CC) -fno-builtin -nostdinc -DFSYS_FFS=1 -DNO_DECOMPRESSION=1 \
|
||||
-DNO_FANCY_STUFF=1 -DNO_BLOCK_FILES=1 \
|
||||
-DSTAGE1_5=1 -DNO_BLOCK_FILES=1 \
|
||||
-DCONFIG_FILE_ASM='.string "/boot/grub/stage2"' \
|
||||
$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
|
||||
INCLUDES = -I$(top_srcdir)/shared_src
|
||||
|
|
@ -86,6 +85,9 @@ INCLUDES = -I$(top_srcdir)/shared_src
|
|||
# asm.o absolutely needs to come first!
|
||||
ffs_stage1_5_exec_LDADD = asm.o common.o char_io.o disk_io.o \
|
||||
stage1_5.o fsys_ffs.o
|
||||
|
||||
# FIXME: Automake hackery.
|
||||
DEP_FILES = .deps/dummy.c $(wildcard .deps/*.P)
|
||||
ffs_stage1_5_exec_SOURCES = dummy.c # needed to drag in C Makefile variables
|
||||
DISTFILES = $(DIST_COMMON)
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
|
|
@ -103,14 +105,13 @@ stage1_5.o fsys_ffs.o
|
|||
ffs_stage1_5_exec_LDFLAGS =
|
||||
CFLAGS = @CFLAGS@
|
||||
LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
|
||||
DATA = $(pkglib_DATA)
|
||||
DATA = $(pkgdata_DATA)
|
||||
|
||||
DIST_COMMON = Makefile.am Makefile.in
|
||||
|
||||
|
||||
TAR = tar
|
||||
GZIP = --best
|
||||
DEP_FILES = .deps/dummy.P
|
||||
SOURCES = $(ffs_stage1_5_exec_SOURCES)
|
||||
OBJECTS = $(ffs_stage1_5_exec_OBJECTS)
|
||||
|
||||
|
|
@ -119,7 +120,7 @@ all: Makefile $(PROGRAMS) $(DATA)
|
|||
.SUFFIXES:
|
||||
.SUFFIXES: .S .c .o .s
|
||||
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
||||
cd $(top_srcdir) && $(AUTOMAKE) --gnits ffs_stage1_5/Makefile
|
||||
cd $(top_srcdir) && $(AUTOMAKE) --gnu ffs_stage1_5/Makefile
|
||||
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
|
||||
cd $(top_builddir) \
|
||||
|
|
@ -151,23 +152,23 @@ distclean-compile:
|
|||
|
||||
maintainer-clean-compile:
|
||||
|
||||
install-pkglibDATA: $(pkglib_DATA)
|
||||
install-pkgdataDATA: $(pkgdata_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
|
||||
@list='$(pkglib_DATA)'; for p in $$list; do \
|
||||
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
|
||||
@list='$(pkgdata_DATA)'; for p in $$list; do \
|
||||
if test -f $(srcdir)/$$p; then \
|
||||
echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$p"; \
|
||||
$(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$p; \
|
||||
echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p"; \
|
||||
$(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
|
||||
else if test -f $$p; then \
|
||||
echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
|
||||
$(INSTALL_DATA) $$p $(DESTDIR)$(pkglibdir)/$$p; \
|
||||
echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
|
||||
$(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \
|
||||
fi; fi; \
|
||||
done
|
||||
|
||||
uninstall-pkglibDATA:
|
||||
uninstall-pkgdataDATA:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
list='$(pkglib_DATA)'; for p in $$list; do \
|
||||
rm -f $(DESTDIR)$(pkglibdir)/$$p; \
|
||||
list='$(pkgdata_DATA)'; for p in $$list; do \
|
||||
rm -f $(DESTDIR)$(pkgdatadir)/$$p; \
|
||||
done
|
||||
|
||||
tags: TAGS
|
||||
|
|
@ -204,7 +205,7 @@ distdir: $(DISTFILES)
|
|||
top_distdir=`cd $(top_distdir) && pwd`; \
|
||||
distdir=`cd $(distdir) && pwd`; \
|
||||
cd $(top_srcdir) \
|
||||
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits ffs_stage1_5/Makefile
|
||||
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu ffs_stage1_5/Makefile
|
||||
@for file in $(DISTFILES); do \
|
||||
d=$(srcdir); \
|
||||
test -f $(distdir)/$$file \
|
||||
|
|
@ -240,21 +241,21 @@ dvi:
|
|||
check: all
|
||||
$(MAKE)
|
||||
installcheck:
|
||||
install-exec: install-pkglibDATA
|
||||
install-exec:
|
||||
@$(NORMAL_INSTALL)
|
||||
|
||||
install-data:
|
||||
install-data: install-pkgdataDATA
|
||||
@$(NORMAL_INSTALL)
|
||||
|
||||
install: install-exec install-data all
|
||||
@:
|
||||
|
||||
uninstall: uninstall-pkglibDATA
|
||||
uninstall: uninstall-pkgdataDATA
|
||||
|
||||
install-strip:
|
||||
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
|
||||
installdirs:
|
||||
$(mkinstalldirs) $(DATADIR)$(pkglibdir)
|
||||
$(mkinstalldirs) $(DATADIR)$(pkgdatadir)
|
||||
|
||||
|
||||
mostlyclean-generic:
|
||||
|
|
@ -291,7 +292,7 @@ maintainer-clean: maintainer-clean-noinstPROGRAMS \
|
|||
.PHONY: mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
|
||||
clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
|
||||
mostlyclean-compile distclean-compile clean-compile \
|
||||
maintainer-clean-compile uninstall-pkglibDATA install-pkglibDATA tags \
|
||||
maintainer-clean-compile uninstall-pkgdataDATA install-pkgdataDATA tags \
|
||||
mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
|
||||
distdir mostlyclean-depend distclean-depend clean-depend \
|
||||
maintainer-clean-depend info dvi installcheck install-exec install-data \
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
AUTOMAKE_OPTIONS = gnits
|
||||
|
||||
EXTRA_PROGRAMS = grub
|
||||
sbin_PROGRAMS = $(sbingrub)
|
||||
CLEANFILES = $(EXTRA_PROGRAMS)
|
||||
|
|
@ -10,4 +8,7 @@ grub_SOURCES = main.c asmstub.c
|
|||
grub_LDADD = boot.o common.o char_io.o cmdline.o disk_io.o gunzip.o \
|
||||
fsys_ffs.o fsys_ext2fs.o fsys_fat.o stage2.o
|
||||
|
||||
# FIXME: Automake hackery.
|
||||
DEP_FILES = .deps/main.P .deps/asmstub.P $(wildcard .deps/*.P)
|
||||
|
||||
@SHARED_SRC_RULES@
|
||||
|
|
|
|||
|
|
@ -65,11 +65,11 @@ MAKEINFO = @MAKEINFO@
|
|||
OBJCOPY = @OBJCOPY@
|
||||
PACKAGE = @PACKAGE@
|
||||
VERSION = @VERSION@
|
||||
host_cpu = @host_cpu@
|
||||
host_vendor = @host_vendor@
|
||||
sbingrub = @sbingrub@
|
||||
stage2debug = @stage2debug@
|
||||
|
||||
AUTOMAKE_OPTIONS = gnits
|
||||
|
||||
EXTRA_PROGRAMS = grub
|
||||
sbin_PROGRAMS = $(sbingrub)
|
||||
CLEANFILES = $(EXTRA_PROGRAMS)
|
||||
|
|
@ -79,6 +79,9 @@ INCLUDES = -I$(top_srcdir)/shared_src
|
|||
grub_SOURCES = main.c asmstub.c
|
||||
grub_LDADD = boot.o common.o char_io.o cmdline.o disk_io.o gunzip.o \
|
||||
fsys_ffs.o fsys_ext2fs.o fsys_fat.o stage2.o
|
||||
|
||||
# FIXME: Automake hackery.
|
||||
DEP_FILES = .deps/main.P .deps/asmstub.P $(wildcard .deps/*.P)
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
CONFIG_CLEAN_FILES =
|
||||
PROGRAMS = $(sbin_PROGRAMS)
|
||||
|
|
@ -102,7 +105,6 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
|||
|
||||
TAR = tar
|
||||
GZIP = --best
|
||||
DEP_FILES = .deps/asmstub.P .deps/main.P
|
||||
SOURCES = $(grub_SOURCES)
|
||||
OBJECTS = $(grub_OBJECTS)
|
||||
|
||||
|
|
@ -111,7 +113,7 @@ all: Makefile $(PROGRAMS)
|
|||
.SUFFIXES:
|
||||
.SUFFIXES: .S .c .o .s
|
||||
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
||||
cd $(top_srcdir) && $(AUTOMAKE) --gnits grub/Makefile
|
||||
cd $(top_srcdir) && $(AUTOMAKE) --gnu grub/Makefile
|
||||
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
|
||||
cd $(top_builddir) \
|
||||
|
|
@ -197,7 +199,7 @@ distdir: $(DISTFILES)
|
|||
top_distdir=`cd $(top_distdir) && pwd`; \
|
||||
distdir=`cd $(distdir) && pwd`; \
|
||||
cd $(top_srcdir) \
|
||||
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits grub/Makefile
|
||||
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu grub/Makefile
|
||||
@for file in $(DISTFILES); do \
|
||||
d=$(srcdir); \
|
||||
test -f $(distdir)/$$file \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
AUTOMAKE_OPTIONS = gnits
|
||||
noinst_HEADERS = apic.h defs.h dir.h disk_inode.h disk_inode_ffs.h \
|
||||
fat.h filesys.h freebsd.h fs.h i386-elf.h imgact_aout.h \
|
||||
mb_header.h mb_info.h pc_slice.h shared.h smp-imps.h
|
||||
|
|
|
|||
|
|
@ -65,10 +65,11 @@ MAKEINFO = @MAKEINFO@
|
|||
OBJCOPY = @OBJCOPY@
|
||||
PACKAGE = @PACKAGE@
|
||||
VERSION = @VERSION@
|
||||
host_cpu = @host_cpu@
|
||||
host_vendor = @host_vendor@
|
||||
sbingrub = @sbingrub@
|
||||
stage2debug = @stage2debug@
|
||||
|
||||
AUTOMAKE_OPTIONS = gnits
|
||||
noinst_HEADERS = apic.h defs.h dir.h disk_inode.h disk_inode_ffs.h \
|
||||
fat.h filesys.h freebsd.h fs.h i386-elf.h imgact_aout.h \
|
||||
mb_header.h mb_info.h pc_slice.h shared.h smp-imps.h
|
||||
|
|
@ -91,7 +92,7 @@ all: Makefile $(HEADERS)
|
|||
|
||||
.SUFFIXES:
|
||||
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
||||
cd $(top_srcdir) && $(AUTOMAKE) --gnits shared_src/Makefile
|
||||
cd $(top_srcdir) && $(AUTOMAKE) --gnu shared_src/Makefile
|
||||
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
|
||||
cd $(top_builddir) \
|
||||
|
|
@ -132,7 +133,7 @@ distdir: $(DISTFILES)
|
|||
top_distdir=`cd $(top_distdir) && pwd`; \
|
||||
distdir=`cd $(distdir) && pwd`; \
|
||||
cd $(top_srcdir) \
|
||||
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits shared_src/Makefile
|
||||
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu shared_src/Makefile
|
||||
@for file in $(DISTFILES); do \
|
||||
d=$(srcdir); \
|
||||
test -f $(distdir)/$$file \
|
||||
|
|
|
|||
|
|
@ -30,6 +30,9 @@
|
|||
.code16
|
||||
|
||||
ENTRY(start)
|
||||
/* Suppress ld warnings. */
|
||||
.globl _start
|
||||
_start:
|
||||
/*
|
||||
* Guarantee that "start" is loaded at 0x0:0x8000.
|
||||
*/
|
||||
|
|
@ -122,6 +125,7 @@ ENTRY(hard_stop)
|
|||
hlt
|
||||
jmp EXT_C(hard_stop)
|
||||
|
||||
#ifndef STAGE1_5
|
||||
/*
|
||||
* stop_floppy()
|
||||
*
|
||||
|
|
@ -164,6 +168,7 @@ ENTRY(chain_stage1)
|
|||
addr32
|
||||
ljmp (offset)
|
||||
.code32
|
||||
#endif /* STAGE1_5 */
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -381,6 +386,12 @@ ENTRY(biosdisk)
|
|||
movw %bx, %ax
|
||||
int $0x13 /* do the operation */
|
||||
|
||||
#ifdef NO_INT13_FALLBACK
|
||||
/* Save return value. */
|
||||
movb %ah, %bl
|
||||
data32
|
||||
jmp disk_exit_16
|
||||
#else
|
||||
/* set success return value */
|
||||
movb $0, %bl
|
||||
|
||||
|
|
@ -390,6 +401,7 @@ ENTRY(biosdisk)
|
|||
|
||||
data32
|
||||
call EXT_C(real_to_prot) /* back to protected mode */
|
||||
#endif
|
||||
.code32
|
||||
|
||||
/* either failed, or a floppy, so try standard BIOS calls */
|
||||
|
|
@ -423,7 +435,7 @@ disk_compute_args:
|
|||
/* check cylinder offset, is there a geometry problem here? */
|
||||
movl 0x10(%ebp), %ebx
|
||||
shrl $16, %ebx
|
||||
andb $0xf, %bh /* mask out bios extension code */
|
||||
andb $0xf, %bh /* mask out bios extension code */
|
||||
cmpl %ebx, %eax
|
||||
|
||||
/* if not, go on to standard read function */
|
||||
|
|
@ -432,8 +444,8 @@ disk_compute_args:
|
|||
movl $BIOSDISK_ERROR_GEOMETRY, %eax
|
||||
jmp disk_exit_32
|
||||
|
||||
disk_address_packet:
|
||||
.align 4
|
||||
disk_address_packet:
|
||||
.byte 0x20 /* length of packet */
|
||||
.byte 0 /* reserved */
|
||||
dap_blocks:
|
||||
|
|
@ -452,7 +464,9 @@ disk_use_standard_bios:
|
|||
|
||||
shll $8, %edx /* get head number to %dh */
|
||||
xchgl %eax, %ecx /* cylinder to %cx, sector to %al */
|
||||
#ifdef AWARD_INT13_EXTENSIONS
|
||||
/* FIXME: cylinder; bits 10,11 of cyl are in %dh */
|
||||
#endif
|
||||
/* cylinder; bits 8,9 of cyl are in %cl */
|
||||
xchgb %ch, %cl
|
||||
shlb $6, %cl
|
||||
|
|
@ -633,18 +647,22 @@ probe_success:
|
|||
*/
|
||||
movb %bh, %ah /* restore BIOS extensions bits */
|
||||
|
||||
#ifdef AWARD_INT13_EXTENSIONS
|
||||
movb %dh, %al /* bits 10,11 of cylinder count */
|
||||
andb $0xc0, %eax
|
||||
andb $0xc0, %al
|
||||
shlw $2, %ax /* << 2 */
|
||||
#endif
|
||||
movb %cl, %al /* bits 8,9 of cylinder count */
|
||||
andb $0xc0, %al
|
||||
shlw $2, %ax /* << 2 */
|
||||
movb %ch, %al /* Lower 8 bits */
|
||||
shll $16, %eax /* << 16 */
|
||||
|
||||
andb $0x3f, %ah /* mask of cylinder gunk */
|
||||
#ifdef AWARD_INT13_EXTENSIONS
|
||||
andb $0x3f, %dh /* mask off cylinder gunk */
|
||||
#endif
|
||||
movb %dh, %ah /* max head */
|
||||
andb $0x3f, %cl /* mask of cylinder gunk */
|
||||
andb $0x3f, %cl /* mask off cylinder gunk */
|
||||
movb %cl, %al /* max sector (and # sectors) */
|
||||
|
||||
movl %eax, %ebx /* save return value */
|
||||
|
|
@ -770,7 +788,7 @@ xdone:
|
|||
ret
|
||||
|
||||
|
||||
#ifndef NO_FANCY_STUFF
|
||||
#ifndef STAGE1_5
|
||||
|
||||
/*
|
||||
*
|
||||
|
|
@ -1344,7 +1362,7 @@ pending:
|
|||
pop %ebp
|
||||
ret
|
||||
|
||||
#endif /* NO_FANCY_STUFF */
|
||||
#endif /* STAGE1_5 */
|
||||
|
||||
/*
|
||||
* This is the area for all of the special variables.
|
||||
|
|
|
|||
|
|
@ -23,26 +23,25 @@
|
|||
|
||||
#include "shared.h"
|
||||
|
||||
#ifndef NO_FANCY_STUFF
|
||||
#ifndef STAGE1_5
|
||||
int
|
||||
getkey (void)
|
||||
{
|
||||
buf_drive = -1;
|
||||
return asm_getkey ();
|
||||
}
|
||||
#endif /* NO_FANCY_STUFF */
|
||||
#endif /* STAGE1_5 */
|
||||
|
||||
|
||||
void
|
||||
print_error (void)
|
||||
{
|
||||
if (errnum > ERR_NONE && errnum < MAX_ERR_NUM)
|
||||
#ifndef NO_FANCY_STUFF
|
||||
#ifndef STAGE1_5
|
||||
/* printf("\7\n %s\n", err_list[errnum]); */
|
||||
printf ("\n %s\n", err_list[errnum]);
|
||||
#else /* NO_FANCY_STUFF */
|
||||
#else /* STAGE1_5 */
|
||||
printf ("Error: %d\n", errnum);
|
||||
#endif /* NO_FANCY_STUFF */
|
||||
#endif /* STAGE1_5 */
|
||||
|
||||
errnum = ERR_NONE;
|
||||
}
|
||||
|
|
@ -130,7 +129,7 @@ printf (char *format,...)
|
|||
}
|
||||
|
||||
|
||||
#ifndef NO_FANCY_STUFF
|
||||
#ifndef STAGE1_5
|
||||
|
||||
void
|
||||
init_page (void)
|
||||
|
|
@ -415,9 +414,10 @@ get_cmdline (char *prompt, char *commands, char *cmdline, int maxlen)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#endif /* NO_FANCY_STUFF */
|
||||
#endif /* STAGE1_5 */
|
||||
|
||||
|
||||
#if !defined(STAGE1_5) || !defined(NO_BLOCK_FILES)
|
||||
int
|
||||
get_based_digit (int c, int base)
|
||||
{
|
||||
|
|
@ -495,6 +495,7 @@ tolower (int c)
|
|||
|
||||
return c;
|
||||
}
|
||||
#endif /* !defined(STAGE1_5) || !defined(NO_BLOCK_FILES) */
|
||||
|
||||
|
||||
int
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ unsigned long saved_mem_upper;
|
|||
|
||||
int errnum = 0;
|
||||
|
||||
#ifndef NO_FANCY_STUFF
|
||||
#ifndef STAGE1_5
|
||||
|
||||
char *err_list[] =
|
||||
{
|
||||
|
|
@ -61,7 +61,7 @@ char *err_list[] =
|
|||
[ERR_FILE_NOT_FOUND] = "File not found",
|
||||
[ERR_FSYS_CORRUPT] = "Inconsistent filesystem structure",
|
||||
[ERR_FSYS_MOUNT] = "Cannot mount selected partition",
|
||||
[ERR_GEOM] = "Disk geometry error",
|
||||
[ERR_GEOM] = "Selected cylinder exceeds maximum supported by BIOS",
|
||||
[ERR_NEED_LX_KERNEL] = "Must load Linux kernel before initrd",
|
||||
[ERR_NEED_MB_KERNEL] = "Must load Multiboot kernel before modules",
|
||||
[ERR_NO_DISK] = "Selected disk does not exist",
|
||||
|
|
@ -83,7 +83,7 @@ static struct AddrRangeDesc fakemap[3] =
|
|||
{20, 0x100000, 0, 0, 0, MB_ARD_MEMORY},
|
||||
{20, 0x1000000, 0, 0, 0, MB_ARD_MEMORY}
|
||||
};
|
||||
#endif /* NO_FANCY_STUFF */
|
||||
#endif /* STAGE1_5 */
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -102,7 +102,7 @@ init_bios_info (void)
|
|||
mbi.mem_lower = get_memsize (0);
|
||||
mbi.mem_upper = get_memsize (1);
|
||||
|
||||
#ifndef NO_FANCY_STUFF
|
||||
#ifndef STAGE1_5
|
||||
/*
|
||||
* We need to call this somewhere before trying to put data
|
||||
* above 1 MB, since without calling it, address line 20 will be wired
|
||||
|
|
@ -199,7 +199,7 @@ init_bios_info (void)
|
|||
|
||||
mbi.flags = MB_INFO_MEMORY | MB_INFO_CMDLINE | MB_INFO_BOOTDEV;
|
||||
|
||||
#endif /* NO_FANCY_STUFF */
|
||||
#endif /* STAGE1_5 */
|
||||
|
||||
/*
|
||||
* Set boot drive and partition.
|
||||
|
|
|
|||
|
|
@ -90,8 +90,7 @@ struct icommon
|
|||
int ic_blocks; /* 104: blocks actually held */
|
||||
int ic_gen; /* 108: generation number */
|
||||
int ic_spare[4]; /* 112: reserved, currently unused */
|
||||
}
|
||||
i_ic;
|
||||
};
|
||||
|
||||
/*
|
||||
* Same structure, but on disk.
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@
|
|||
/* XXX for evil hack */
|
||||
#include "freebsd.h"
|
||||
|
||||
#ifndef NO_FANCY_STUFF
|
||||
#ifndef STAGE1_5
|
||||
/* instrumentation variables */
|
||||
void (*debug_fs) (int) = NULL;
|
||||
void (*debug_fs_func) (int) = NULL;
|
||||
#endif /* NO_FANCY_STUFF */
|
||||
#endif /* STAGE1_5 */
|
||||
|
||||
/* These have the same format as "boot_drive" and "install_partition", but
|
||||
are meant to be working values. */
|
||||
|
|
@ -86,6 +86,7 @@ rawread (int drive, int sector, int byte_offset, int byte_len, int addr)
|
|||
if (buf_drive != drive)
|
||||
{
|
||||
buf_geom = get_diskinfo (drive);
|
||||
printf ("buf_geom = 0x%x\n", buf_geom); /* FIXME */
|
||||
buf_drive = drive;
|
||||
buf_track = -1;
|
||||
}
|
||||
|
|
@ -143,7 +144,7 @@ rawread (int drive, int sector, int byte_offset, int byte_len, int addr)
|
|||
buf_track = track;
|
||||
}
|
||||
|
||||
#ifndef NO_FANCY_STUFF
|
||||
#ifndef STAGE1_5
|
||||
/*
|
||||
* Instrumentation to tell which sectors were read and used.
|
||||
*/
|
||||
|
|
@ -155,7 +156,7 @@ rawread (int drive, int sector, int byte_offset, int byte_len, int addr)
|
|||
while (sector_num < sector_end)
|
||||
(*debug_fs_func) (sector_num++);
|
||||
}
|
||||
#endif /* NO_FANCY_STUFF */
|
||||
#endif /* STAGE1_5 */
|
||||
|
||||
if (size > ((num_sect * SECTOR_SIZE) - byte_offset))
|
||||
size = (num_sect * SECTOR_SIZE) - byte_offset;
|
||||
|
|
@ -195,10 +196,10 @@ devread (int sector, int byte_offset, int byte_len, int addr)
|
|||
sector++;
|
||||
}
|
||||
|
||||
#if !defined(NO_FANCY_STUFF) && defined(DEBUG)
|
||||
#if !defined(STAGE1_5) && defined(DEBUG)
|
||||
if (debug_fs)
|
||||
printf ("<%d, %d, %d>", sector, byte_offset, byte_len);
|
||||
#endif /* !NO_FANCY_STUFF && DEBUG */
|
||||
#endif /* !STAGE1_5 && DEBUG */
|
||||
|
||||
/*
|
||||
* Call "rawread", which is very similar, but:
|
||||
|
|
@ -242,7 +243,7 @@ attempt_mount (void)
|
|||
}
|
||||
|
||||
|
||||
#ifndef NO_FANCY_STUFF
|
||||
#ifndef STAGE1_5
|
||||
int
|
||||
make_saved_active (void)
|
||||
{
|
||||
|
|
@ -293,7 +294,7 @@ check_and_print_mount (void)
|
|||
print_fsys_type ();
|
||||
print_error ();
|
||||
}
|
||||
#endif /* NO_FANCY_STUFF */
|
||||
#endif /* STAGE1_5 */
|
||||
|
||||
|
||||
static int
|
||||
|
|
@ -325,7 +326,7 @@ check_BSD_parts (int flags)
|
|||
part_start = BSD_PART_START (label_buf, part_no);
|
||||
part_length = BSD_PART_LENGTH (label_buf, part_no);
|
||||
|
||||
#ifndef NO_FANCY_STUFF
|
||||
#ifndef STAGE1_5
|
||||
if (flags)
|
||||
{
|
||||
if (!got_part)
|
||||
|
|
@ -337,7 +338,7 @@ check_BSD_parts (int flags)
|
|||
check_and_print_mount ();
|
||||
}
|
||||
else
|
||||
#endif /* NO_FANCY_STUFF */
|
||||
#endif /* STAGE1_5 */
|
||||
if (part_no == ((current_partition >> 8) & 0xFF))
|
||||
break;
|
||||
}
|
||||
|
|
@ -361,6 +362,7 @@ check_BSD_parts (int flags)
|
|||
}
|
||||
|
||||
|
||||
#if !defined(STAGE1_5) || !defined(NO_BLOCK_FILES)
|
||||
static char cur_part_desc[16];
|
||||
|
||||
static int
|
||||
|
|
@ -442,7 +444,7 @@ real_open_partition (int flags)
|
|||
ext = i;
|
||||
}
|
||||
}
|
||||
#ifndef NO_FANCY_STUFF
|
||||
# ifndef STAGE1_5
|
||||
/*
|
||||
* Display partition information
|
||||
*/
|
||||
|
|
@ -456,7 +458,7 @@ real_open_partition (int flags)
|
|||
check_BSD_parts (1);
|
||||
errnum = ERR_NONE;
|
||||
}
|
||||
#endif /* NO_FANCY_STUFF */
|
||||
# endif /* STAGE1_5 */
|
||||
/*
|
||||
* If we've found the right partition, we're done
|
||||
*/
|
||||
|
|
@ -514,14 +516,14 @@ real_open_partition (int flags)
|
|||
ext = -2;
|
||||
}
|
||||
}
|
||||
#ifndef NO_FANCY_STUFF
|
||||
# ifndef STAGE1_5
|
||||
else
|
||||
{
|
||||
current_partition = 0xFFFFFF;
|
||||
check_and_print_mount ();
|
||||
errnum = 0;
|
||||
}
|
||||
#endif /* NO_FANCY_STUFF */
|
||||
# endif /* STAGE1_5 */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -540,8 +542,10 @@ open_partition (void)
|
|||
{
|
||||
return real_open_partition (0);
|
||||
}
|
||||
#endif /* !defined(STAGE1_5) || !defined(NO_BLOCK_FILES) */
|
||||
|
||||
|
||||
#ifndef STAGE1_5
|
||||
/* XX used for device completion in 'set_device' and 'print_completions' */
|
||||
static int incomplete, disk_choice;
|
||||
static enum
|
||||
|
|
@ -650,8 +654,9 @@ set_device (char *device)
|
|||
|
||||
return retval;
|
||||
}
|
||||
#endif /* STAGE1_5 */
|
||||
|
||||
|
||||
#ifndef STAGE1_5
|
||||
/*
|
||||
* This performs a "mount" on the current device, both drive and partition
|
||||
* number.
|
||||
|
|
@ -668,9 +673,10 @@ open_device (void)
|
|||
|
||||
return 1;
|
||||
}
|
||||
#endif /* STAGE1_5 */
|
||||
|
||||
|
||||
#ifndef NO_FANCY_STUFF
|
||||
#ifndef STAGE1_5
|
||||
int
|
||||
set_bootdev (int hdbias)
|
||||
{
|
||||
|
|
@ -699,9 +705,10 @@ set_bootdev (int hdbias)
|
|||
((saved_drive - hdbias) & 0x79),
|
||||
((saved_partition >> 8) & 0xFF));
|
||||
}
|
||||
#endif /* NO_FANCY_STUFF */
|
||||
#endif /* STAGE1_5 */
|
||||
|
||||
|
||||
#ifndef STAGE1_5
|
||||
static char *
|
||||
setup_part (char *filename)
|
||||
{
|
||||
|
|
@ -746,9 +753,10 @@ setup_part (char *filename)
|
|||
|
||||
return filename;
|
||||
}
|
||||
#endif /* STAGE1_5 */
|
||||
|
||||
|
||||
#ifndef NO_FANCY_STUFF
|
||||
#ifndef STAGE1_5
|
||||
/*
|
||||
* This prints the filesystem type or gives relevant information.
|
||||
*/
|
||||
|
|
@ -768,7 +776,9 @@ print_fsys_type (void)
|
|||
else
|
||||
printf ("partition type 0x%x\n", current_slice);
|
||||
}
|
||||
#endif /* STAGE1_5 */
|
||||
|
||||
#ifndef STAGE1_5
|
||||
/*
|
||||
* This lists the possible completions of a device string, filename, or
|
||||
* any sane combination of the two.
|
||||
|
|
@ -832,7 +842,7 @@ print_completions (char *filename)
|
|||
|
||||
print_error ();
|
||||
}
|
||||
#endif /* NO_FANCY_STUFF */
|
||||
#endif /* STAGE1_5 */
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -850,8 +860,10 @@ open (char *filename)
|
|||
set it to zero before returning if opening a file! */
|
||||
filepos = 0;
|
||||
|
||||
#ifndef STAGE1_5
|
||||
if (!(filename = setup_part (filename)))
|
||||
return 0;
|
||||
#endif /* STAGE1_5 */
|
||||
|
||||
#ifndef NO_BLOCK_FILES
|
||||
block_file = 0;
|
||||
|
|
@ -931,8 +943,10 @@ open (char *filename)
|
|||
if (!errnum && fsys_type == NUM_FSYS)
|
||||
errnum = ERR_FSYS_MOUNT;
|
||||
|
||||
# ifndef STAGE1_5
|
||||
/* set "dir" function to open a file */
|
||||
print_possibilities = 0;
|
||||
# endif
|
||||
|
||||
if (!errnum && (*(fsys_table[fsys_type].dir_func)) (filename))
|
||||
{
|
||||
|
|
@ -1012,17 +1026,17 @@ read (int addr, int len)
|
|||
if (size > len)
|
||||
size = len;
|
||||
|
||||
#ifndef NO_FANCY_STUFF
|
||||
#ifndef STAGE1_5
|
||||
debug_fs_func = debug_fs;
|
||||
#endif /* NO_FANCY_STUFF */
|
||||
#endif /* STAGE1_5 */
|
||||
|
||||
/* read current block and put it in the right place in memory */
|
||||
devread (BLK_BLKSTART (BLK_CUR_BLKLIST) + BLK_CUR_BLKNUM,
|
||||
off, size, addr);
|
||||
|
||||
#ifndef NO_FANCY_STUFF
|
||||
#ifndef STAGE1_5
|
||||
debug_fs_func = NULL;
|
||||
#endif /* NO_FANCY_STUFF */
|
||||
#endif /* STAGE1_5 */
|
||||
|
||||
len -= size;
|
||||
filepos += size;
|
||||
|
|
@ -1047,6 +1061,7 @@ read (int addr, int len)
|
|||
}
|
||||
|
||||
|
||||
#ifndef STAGE1_5
|
||||
int
|
||||
dir (char *dirname)
|
||||
{
|
||||
|
|
@ -1071,3 +1086,4 @@ dir (char *dirname)
|
|||
|
||||
return (*(fsys_table[fsys_type].dir_func)) (dirname);
|
||||
}
|
||||
#endif /* STAGE1_5 */
|
||||
|
|
|
|||
|
|
@ -90,30 +90,40 @@ struct fsys_entry
|
|||
int (*dir_func) (char *dirname);
|
||||
};
|
||||
|
||||
#ifdef STAGE1_5
|
||||
# define print_possibilities 0
|
||||
#endif
|
||||
|
||||
#ifndef _DISK_IO_C
|
||||
|
||||
extern int fsmax;
|
||||
# ifndef STAGE1_5
|
||||
extern int print_possibilities;
|
||||
# endif
|
||||
|
||||
extern int fsmax;
|
||||
extern struct fsys_entry fsys_table[NUM_FSYS + 1];
|
||||
|
||||
#else
|
||||
#else /* _DISK_IO_C */
|
||||
|
||||
# ifndef STAGE1_5
|
||||
int print_possibilities;
|
||||
# endif
|
||||
|
||||
int fsmax;
|
||||
int print_possibilities;
|
||||
struct fsys_entry fsys_table[NUM_FSYS + 1] =
|
||||
{
|
||||
#ifdef FSYS_FAT
|
||||
# ifdef FSYS_FAT
|
||||
{"fat", fat_mount, 0, fat_dir},
|
||||
#endif
|
||||
#ifdef FSYS_EXT2FS
|
||||
# endif
|
||||
# ifdef FSYS_EXT2FS
|
||||
{"ext2fs", ext2fs_mount, ext2fs_read, ext2fs_dir},
|
||||
#endif
|
||||
# endif
|
||||
/* XX FFS should come last as it's superblock is commonly crossing tracks
|
||||
on floppies from track 1 to 2, while others only use 1. */
|
||||
#ifdef FSYS_FFS
|
||||
# ifdef FSYS_FFS
|
||||
{"ffs", ffs_mount, ffs_read, ffs_dir},
|
||||
#endif
|
||||
# endif
|
||||
{0, 0, 0, 0}
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif /* _DISK_IO_C */
|
||||
|
|
|
|||
|
|
@ -431,16 +431,16 @@ ext2fs_read (int addr, int len)
|
|||
if (size > len)
|
||||
size = len;
|
||||
|
||||
#ifndef NO_FANCY_STUFF
|
||||
#ifndef STAGE1_5
|
||||
debug_fs_func = debug_fs;
|
||||
#endif /* NO_FANCY_STUFF */
|
||||
#endif /* STAGE1_5 */
|
||||
|
||||
devread (map * (EXT2_BLOCK_SIZE (SUPERBLOCK) / DEV_BSIZE),
|
||||
offset, size, addr);
|
||||
|
||||
#ifndef NO_FANCY_STUFF
|
||||
#ifndef STAGE1_5
|
||||
debug_fs_func = NULL;
|
||||
#endif /* NO_FANCY_STUFF */
|
||||
#endif /* STAGE1_5 */
|
||||
|
||||
addr += size;
|
||||
len -= size;
|
||||
|
|
@ -753,6 +753,7 @@ ext2fs_dir (char *dirname)
|
|||
dp->name[dp->name_len] = 0;
|
||||
str_chk = substring (dirname, dp->name);
|
||||
|
||||
# ifndef STAGE1_5
|
||||
if (print_possibilities && ch != '/'
|
||||
&& (!*dirname || str_chk <= 0))
|
||||
{
|
||||
|
|
@ -760,6 +761,7 @@ ext2fs_dir (char *dirname)
|
|||
print_possibilities = -print_possibilities;
|
||||
printf (" %s", dp->name);
|
||||
}
|
||||
# endif
|
||||
|
||||
dp->name[dp->name_len] = saved_c;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -234,6 +234,7 @@ loop:
|
|||
filename[i + j] = 0;
|
||||
}
|
||||
|
||||
# ifndef STAGE1_5
|
||||
if (print_possibilities && ch != '/'
|
||||
&& (!*dirname || substring (dirname, filename) <= 0))
|
||||
{
|
||||
|
|
@ -241,6 +242,7 @@ loop:
|
|||
print_possibilities = -print_possibilities;
|
||||
printf (" %s", filename);
|
||||
}
|
||||
# endif /* STAGE1_5 */
|
||||
}
|
||||
while (substring (dirname, filename) != 0 ||
|
||||
(print_possibilities && ch != '/'));
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ ffs_mount (void)
|
|||
return retval;
|
||||
}
|
||||
|
||||
int
|
||||
static int
|
||||
block_map (int file_block)
|
||||
{
|
||||
int bnum;
|
||||
|
|
@ -134,15 +134,15 @@ ffs_read (int addr, int len)
|
|||
if (size > len)
|
||||
size = len;
|
||||
|
||||
#ifndef NO_FANCY_STUFF
|
||||
#ifndef STAGE1_5
|
||||
debug_fs_func = debug_fs;
|
||||
#endif /* NO_FANCY_STUFF */
|
||||
#endif /* STAGE1_5 */
|
||||
|
||||
devread (fsbtodb (SUPERBLOCK, map), off, size, addr);
|
||||
|
||||
#ifndef NO_FANCY_STUFF
|
||||
#ifndef STAGE1_5
|
||||
debug_fs_func = NULL;
|
||||
#endif /* NO_FANCY_STUFF */
|
||||
#endif /* STAGE1_5 */
|
||||
|
||||
addr += size;
|
||||
len -= size;
|
||||
|
|
@ -243,6 +243,7 @@ loop:
|
|||
dp = (struct direct *) (FSYS_BUF + off);
|
||||
loc += dp->d_reclen;
|
||||
|
||||
#ifndef STAGE1_5
|
||||
if (dp->d_ino && print_possibilities && ch != '/'
|
||||
&& (!*dirname || substring (dirname, dp->d_name) <= 0))
|
||||
{
|
||||
|
|
@ -251,6 +252,7 @@ loop:
|
|||
|
||||
printf (" %s", dp->d_name);
|
||||
}
|
||||
#endif /* STAGE1_5 */
|
||||
}
|
||||
while (!dp->d_ino || (substring (dirname, dp->d_name) != 0
|
||||
|| (print_possibilities && ch != '/')));
|
||||
|
|
|
|||
|
|
@ -409,11 +409,11 @@ __attribute__ ((noreturn));
|
|||
|
||||
#ifndef _DISK_IO_C
|
||||
|
||||
#ifndef NO_FANCY_STUFF
|
||||
#ifndef STAGE1_5
|
||||
/* instrumentation variables */
|
||||
extern void (*debug_fs) (int);
|
||||
extern void (*debug_fs_func) (int);
|
||||
#endif /* NO_FANCY_STUFF */
|
||||
#endif /* STAGE1_5 */
|
||||
|
||||
extern unsigned long current_drive;
|
||||
extern unsigned long current_partition;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
AUTOMAKE_OPTIONS = gnits
|
||||
|
||||
pkglibdir = $(exec_prefix)/lib/$(PACKAGE)
|
||||
pkglib_DATA = stage1
|
||||
CLEANFILES = stage1
|
||||
pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
|
||||
pkgdata_DATA = stage1
|
||||
CLEANFILES = $(pkgdata_DATA)
|
||||
|
||||
# We can't use builtins or standard includes.
|
||||
COMPILE = $(CC) -fno-builtin -nostdinc $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
|
||||
|
|
|
|||
|
|
@ -33,8 +33,7 @@ includedir = @includedir@
|
|||
oldincludedir = /usr/include
|
||||
|
||||
DISTDIR =
|
||||
|
||||
pkgdatadir = $(datadir)/@PACKAGE@
|
||||
pkglibdir = $(libdir)/@PACKAGE@
|
||||
pkgincludedir = $(includedir)/@PACKAGE@
|
||||
|
||||
top_builddir = ..
|
||||
|
|
@ -64,14 +63,14 @@ MAKEINFO = @MAKEINFO@
|
|||
OBJCOPY = @OBJCOPY@
|
||||
PACKAGE = @PACKAGE@
|
||||
VERSION = @VERSION@
|
||||
host_cpu = @host_cpu@
|
||||
host_vendor = @host_vendor@
|
||||
sbingrub = @sbingrub@
|
||||
stage2debug = @stage2debug@
|
||||
|
||||
AUTOMAKE_OPTIONS = gnits
|
||||
|
||||
pkglibdir = $(exec_prefix)/lib/$(PACKAGE)
|
||||
pkglib_DATA = stage1
|
||||
CLEANFILES = stage1
|
||||
pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
|
||||
pkgdata_DATA = stage1
|
||||
CLEANFILES = $(pkgdata_DATA)
|
||||
|
||||
# We can't use builtins or standard includes.
|
||||
COMPILE = $(CC) -fno-builtin -nostdinc $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
|
||||
|
|
@ -93,7 +92,7 @@ stage1_exec_DEPENDENCIES =
|
|||
stage1_exec_LDFLAGS =
|
||||
CFLAGS = @CFLAGS@
|
||||
LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
|
||||
DATA = $(pkglib_DATA)
|
||||
DATA = $(pkgdata_DATA)
|
||||
|
||||
DIST_COMMON = Makefile.am Makefile.in
|
||||
|
||||
|
|
@ -111,7 +110,7 @@ all: Makefile $(PROGRAMS) $(DATA)
|
|||
.SUFFIXES:
|
||||
.SUFFIXES: .S .c .o .s
|
||||
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
||||
cd $(top_srcdir) && $(AUTOMAKE) --gnits stage1/Makefile
|
||||
cd $(top_srcdir) && $(AUTOMAKE) --gnu stage1/Makefile
|
||||
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
|
||||
cd $(top_builddir) \
|
||||
|
|
@ -143,23 +142,23 @@ distclean-compile:
|
|||
|
||||
maintainer-clean-compile:
|
||||
|
||||
install-pkglibDATA: $(pkglib_DATA)
|
||||
install-pkgdataDATA: $(pkgdata_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
|
||||
@list='$(pkglib_DATA)'; for p in $$list; do \
|
||||
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
|
||||
@list='$(pkgdata_DATA)'; for p in $$list; do \
|
||||
if test -f $(srcdir)/$$p; then \
|
||||
echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$p"; \
|
||||
$(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$p; \
|
||||
echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p"; \
|
||||
$(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
|
||||
else if test -f $$p; then \
|
||||
echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
|
||||
$(INSTALL_DATA) $$p $(DESTDIR)$(pkglibdir)/$$p; \
|
||||
echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
|
||||
$(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \
|
||||
fi; fi; \
|
||||
done
|
||||
|
||||
uninstall-pkglibDATA:
|
||||
uninstall-pkgdataDATA:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
list='$(pkglib_DATA)'; for p in $$list; do \
|
||||
rm -f $(DESTDIR)$(pkglibdir)/$$p; \
|
||||
list='$(pkgdata_DATA)'; for p in $$list; do \
|
||||
rm -f $(DESTDIR)$(pkgdatadir)/$$p; \
|
||||
done
|
||||
|
||||
tags: TAGS
|
||||
|
|
@ -196,7 +195,7 @@ distdir: $(DISTFILES)
|
|||
top_distdir=`cd $(top_distdir) && pwd`; \
|
||||
distdir=`cd $(distdir) && pwd`; \
|
||||
cd $(top_srcdir) \
|
||||
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits stage1/Makefile
|
||||
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu stage1/Makefile
|
||||
@for file in $(DISTFILES); do \
|
||||
d=$(srcdir); \
|
||||
test -f $(distdir)/$$file \
|
||||
|
|
@ -232,21 +231,21 @@ dvi:
|
|||
check: all
|
||||
$(MAKE)
|
||||
installcheck:
|
||||
install-exec: install-pkglibDATA
|
||||
install-exec:
|
||||
@$(NORMAL_INSTALL)
|
||||
|
||||
install-data:
|
||||
install-data: install-pkgdataDATA
|
||||
@$(NORMAL_INSTALL)
|
||||
|
||||
install: install-exec install-data all
|
||||
@:
|
||||
|
||||
uninstall: uninstall-pkglibDATA
|
||||
uninstall: uninstall-pkgdataDATA
|
||||
|
||||
install-strip:
|
||||
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
|
||||
installdirs:
|
||||
$(mkinstalldirs) $(DATADIR)$(pkglibdir)
|
||||
$(mkinstalldirs) $(DATADIR)$(pkgdatadir)
|
||||
|
||||
|
||||
mostlyclean-generic:
|
||||
|
|
@ -283,7 +282,7 @@ maintainer-clean: maintainer-clean-noinstPROGRAMS \
|
|||
.PHONY: mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
|
||||
clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
|
||||
mostlyclean-compile distclean-compile clean-compile \
|
||||
maintainer-clean-compile uninstall-pkglibDATA install-pkglibDATA tags \
|
||||
maintainer-clean-compile uninstall-pkgdataDATA install-pkgdataDATA tags \
|
||||
mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
|
||||
distdir mostlyclean-depend distclean-depend clean-depend \
|
||||
maintainer-clean-depend info dvi installcheck install-exec install-data \
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
AUTOMAKE_OPTIONS = gnits
|
||||
|
||||
pkglibdir = $(exec_prefix)/lib/$(PACKAGE)
|
||||
pkglib_DATA = stage2
|
||||
CLEANFILES = stage2
|
||||
pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
|
||||
pkgdata_DATA = stage2
|
||||
CLEANFILES = $(pkgdata_DATA)
|
||||
MOSTLYCLEANFILES = stage2.exec
|
||||
|
||||
# We can't use builtins or standard includes.
|
||||
|
|
@ -14,6 +12,9 @@ stage2_exec_LDADD = asm.o boot.o common.o char_io.o cmdline.o disk_io.o \
|
|||
gunzip.o fsys_ffs.o fsys_ext2fs.o fsys_fat.o stage2.o
|
||||
|
||||
noinst_PROGRAMS = stage2.exec
|
||||
|
||||
# FIXME: Automake hackery.
|
||||
DEP_FILES = .deps/dummy.P $(wildcard .deps/*.P)
|
||||
stage2_exec_SOURCES = dummy.c # needed to drag in C Makefile variables
|
||||
DISTFILES = $(DIST_COMMON)
|
||||
|
||||
|
|
|
|||
|
|
@ -33,8 +33,7 @@ includedir = @includedir@
|
|||
oldincludedir = /usr/include
|
||||
|
||||
DISTDIR =
|
||||
|
||||
pkgdatadir = $(datadir)/@PACKAGE@
|
||||
pkglibdir = $(libdir)/@PACKAGE@
|
||||
pkgincludedir = $(includedir)/@PACKAGE@
|
||||
|
||||
top_builddir = ..
|
||||
|
|
@ -64,14 +63,14 @@ MAKEINFO = @MAKEINFO@
|
|||
OBJCOPY = @OBJCOPY@
|
||||
PACKAGE = @PACKAGE@
|
||||
VERSION = @VERSION@
|
||||
host_cpu = @host_cpu@
|
||||
host_vendor = @host_vendor@
|
||||
sbingrub = @sbingrub@
|
||||
stage2debug = @stage2debug@
|
||||
|
||||
AUTOMAKE_OPTIONS = gnits
|
||||
|
||||
pkglibdir = $(exec_prefix)/lib/$(PACKAGE)
|
||||
pkglib_DATA = stage2
|
||||
CLEANFILES = stage2
|
||||
pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
|
||||
pkgdata_DATA = stage2
|
||||
CLEANFILES = $(pkgdata_DATA)
|
||||
MOSTLYCLEANFILES = stage2.exec
|
||||
|
||||
# We can't use builtins or standard includes.
|
||||
|
|
@ -83,6 +82,9 @@ stage2_exec_LDADD = asm.o boot.o common.o char_io.o cmdline.o disk_io.o \
|
|||
gunzip.o fsys_ffs.o fsys_ext2fs.o fsys_fat.o stage2.o
|
||||
|
||||
noinst_PROGRAMS = stage2.exec
|
||||
|
||||
# FIXME: Automake hackery.
|
||||
DEP_FILES = .deps/dummy.P $(wildcard .deps/*.P)
|
||||
stage2_exec_SOURCES = dummy.c # needed to drag in C Makefile variables
|
||||
DISTFILES = $(DIST_COMMON)
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
|
|
@ -100,14 +102,13 @@ disk_io.o gunzip.o fsys_ffs.o fsys_ext2fs.o fsys_fat.o stage2.o
|
|||
stage2_exec_LDFLAGS =
|
||||
CFLAGS = @CFLAGS@
|
||||
LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
|
||||
DATA = $(pkglib_DATA)
|
||||
DATA = $(pkgdata_DATA)
|
||||
|
||||
DIST_COMMON = Makefile.am Makefile.in
|
||||
|
||||
|
||||
TAR = tar
|
||||
GZIP = --best
|
||||
DEP_FILES = .deps/dummy.P
|
||||
SOURCES = $(stage2_exec_SOURCES)
|
||||
OBJECTS = $(stage2_exec_OBJECTS)
|
||||
|
||||
|
|
@ -116,7 +117,7 @@ all: Makefile $(PROGRAMS) $(DATA)
|
|||
.SUFFIXES:
|
||||
.SUFFIXES: .S .c .o .s
|
||||
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
||||
cd $(top_srcdir) && $(AUTOMAKE) --gnits stage2/Makefile
|
||||
cd $(top_srcdir) && $(AUTOMAKE) --gnu stage2/Makefile
|
||||
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
|
||||
cd $(top_builddir) \
|
||||
|
|
@ -148,23 +149,23 @@ distclean-compile:
|
|||
|
||||
maintainer-clean-compile:
|
||||
|
||||
install-pkglibDATA: $(pkglib_DATA)
|
||||
install-pkgdataDATA: $(pkgdata_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
|
||||
@list='$(pkglib_DATA)'; for p in $$list; do \
|
||||
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
|
||||
@list='$(pkgdata_DATA)'; for p in $$list; do \
|
||||
if test -f $(srcdir)/$$p; then \
|
||||
echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$p"; \
|
||||
$(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$p; \
|
||||
echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p"; \
|
||||
$(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
|
||||
else if test -f $$p; then \
|
||||
echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
|
||||
$(INSTALL_DATA) $$p $(DESTDIR)$(pkglibdir)/$$p; \
|
||||
echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
|
||||
$(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \
|
||||
fi; fi; \
|
||||
done
|
||||
|
||||
uninstall-pkglibDATA:
|
||||
uninstall-pkgdataDATA:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
list='$(pkglib_DATA)'; for p in $$list; do \
|
||||
rm -f $(DESTDIR)$(pkglibdir)/$$p; \
|
||||
list='$(pkgdata_DATA)'; for p in $$list; do \
|
||||
rm -f $(DESTDIR)$(pkgdatadir)/$$p; \
|
||||
done
|
||||
|
||||
tags: TAGS
|
||||
|
|
@ -201,7 +202,7 @@ distdir: $(DISTFILES)
|
|||
top_distdir=`cd $(top_distdir) && pwd`; \
|
||||
distdir=`cd $(distdir) && pwd`; \
|
||||
cd $(top_srcdir) \
|
||||
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits stage2/Makefile
|
||||
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu stage2/Makefile
|
||||
@for file in $(DISTFILES); do \
|
||||
d=$(srcdir); \
|
||||
test -f $(distdir)/$$file \
|
||||
|
|
@ -237,21 +238,21 @@ dvi:
|
|||
check: all
|
||||
$(MAKE)
|
||||
installcheck:
|
||||
install-exec: install-pkglibDATA
|
||||
install-exec:
|
||||
@$(NORMAL_INSTALL)
|
||||
|
||||
install-data:
|
||||
install-data: install-pkgdataDATA
|
||||
@$(NORMAL_INSTALL)
|
||||
|
||||
install: install-exec install-data all
|
||||
@:
|
||||
|
||||
uninstall: uninstall-pkglibDATA
|
||||
uninstall: uninstall-pkgdataDATA
|
||||
|
||||
install-strip:
|
||||
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
|
||||
installdirs:
|
||||
$(mkinstalldirs) $(DATADIR)$(pkglibdir)
|
||||
$(mkinstalldirs) $(DATADIR)$(pkgdatadir)
|
||||
|
||||
|
||||
mostlyclean-generic:
|
||||
|
|
@ -288,7 +289,7 @@ maintainer-clean: maintainer-clean-noinstPROGRAMS \
|
|||
.PHONY: mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
|
||||
clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
|
||||
mostlyclean-compile distclean-compile clean-compile \
|
||||
maintainer-clean-compile uninstall-pkglibDATA install-pkglibDATA tags \
|
||||
maintainer-clean-compile uninstall-pkgdataDATA install-pkgdataDATA tags \
|
||||
mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
|
||||
distdir mostlyclean-depend distclean-depend clean-depend \
|
||||
maintainer-clean-depend info dvi installcheck install-exec install-data \
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
AUTOMAKE_OPTIONS = gnits
|
||||
|
||||
pkglibdir = $(exec_prefix)/lib/$(PACKAGE)
|
||||
pkglib_DATA = $(stage2debug)
|
||||
pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
|
||||
pkgdata_DATA = $(stage2debug)
|
||||
EXTRA_DATA = stage2_debug
|
||||
CLEANFILES = stage2_debug
|
||||
MOSTLYCLEANFILES = stage2_debug.exec
|
||||
|
|
@ -16,6 +14,9 @@ stage2_debug_exec_LDADD = asm.o boot.o common.o char_io.o cmdline.o disk_io.o \
|
|||
gunzip.o fsys_ffs.o fsys_ext2fs.o fsys_fat.o stage2.o
|
||||
|
||||
EXTRA_PROGRAMS = stage2_debug.exec
|
||||
|
||||
# FIXME: Automake hackery.
|
||||
DEP_FILES = .deps/dummy.P $(wildcard .deps/*.P)
|
||||
stage2_debug_exec_SOURCES = dummy.c # needed to drag in C Makefile variables
|
||||
DISTFILES = $(DIST_COMMON)
|
||||
|
||||
|
|
|
|||
|
|
@ -33,8 +33,7 @@ includedir = @includedir@
|
|||
oldincludedir = /usr/include
|
||||
|
||||
DISTDIR =
|
||||
|
||||
pkgdatadir = $(datadir)/@PACKAGE@
|
||||
pkglibdir = $(libdir)/@PACKAGE@
|
||||
pkgincludedir = $(includedir)/@PACKAGE@
|
||||
|
||||
top_builddir = ..
|
||||
|
|
@ -64,13 +63,13 @@ MAKEINFO = @MAKEINFO@
|
|||
OBJCOPY = @OBJCOPY@
|
||||
PACKAGE = @PACKAGE@
|
||||
VERSION = @VERSION@
|
||||
host_cpu = @host_cpu@
|
||||
host_vendor = @host_vendor@
|
||||
sbingrub = @sbingrub@
|
||||
stage2debug = @stage2debug@
|
||||
|
||||
AUTOMAKE_OPTIONS = gnits
|
||||
|
||||
pkglibdir = $(exec_prefix)/lib/$(PACKAGE)
|
||||
pkglib_DATA = $(stage2debug)
|
||||
pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
|
||||
pkgdata_DATA = $(stage2debug)
|
||||
EXTRA_DATA = stage2_debug
|
||||
CLEANFILES = stage2_debug
|
||||
MOSTLYCLEANFILES = stage2_debug.exec
|
||||
|
|
@ -85,6 +84,9 @@ stage2_debug_exec_LDADD = asm.o boot.o common.o char_io.o cmdline.o disk_io.o \
|
|||
gunzip.o fsys_ffs.o fsys_ext2fs.o fsys_fat.o stage2.o
|
||||
|
||||
EXTRA_PROGRAMS = stage2_debug.exec
|
||||
|
||||
# FIXME: Automake hackery.
|
||||
DEP_FILES = .deps/dummy.P $(wildcard .deps/*.P)
|
||||
stage2_debug_exec_SOURCES = dummy.c # needed to drag in C Makefile variables
|
||||
DISTFILES = $(DIST_COMMON)
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
|
|
@ -101,14 +103,13 @@ stage2.o
|
|||
stage2_debug_exec_LDFLAGS =
|
||||
CFLAGS = @CFLAGS@
|
||||
LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
|
||||
DATA = $(pkglib_DATA)
|
||||
DATA = $(pkgdata_DATA)
|
||||
|
||||
DIST_COMMON = Makefile.am Makefile.in
|
||||
|
||||
|
||||
TAR = tar
|
||||
GZIP = --best
|
||||
DEP_FILES = .deps/dummy.P
|
||||
SOURCES = $(stage2_debug_exec_SOURCES)
|
||||
OBJECTS = $(stage2_debug_exec_OBJECTS)
|
||||
|
||||
|
|
@ -117,7 +118,7 @@ all: Makefile $(DATA)
|
|||
.SUFFIXES:
|
||||
.SUFFIXES: .S .c .o .s
|
||||
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
||||
cd $(top_srcdir) && $(AUTOMAKE) --gnits stage2_debug/Makefile
|
||||
cd $(top_srcdir) && $(AUTOMAKE) --gnu stage2_debug/Makefile
|
||||
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
|
||||
cd $(top_builddir) \
|
||||
|
|
@ -140,23 +141,23 @@ distclean-compile:
|
|||
|
||||
maintainer-clean-compile:
|
||||
|
||||
install-pkglibDATA: $(pkglib_DATA)
|
||||
install-pkgdataDATA: $(pkgdata_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
|
||||
@list='$(pkglib_DATA)'; for p in $$list; do \
|
||||
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
|
||||
@list='$(pkgdata_DATA)'; for p in $$list; do \
|
||||
if test -f $(srcdir)/$$p; then \
|
||||
echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$p"; \
|
||||
$(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$p; \
|
||||
echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p"; \
|
||||
$(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
|
||||
else if test -f $$p; then \
|
||||
echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
|
||||
$(INSTALL_DATA) $$p $(DESTDIR)$(pkglibdir)/$$p; \
|
||||
echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
|
||||
$(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \
|
||||
fi; fi; \
|
||||
done
|
||||
|
||||
uninstall-pkglibDATA:
|
||||
uninstall-pkgdataDATA:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
list='$(pkglib_DATA)'; for p in $$list; do \
|
||||
rm -f $(DESTDIR)$(pkglibdir)/$$p; \
|
||||
list='$(pkgdata_DATA)'; for p in $$list; do \
|
||||
rm -f $(DESTDIR)$(pkgdatadir)/$$p; \
|
||||
done
|
||||
|
||||
tags: TAGS
|
||||
|
|
@ -193,7 +194,7 @@ distdir: $(DISTFILES)
|
|||
top_distdir=`cd $(top_distdir) && pwd`; \
|
||||
distdir=`cd $(distdir) && pwd`; \
|
||||
cd $(top_srcdir) \
|
||||
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits stage2_debug/Makefile
|
||||
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu stage2_debug/Makefile
|
||||
@for file in $(DISTFILES); do \
|
||||
d=$(srcdir); \
|
||||
test -f $(distdir)/$$file \
|
||||
|
|
@ -229,21 +230,21 @@ dvi:
|
|||
check: all
|
||||
$(MAKE)
|
||||
installcheck:
|
||||
install-exec: install-pkglibDATA
|
||||
install-exec:
|
||||
@$(NORMAL_INSTALL)
|
||||
|
||||
install-data:
|
||||
install-data: install-pkgdataDATA
|
||||
@$(NORMAL_INSTALL)
|
||||
|
||||
install: install-exec install-data all
|
||||
@:
|
||||
|
||||
uninstall: uninstall-pkglibDATA
|
||||
uninstall: uninstall-pkgdataDATA
|
||||
|
||||
install-strip:
|
||||
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
|
||||
installdirs:
|
||||
$(mkinstalldirs) $(DATADIR)$(pkglibdir)
|
||||
$(mkinstalldirs) $(DATADIR)$(pkgdatadir)
|
||||
|
||||
|
||||
mostlyclean-generic:
|
||||
|
|
@ -276,7 +277,7 @@ maintainer-clean: maintainer-clean-compile maintainer-clean-tags \
|
|||
@echo "it deletes files that may require special tools to rebuild."
|
||||
|
||||
.PHONY: mostlyclean-compile distclean-compile clean-compile \
|
||||
maintainer-clean-compile uninstall-pkglibDATA install-pkglibDATA tags \
|
||||
maintainer-clean-compile uninstall-pkgdataDATA install-pkgdataDATA tags \
|
||||
mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
|
||||
distdir mostlyclean-depend distclean-depend clean-depend \
|
||||
maintainer-clean-depend info dvi installcheck install-exec install-data \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue