vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

leave the vga option for Linux, remove unnecessary compile scripts and add a really necessary compile script into the top dir.

Browse source
This commit is contained in:
okuji 2000-06-17 03:44:43 +00:00
parent 1a651ece2c
commit 3899310dca
8 changed files with 17 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2000-06-17 OKUJI Yoshinori <okuji@gnu.org>
* stage2/compile: Removed.
* netboot/compile: Likewise.
* compile: New file. Copied from Automake.
2000-06-16 OKUJI Yoshinori <okuji@gnu.org>
* stage2/boot.c (load_image): Don't remove the vga option after
parsing it. Suggested by Tim Riker.
2000-06-15 OKUJI Yoshinori <okuji@gnu.org>
* stage2/asm.S (grub_halt): Use jmp instead of jc, if INT 15

4
Makefile.in
View file

@ -99,8 +99,8 @@ CONFIG_CLEAN_FILES =
DIST_SOURCES =
DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
Makefile.am Makefile.in NEWS THANKS TODO acconfig.h acinclude.m4 \
aclocal.m4 config.guess config.h.in config.sub configure configure.in \
depcomp install-sh missing mkinstalldirs
aclocal.m4 compile config.guess config.h.in config.sub configure \
configure.in depcomp install-sh missing mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

0
netboot/compile → compile
View file

4
configure vendored
View file

@ -622,7 +622,7 @@ fi
ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
for ac_dir in aux $srcdir/aux; do
if test -f $ac_dir/install-sh; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install-sh -c"
@ -634,7 +634,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
fi
done
if test -z "$ac_aux_dir"; then
{ echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
{ echo "configure: error: can not find install-sh or install.sh in aux $srcdir/aux" 1>&2; exit 1; }
fi
ac_config_guess=$ac_aux_dir/config.guess
ac_config_sub=$ac_aux_dir/config.sub

2
netboot/Makefile.in
View file

@ -198,7 +198,7 @@ $(DEPDIR)/libdrivers_a-pci.Po $(DEPDIR)/libdrivers_a-rtl8139.Po \
$(DEPDIR)/libdrivers_a-sk_g16.Po $(DEPDIR)/libdrivers_a-smc9000.Po \
$(DEPDIR)/libdrivers_a-tiara.Po $(DEPDIR)/libdrivers_a-tulip.Po \
$(DEPDIR)/libdrivers_a-via-rhine.Po
DIST_COMMON = Makefile.am Makefile.in compile
DIST_COMMON = Makefile.am Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

2
stage2/Makefile.in
View file

@ -404,7 +404,7 @@ $(DEPDIR)/reiserfs_stage1_5_exec-disk_io.Po \
$(DEPDIR)/reiserfs_stage1_5_exec-fsys_reiserfs.Po \
$(DEPDIR)/reiserfs_stage1_5_exec-stage1_5.Po \
$(DEPDIR)/reiserfs_stage1_5_exec-start.Po $(DEPDIR)/start_exec-start.Po
DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in compile
DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

5
stage2/boot.c
View file

@ -234,7 +234,6 @@ load_image (char *kernel, char *arg, kernel_t suggested_type)
if (vga)
{
char *value = vga + 4;
char *vga_end;
int vid_mode;
/* Handle special strings. */
@ -259,10 +258,6 @@ load_image (char *kernel, char *arg, kernel_t suggested_type)
grub_memmove (buffer + LINUX_VID_MODE_OFFSET,
(char *) &vid_mode,
sizeof (unsigned short));
/* Remove the "vga=...". */
vga_end = skip_to (0, vga);
grub_memmove (vga, vga_end, grub_strlen (vga_end) + 1);
}
}

82
stage2/compile
View file

@ -1,82 +0,0 @@
#! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.
# Copyright (C) 1999, 2000 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Usage:
# compile PROGRAM [ARGS]...
# `-o FOO.o' is removed from the args passed to the actual compile.
prog=$1
shift
ofile=
cfile=
args=
while test $# -gt 0; do
case "$1" in
-o)
ofile=$2
shift
;;
*.c)
cfile=$1
args="$args $1"
;;
*)
args="$args $1"
;;
esac
shift
done
test -z "$ofile" && {
echo "compile: no \`-o' option seen" 1>&2
exit 1
}
test -z "$cfile" && {
echo "compile: no \`.c' file seen" 1>&2
exit 1
}
# Name of file we expect compiler to create.
cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
# Create the lock directory.
lockdir=`echo $ofile | sed -e 's|/|_|g'`
while true; do
if mkdir $lockdir > /dev/null 2>&1; then
break
fi
sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
trap "rmdir $lockdir; exit 1" 1 2 15
# Run the compile.
"$prog" $args
status=$?
if test -f "$cofile"; then
mv "$cofile" "$ofile"
fi
rmdir $lockdir
exit $status