rpms/grub/devel grub.spec,1.55,1.56 grub-fedora-8.patch,1.1,1.2
Peter Jones (pjones)
fedora-extras-commits at redhat.com
Mon Aug 20 22:20:52 UTC 2007
Author: pjones
Update of /cvs/extras/rpms/grub/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31033
Modified Files:
grub.spec grub-fedora-8.patch
Log Message:
- don't use "objcopy -R ...", use "-Wl,--build-id=none" instead.
Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- grub.spec 7 Aug 2007 15:17:45 -0000 1.55
+++ grub.spec 20 Aug 2007 22:20:19 -0000 1.56
@@ -1,6 +1,6 @@
Name: grub
Version: 0.97
-Release: 16
+Release: 17
Summary: GRUB - the Grand Unified Boot Loader.
Group: System Environment/Base
License: GPL
@@ -79,6 +79,10 @@
%{_datadir}/grub
%changelog
+* Mon Aug 20 2007 Peter Jones <pjones at redhat.com> - 0.97-17
+- Use --build-id=none instead of stripping out the build-id notes in the
+ first and second stage loaders.
+
* Tue Aug 7 2007 Peter Jones <pjones at redhat.com> - 0.97-16
- Add ext[23] large inode support (patch from Eric Sandeen)
- Fix auto* breakage that happened when we switched from autoreconf to autoconf
grub-fedora-8.patch:
Index: grub-fedora-8.patch
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub-fedora-8.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grub-fedora-8.patch 7 Aug 2007 15:19:24 -0000 1.1
+++ grub-fedora-8.patch 20 Aug 2007 22:20:19 -0000 1.2
@@ -1,54 +1,5 @@
- Makefile.in | 174 +-
- acinclude.m4 | 4 +-
- aclocal.m4 | 555 ++---
- configure | 7639 ------------------------------------------------
- configure.ac | 670 -----
- configure.in | 677 +++++
- docs/Makefile.in | 259 ++-
- docs/grub-install.8 | 2 +
- docs/grub.8 | 2 +-
- docs/grub.info | 370 ++--
- docs/grub.texi | 24 +-
- docs/stamp-vti | 4 +-
- docs/version.texi | 4 +-
- grub.spec | 413 +++
- grub/Makefile.in | 116 +-
- grub/asmstub.c | 133 +-
- lib/Makefile.in | 110 +-
- lib/device.c | 352 ++-
- netboot/Makefile.in | 358 ++--
- stage1/Makefile.am | 8 +-
- stage1/Makefile.in | 168 +-
- stage2/Makefile.am | 25 +-
- stage2/Makefile.in | 1718 +++++++-----
- stage2/asm.S | 203 ++-
- stage2/boot.c | 4 +
- stage2/builtins.c | 1058 +++++---
- stage2/char_io.c | 89 +-
- stage2/cmdline.c | 13 +-
- stage2/disk_io.c | 105 +-
- stage2/fsys_ext2fs.c | 58 +-
- stage2/fsys_fat.c | 6 +-
- stage2/fsys_iso9660.c | 4 +-
- stage2/fsys_reiserfs.c | 4 +-
- stage2/fsys_vstafs.c | 24 +-
- stage2/fsys_xfs.c | 10 +-
- stage2/gpt.h | 68 +
- stage2/graphics.c | 573 ++++
- stage2/graphics.h | 42 +
- stage2/iso9660.h | 4 +-
- stage2/pc_slice.h | 1 +
- stage2/shared.h | 21 +-
- stage2/smp-imps.h | 1 -
- stage2/stage2.c | 157 +-
- stage2/term.h | 26 +
- util/Makefile.am | 3 +-
- util/Makefile.in | 130 +-
- util/grub-install.in | 319 ++-
- 47 files changed, 5895 insertions(+), 10813 deletions(-)
-
diff --git a/Makefile.in b/Makefile.in
-index 6652366..29ef905 100644
+index 6652366..6cff007 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
@@ -159,8 +110,11 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -114,12 +108,9 @@ LIBOBJS = @LIBOBJS@
+@@ -112,14 +106,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
++LOADER_LDFLAGS = @LOADER_LDFLAGS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
@@ -173,7 +127,7 @@
NET_CFLAGS = @NET_CFLAGS@
NET_EXTRAFLAGS = @NET_EXTRAFLAGS@
OBJCOPY = @OBJCOPY@
-@@ -133,22 +124,17 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+@@ -133,22 +125,17 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
RANLIB = @RANLIB@
@@ -200,7 +154,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -160,28 +146,39 @@ build_alias = @build_alias@
+@@ -160,28 +147,39 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -240,7 +194,7 @@
# Do not change this order if you don't know what you are doing.
AUTOMAKE_OPTIONS = 1.7 gnu
-@@ -228,7 +225,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+@@ -228,7 +226,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
@@ -249,7 +203,7 @@
else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-@@ -241,7 +238,6 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+@@ -241,7 +239,6 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
distclean-hdr:
-rm -f config.h stamp-h1
@@ -257,7 +211,7 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
-@@ -250,7 +246,13 @@ uninstall-info-am:
+@@ -250,7 +247,13 @@ uninstall-info-am:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -272,7 +226,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -262,15 +264,20 @@ $(RECURSIVE_TARGETS):
+@@ -262,15 +265,20 @@ $(RECURSIVE_TARGETS):
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -297,7 +251,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -291,7 +298,7 @@ maintainer-clean-recursive:
+@@ -291,7 +299,7 @@ maintainer-clean-recursive:
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -306,7 +260,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -365,24 +372,22 @@ distclean-tags:
+@@ -365,24 +373,22 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
@@ -345,7 +299,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -396,7 +401,7 @@ distdir: $(DISTFILES)
+@@ -396,7 +402,7 @@ distdir: $(DISTFILES)
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
@@ -354,7 +308,7 @@
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -404,6 +409,8 @@ distdir: $(DISTFILES)
+@@ -404,6 +410,8 @@ distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
@@ -363,7 +317,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -411,7 +418,7 @@ distdir: $(DISTFILES)
+@@ -411,7 +419,7 @@ distdir: $(DISTFILES)
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@@ -372,7 +326,7 @@
|| chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-@@ -486,7 +493,7 @@ distcheck: dist
+@@ -486,7 +494,7 @@ distcheck: dist
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
@@ -381,7 +335,7 @@
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-@@ -555,12 +562,20 @@ info-am:
+@@ -555,12 +563,20 @@ info-am:
install-data-am:
@@ -402,7 +356,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -581,24 +596,25 @@ ps: ps-recursive
+@@ -581,24 +597,25 @@ ps: ps-recursive
ps-am:
@@ -447,7 +401,7 @@
# 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.
diff --git a/acinclude.m4 b/acinclude.m4
-index 368839c..86c3dcc 100644
+index 368839c..1cf1d67 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -44,6 +44,8 @@ AC_DEFUN([grub_PROG_OBJCOPY_ABSOLUTE],
@@ -459,15 +413,15 @@
void
cmain (void)
{
-@@ -61,7 +63,7 @@ for link_addr in 2000 8000 7C00; do
+@@ -57,7 +59,7 @@ else
+ fi
+ grub_cv_prog_objcopy_absolute=yes
+ for link_addr in 2000 8000 7C00; do
+- if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -nostdlib -Wl,-N -Wl,-Ttext -Wl,$link_addr conftest.o -o conftest.exec]); then :
++ if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -nostdlib -Wl,-N -Wl,-Ttext -Wl,$link_addr -Wl,--build-id=none conftest.o -o conftest.exec]); then :
else
AC_MSG_ERROR([${CC-cc} cannot link at address $link_addr])
fi
-- if AC_TRY_COMMAND([${OBJCOPY-objcopy} -O binary conftest.exec conftest]); then :
-+ if AC_TRY_COMMAND([${OBJCOPY-objcopy} -O binary -R .note.gnu.build-id conftest.exec conftest]); then :
- else
- AC_MSG_ERROR([${OBJCOPY-objcopy} cannot create binary files])
- fi
diff --git a/aclocal.m4 b/aclocal.m4
index aa691f6..9965d5d 100644
--- a/aclocal.m4
@@ -1246,6 +1200,16 @@
# _AM_PROG_TAR(FORMAT)
# --------------------
+diff --git a/config.h.in b/config.h.in
+index 68d7c8c..46f6b70 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -1,4 +1,4 @@
+-/* config.h.in. Generated from configure.ac by autoheader. */
++/* config.h.in. Generated from configure.in by autoheader. */
+
+ /* Define if an absolute indirect call/jump must NOT be prefixed with `*' */
+ #undef ABSOLUTE_WITHOUT_ASTERISK
diff --git a/configure b/configure
deleted file mode 100755
index 537ab89..0000000
@@ -9569,10 +9533,10 @@
-AC_OUTPUT
diff --git a/configure.in b/configure.in
new file mode 100644
-index 0000000..efb8c0d
+index 0000000..0103c17
--- /dev/null
+++ b/configure.in
-@@ -0,0 +1,677 @@
+@@ -0,0 +1,680 @@
+dnl Configure script for GRUB.
+dnl Copyright 1999,2000,2001,2002,2003,2004,2005 Free Software Foundation, Inc.
+
@@ -9692,6 +9656,9 @@
+ fi
+fi
+
++LOADER_LDFLAGS="-Wl,--build-id=none"
++AC_SUBST(LOADER_LDFLAGS)
++
+AC_SUBST(STAGE1_CFLAGS)
+AC_SUBST(STAGE2_CFLAGS)
+AC_SUBST(GRUB_CFLAGS)
@@ -10251,7 +10218,7 @@
+ util/grub-terminfo])
+AC_OUTPUT
diff --git a/docs/Makefile.in b/docs/Makefile.in
-index 3e2de4b..a86857d 100644
+index 3e2de4b..f350fcd 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -1,8 +1,8 @@
@@ -10362,8 +10329,11 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -133,12 +131,9 @@ LIBOBJS = @LIBOBJS@
+@@ -131,14 +129,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
++LOADER_LDFLAGS = @LOADER_LDFLAGS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
@@ -10376,7 +10346,7 @@
NET_CFLAGS = @NET_CFLAGS@
NET_EXTRAFLAGS = @NET_EXTRAFLAGS@
OBJCOPY = @OBJCOPY@
-@@ -152,22 +147,17 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+@@ -152,22 +148,17 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
RANLIB = @RANLIB@
@@ -10403,7 +10373,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -179,28 +169,39 @@ build_alias = @build_alias@
+@@ -179,28 +170,39 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -10443,7 +10413,7 @@
info_TEXINFOS = grub.texi multiboot.texi
grub_TEXINFOS = internals.texi
EXAMPLES = boot.S kernel.c multiboot.h
-@@ -256,7 +257,7 @@ clean-noinstPROGRAMS:
+@@ -256,7 +258,7 @@ clean-noinstPROGRAMS:
-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
kernel$(EXEEXT): $(kernel_OBJECTS) $(kernel_DEPENDENCIES)
@rm -f kernel$(EXEEXT)
@@ -10452,7 +10422,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -264,38 +265,47 @@ mostlyclean-compile:
+@@ -264,38 +266,47 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@@ -10510,7 +10480,7 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kernel.c' object='kernel-kernel.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kernel_CFLAGS) $(CFLAGS) -c -o kernel-kernel.obj `if test -f 'kernel.c'; then $(CYGPATH_W) 'kernel.c'; else $(CYGPATH_W) '$(srcdir)/kernel.c'; fi`
-@@ -304,9 +314,11 @@ kernel-kernel.obj: kernel.c
+@@ -304,9 +315,11 @@ kernel-kernel.obj: kernel.c
restore=: && backupdir="$(am__leading_dot)am$$$$" && \
am__cwd=`pwd` && cd $(srcdir) && \
rm -rf $$backupdir && mkdir $$backupdir && \
@@ -10525,7 +10495,7 @@
cd "$$am__cwd"; \
if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-o $@ $<; \
-@@ -371,11 +383,29 @@ multiboot.dvi: multiboot.texi $(multiboot_TEXINFOS)
+@@ -371,11 +384,29 @@ multiboot.dvi: multiboot.texi $(multiboot_TEXINFOS)
multiboot.pdf: multiboot.texi $(multiboot_TEXINFOS)
multiboot.html: multiboot.texi $(multiboot_TEXINFOS)
.dvi.ps:
@@ -10557,7 +10527,7 @@
install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
list='$(INFO_DEPS)'; \
for file in $$list; do \
-@@ -389,12 +419,28 @@ uninstall-info-am:
+@@ -389,12 +420,28 @@ uninstall-info-am:
for file in $$list; do \
relfile=`echo "$$file" | sed 's|^.*/||'`; \
relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
@@ -10588,7 +10558,7 @@
dist-info: $(INFO_DEPS)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
list='$(INFO_DEPS)'; \
-@@ -403,10 +449,13 @@ dist-info: $(INFO_DEPS)
+@@ -403,10 +450,13 @@ dist-info: $(INFO_DEPS)
$(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
esac; \
if test -f $$base; then d=.; else d=$(srcdir); fi; \
@@ -10606,7 +10576,7 @@
done; \
done
-@@ -426,7 +475,7 @@ maintainer-clean-aminfo:
+@@ -426,7 +476,7 @@ maintainer-clean-aminfo:
done
install-man1: $(man1_MANS) $(man_MANS)
@$(NORMAL_INSTALL)
@@ -10615,7 +10585,7 @@
@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
for i in $$l2; do \
-@@ -471,7 +520,7 @@ uninstall-man1:
+@@ -471,7 +521,7 @@ uninstall-man1:
done
install-man8: $(man8_MANS) $(man_MANS)
@$(NORMAL_INSTALL)
@@ -10624,7 +10594,7 @@
@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
for i in $$l2; do \
-@@ -564,22 +613,21 @@ distclean-tags:
+@@ -564,22 +614,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -10660,7 +10630,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -598,7 +646,7 @@ check: check-am
+@@ -598,7 +647,7 @@ check: check-am
all-am: Makefile $(INFO_DEPS) $(PROGRAMS) $(SCRIPTS) $(MANS)
installdirs:
for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"; do \
@@ -10669,7 +10639,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -649,13 +697,42 @@ info-am: $(INFO_DEPS)
+@@ -649,13 +698,42 @@ info-am: $(INFO_DEPS)
install-data-am: install-info-am install-man
@@ -10713,7 +10683,7 @@
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
list='$(INFO_DEPS)'; \
for file in $$list; do \
-@@ -685,6 +762,28 @@ install-info-am: $(INFO_DEPS)
+@@ -685,6 +763,28 @@ install-info-am: $(INFO_DEPS)
else : ; fi
install-man: install-man1 install-man8
@@ -10742,7 +10712,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -706,23 +805,29 @@ ps: ps-am
+@@ -706,23 +806,29 @@ ps: ps-am
ps-am: $(PSS)
@@ -10804,13 +10774,13 @@
\fB\-\-device\-map\fR=\fIFILE\fR
use the device map file FILE
diff --git a/docs/grub.info b/docs/grub.info
-index f48783c..2daa633 100644
+index f48783c..7692f31 100644
--- a/docs/grub.info
+++ b/docs/grub.info
@@ -1,5 +1,4 @@
-This is ../../docs/grub.info, produced by makeinfo version 4.8 from
-../../docs/grub.texi.
-+This is grub.info, produced by makeinfo version 4.8 from grub.texi.
++This is grub.info, produced by makeinfo version 4.9 from grub.texi.
INFO-DIR-SECTION Kernel
START-INFO-DIR-ENTRY
@@ -11336,24 +11306,24 @@
diff --git a/docs/stamp-vti b/docs/stamp-vti
-index b97de24..306279e 100644
+index b97de24..eb5144d 100644
--- a/docs/stamp-vti
+++ b/docs/stamp-vti
@@ -1,4 +1,4 @@
- at set UPDATED 8 May 2005
- at set UPDATED-MONTH May 2005
-+ at set UPDATED 6 August 2007
++ at set UPDATED 7 August 2007
+ at set UPDATED-MONTH August 2007
@set EDITION 0.97
@set VERSION 0.97
diff --git a/docs/version.texi b/docs/version.texi
-index b97de24..306279e 100644
+index b97de24..eb5144d 100644
--- a/docs/version.texi
+++ b/docs/version.texi
@@ -1,4 +1,4 @@
- at set UPDATED 8 May 2005
- at set UPDATED-MONTH May 2005
-+ at set UPDATED 6 August 2007
++ at set UPDATED 7 August 2007
+ at set UPDATED-MONTH August 2007
@set EDITION 0.97
@set VERSION 0.97
@@ -11777,7 +11747,7 @@
+* Wed May 23 2001 Erik Troan <ewt at redhat.com>
+- initial build for Red Hat
diff --git a/grub/Makefile.in b/grub/Makefile.in
-index 136c38f..30579a0 100644
+index 136c38f..0e40e1b 100644
--- a/grub/Makefile.in
+++ b/grub/Makefile.in
@@ -1,8 +1,8 @@
@@ -11867,8 +11837,11 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -110,12 +99,9 @@ LIBOBJS = @LIBOBJS@
+@@ -108,14 +97,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
++LOADER_LDFLAGS = @LOADER_LDFLAGS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
@@ -11881,7 +11854,7 @@
NET_CFLAGS = @NET_CFLAGS@
NET_EXTRAFLAGS = @NET_EXTRAFLAGS@
OBJCOPY = @OBJCOPY@
-@@ -129,22 +115,17 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+@@ -129,22 +116,17 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
RANLIB = @RANLIB@
@@ -11908,7 +11881,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -156,28 +137,39 @@ build_alias = @build_alias@
+@@ -156,28 +138,39 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -11948,7 +11921,7 @@
@SERIAL_SPEED_SIMULATION_FALSE at SERIAL_FLAGS = -DSUPPORT_SERIAL=1
@SERIAL_SPEED_SIMULATION_TRUE at SERIAL_FLAGS = -DSUPPORT_SERIAL=1 -DSIMULATE_SLOWNESS_OF_SERIAL=1
AM_CPPFLAGS = -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
-@@ -225,7 +217,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+@@ -225,7 +218,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-sbinPROGRAMS: $(sbin_PROGRAMS)
@$(NORMAL_INSTALL)
@@ -11957,7 +11930,7 @@
@list='$(sbin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
-@@ -248,7 +240,7 @@ clean-sbinPROGRAMS:
+@@ -248,7 +241,7 @@ clean-sbinPROGRAMS:
-test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
grub$(EXEEXT): $(grub_OBJECTS) $(grub_DEPENDENCIES)
@rm -f grub$(EXEEXT)
@@ -11966,7 +11939,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -260,19 +252,18 @@ distclean-compile:
+@@ -260,19 +253,18 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
.c.o:
@@ -11990,7 +11963,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-@@ -323,22 +314,21 @@ distclean-tags:
+@@ -323,22 +315,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -12026,7 +11999,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -354,7 +344,7 @@ check: check-am
+@@ -354,7 +345,7 @@ check: check-am
all-am: Makefile $(PROGRAMS)
installdirs:
for dir in "$(DESTDIR)$(sbindir)"; do \
@@ -12035,7 +12008,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -402,12 +392,20 @@ info-am:
+@@ -402,12 +393,20 @@ info-am:
install-data-am:
@@ -12056,7 +12029,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -427,18 +425,22 @@ ps: ps-am
+@@ -427,18 +426,22 @@ ps: ps-am
ps-am:
@@ -12340,7 +12313,7 @@
if (ret <= 0)
{
diff --git a/lib/Makefile.in b/lib/Makefile.in
-index 3dae206..ab8dc6b 100644
+index 3dae206..e46d1c4 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,8 +1,8 @@
@@ -12430,8 +12403,11 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -109,12 +98,9 @@ LIBOBJS = @LIBOBJS@
+@@ -107,14 +96,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
++LOADER_LDFLAGS = @LOADER_LDFLAGS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
@@ -12444,7 +12420,7 @@
NET_CFLAGS = @NET_CFLAGS@
NET_EXTRAFLAGS = @NET_EXTRAFLAGS@
OBJCOPY = @OBJCOPY@
-@@ -128,22 +114,17 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+@@ -128,22 +115,17 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
RANLIB = @RANLIB@
@@ -12471,7 +12447,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -155,28 +136,39 @@ build_alias = @build_alias@
+@@ -155,28 +137,39 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -12511,7 +12487,7 @@
noinst_LIBRARIES = libcommon.a
AM_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/stage2 \
-I$(top_srcdir)/stage1
-@@ -234,19 +226,18 @@ distclean-compile:
+@@ -234,19 +227,18 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getopt1.Po at am__quote@
.c.o:
@@ -12535,7 +12511,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-@@ -297,22 +288,21 @@ distclean-tags:
+@@ -297,22 +289,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -12571,7 +12547,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -373,12 +363,20 @@ info-am:
+@@ -373,12 +364,20 @@ info-am:
install-data-am:
@@ -12592,7 +12568,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -398,18 +396,22 @@ ps: ps-am
+@@ -398,18 +397,22 @@ ps: ps-am
ps-am:
@@ -13099,7 +13075,7 @@
if (write (fd, buf, size * SECTOR_SIZE) != (size * SECTOR_SIZE))
{
diff --git a/netboot/Makefile.in b/netboot/Makefile.in
-index 75ac299..33068f0 100644
+index 75ac299..3a6a501 100644
--- a/netboot/Makefile.in
+++ b/netboot/Makefile.in
@@ -1,8 +1,8 @@
@@ -13189,8 +13165,11 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -110,12 +99,9 @@ LIBOBJS = @LIBOBJS@
+@@ -108,14 +97,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
++LOADER_LDFLAGS = @LOADER_LDFLAGS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
@@ -13203,7 +13182,7 @@
NET_CFLAGS = @NET_CFLAGS@
NET_EXTRAFLAGS = @NET_EXTRAFLAGS@
OBJCOPY = @OBJCOPY@
-@@ -129,22 +115,17 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+@@ -129,22 +116,17 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
RANLIB = @RANLIB@
@@ -13230,7 +13209,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -156,28 +137,39 @@ build_alias = @build_alias@
+@@ -156,28 +138,39 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -13270,7 +13249,7 @@
# For <shared.h> and <stage1.h>.
INCLUDES = -I$(top_srcdir)/stage2 -I$(top_srcdir)/stage1
-@@ -349,453 +341,452 @@ distclean-compile:
+@@ -349,453 +342,452 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdrivers_a-w89c840.Po at am__quote@
.c.o:
@@ -13852,7 +13831,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-@@ -846,22 +837,21 @@ distclean-tags:
+@@ -846,22 +838,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -13888,7 +13867,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -922,12 +912,20 @@ info-am:
+@@ -922,12 +913,20 @@ info-am:
install-data-am:
@@ -13909,7 +13888,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -947,18 +945,22 @@ ps: ps-am
+@@ -947,18 +946,22 @@ ps: ps-am
ps-am:
@@ -13937,10 +13916,10 @@
# Is it really necessary to specify dependecies explicitly?
diff --git a/stage1/Makefile.am b/stage1/Makefile.am
-index 0afc285..2af85c7 100644
+index 0afc285..2754654 100644
--- a/stage1/Makefile.am
+++ b/stage1/Makefile.am
-@@ -1,7 +1,7 @@
+@@ -1,11 +1,11 @@
-pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
-nodist_pkglib_DATA = stage1
+pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
@@ -13951,14 +13930,13 @@
# We can't use builtins or standard includes.
AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
-@@ -12,4 +12,4 @@ stage1_exec_SOURCES = stage1.S stage1.h
+-LDFLAGS = -nostdlib -Wl,-N,-Ttext,7C00
++LDFLAGS = $(LOADER_LDFLAGS) -nostdlib -Wl,-N,-Ttext,7C00
- SUFFIXES = .exec
- .exec:
-- $(OBJCOPY) -O binary $< $@
-+ $(OBJCOPY) -O binary -R .note.gnu.build-id $< $@
+ noinst_PROGRAMS = stage1.exec
+ stage1_exec_SOURCES = stage1.S stage1.h
diff --git a/stage1/Makefile.in b/stage1/Makefile.in
-index 7134bdf..3e665fa 100644
+index 7134bdf..c7e251b 100644
--- a/stage1/Makefile.in
+++ b/stage1/Makefile.in
@@ -1,8 +1,8 @@
@@ -14044,7 +14022,7 @@
CCASFLAGS = @CCASFLAGS@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-@@ -94,18 +88,16 @@ CPPFLAGS = @CPPFLAGS@
+@@ -94,33 +88,29 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -14065,8 +14043,12 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -115,12 +107,9 @@ LIBOBJS = @LIBOBJS@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+-LDFLAGS = -nostdlib -Wl,-N,-Ttext,7C00
++LDFLAGS = $(LOADER_LDFLAGS) -nostdlib -Wl,-N,-Ttext,7C00
+ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
++LOADER_LDFLAGS = @LOADER_LDFLAGS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
@@ -14079,7 +14061,7 @@
NET_CFLAGS = @NET_CFLAGS@
NET_EXTRAFLAGS = @NET_EXTRAFLAGS@
OBJCOPY = @OBJCOPY@
-@@ -134,22 +123,17 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+@@ -134,22 +124,17 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
RANLIB = @RANLIB@
@@ -14106,7 +14088,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -161,30 +145,41 @@ build_alias = @build_alias@
+@@ -161,30 +146,41 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -14150,7 +14132,7 @@
# We can't use builtins or standard includes.
AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
-@@ -228,7 +223,7 @@ clean-noinstPROGRAMS:
+@@ -228,7 +224,7 @@ clean-noinstPROGRAMS:
-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
stage1.exec$(EXEEXT): $(stage1_exec_OBJECTS) $(stage1_exec_DEPENDENCIES)
@rm -f stage1.exec$(EXEEXT)
@@ -14159,7 +14141,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -236,28 +231,37 @@ mostlyclean-compile:
+@@ -236,28 +232,37 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@@ -14209,7 +14191,7 @@
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -309,22 +313,21 @@ distclean-tags:
+@@ -309,22 +314,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -14245,7 +14227,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -339,8 +342,8 @@ check-am: all-am
+@@ -339,8 +343,8 @@ check-am: all-am
check: check-am
all-am: Makefile $(PROGRAMS) $(DATA)
installdirs:
@@ -14256,7 +14238,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -372,6 +375,7 @@ clean: clean-am
+@@ -372,6 +376,7 @@ clean: clean-am
clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am
distclean: distclean-am
@@ -14264,7 +14246,7 @@
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
-@@ -386,17 +390,26 @@ info: info-am
+@@ -386,17 +391,26 @@ info: info-am
info-am:
@@ -14293,7 +14275,7 @@
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
-@@ -412,22 +425,25 @@ ps: ps-am
+@@ -412,19 +426,22 @@ ps: ps-am
ps-am:
@@ -14320,13 +14302,9 @@
+ tags uninstall uninstall-am uninstall-nodist_pkgdataDATA
.exec:
-- $(OBJCOPY) -O binary $< $@
-+ $(OBJCOPY) -O binary -R .note.gnu.build-id $< $@
- # 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:
+ $(OBJCOPY) -O binary $< $@
diff --git a/stage2/Makefile.am b/stage2/Makefile.am
-index f8e6d42..5f3498a 100644
+index f8e6d42..4c6fe54 100644
--- a/stage2/Makefile.am
+++ b/stage2/Makefile.am
@@ -7,7 +7,7 @@ noinst_HEADERS = apic.h defs.h dir.h disk_inode.h disk_inode_ffs.h \
@@ -14371,7 +14349,24 @@
ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5
noinst_DATA = pre_stage2 start start_eltorito
-@@ -79,8 +79,14 @@ else
+@@ -55,11 +55,11 @@ noinst_PROGRAMS = pre_stage2.exec start.exec start_eltorito.exec \
+ endif
+ MOSTLYCLEANFILES = $(noinst_PROGRAMS)
+
+-PRE_STAGE2_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8200
+-START_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8000
+-NBLOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,0
+-PXELOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00
+-START_ELTORITO_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00
++PRE_STAGE2_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8200 $(LOADER_LDFLAGS)
++START_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8000 $(LOADER_LDFLAGS)
++NBLOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,0 $(LOADER_LDFLAGS)
++PXELOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00 $(LOADER_LDFLAGS)
++START_ELTORITO_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00 $(LOADER_LDFLAGS)
+
+ if NETBOOT_SUPPORT
+ NETBOOT_FLAGS = -I$(top_srcdir)/netboot -DSUPPORT_NETBOOT=1
+@@ -79,10 +79,16 @@ else
HERCULES_FLAGS =
endif
@@ -14385,8 +14380,11 @@
- $(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS)
+ $(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS) $(GRAPHICS_FLAGS)
- STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000
+-STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000
++STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000 $(LOADER_LDFLAGS)
STAGE1_5_COMPILE = $(STAGE2_COMPILE) -DNO_DECOMPRESSION=1 -DSTAGE1_5=1
+
+ # For stage2 target.
@@ -90,7 +96,8 @@ pre_stage2_exec_SOURCES = asm.S bios.c boot.c builtins.c char_io.c \
cmdline.c common.c console.c disk_io.c fsys_ext2fs.c \
fsys_fat.c fsys_ffs.c fsys_iso9660.c fsys_jfs.c fsys_minix.c \
@@ -14406,14 +14404,8 @@
stage2_size.h: pre_stage2
-rm -f stage2_size.h
-@@ -269,4 +276,4 @@ pxegrub: pxeloader diskless
- # General rule for making a raw binary.
- SUFFIXES = .exec
- .exec:
-- $(OBJCOPY) -O binary $< $@
-+ $(OBJCOPY) -O binary -R .note.gnu.build-id $< $@
diff --git a/stage2/Makefile.in b/stage2/Makefile.in
-index d0062bd..c3ccc60 100644
+index d0062bd..66e7465 100644
--- a/stage2/Makefile.in
+++ b/stage2/Makefile.in
@@ -1,8 +1,8 @@
@@ -14667,8 +14659,11 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -357,12 +381,9 @@ LIBOBJS = @LIBOBJS@
+@@ -355,14 +379,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
++LOADER_LDFLAGS = @LOADER_LDFLAGS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
@@ -14681,7 +14676,7 @@
NET_CFLAGS = @NET_CFLAGS@
NET_EXTRAFLAGS = @NET_EXTRAFLAGS@
OBJCOPY = @OBJCOPY@
-@@ -376,22 +397,17 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+@@ -376,22 +398,17 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
RANLIB = @RANLIB@
@@ -14708,7 +14703,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -403,28 +419,39 @@ build_alias = @build_alias@
+@@ -403,28 +420,39 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -14748,7 +14743,7 @@
# For test target.
TESTS = size_test
-@@ -435,7 +462,7 @@ noinst_HEADERS = apic.h defs.h dir.h disk_inode.h disk_inode_ffs.h \
+@@ -435,7 +463,7 @@ noinst_HEADERS = apic.h defs.h dir.h disk_inode.h disk_inode_ffs.h \
fat.h filesys.h freebsd.h fs.h hercules.h i386-elf.h \
imgact_aout.h iso9660.h jfs.h mb_header.h mb_info.h md5.h \
nbi.h pc_slice.h serial.h shared.h smp-imps.h term.h \
@@ -14757,7 +14752,7 @@
EXTRA_DIST = setjmp.S apm.S $(noinst_SCRIPTS)
-@@ -448,7 +475,7 @@ libgrub_a_SOURCES = boot.c builtins.c char_io.c cmdline.c common.c \
+@@ -448,7 +476,7 @@ libgrub_a_SOURCES = boot.c builtins.c char_io.c cmdline.c common.c \
disk_io.c fsys_ext2fs.c fsys_fat.c fsys_ffs.c fsys_iso9660.c \
fsys_jfs.c fsys_minix.c fsys_reiserfs.c fsys_ufs2.c \
fsys_vstafs.c fsys_xfs.c gunzip.c md5.c serial.c stage2.c \
@@ -14766,7 +14761,7 @@
libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
-DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
-@@ -456,11 +483,11 @@ libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
+@@ -456,11 +484,11 @@ libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
-DFSYS_UFS2=1 -DFSYS_VSTAFS=1 -DFSYS_XFS=1 \
-DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1
@@ -14780,7 +14775,23 @@
@DISKLESS_SUPPORT_TRUE@ ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
@DISKLESS_SUPPORT_TRUE@ reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 \
@DISKLESS_SUPPORT_TRUE@ nbgrub pxegrub
-@@ -479,8 +506,10 @@ START_ELTORITO_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00
+@@ -468,21 +496,23 @@ libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
+ @DISKLESS_SUPPORT_FALSE at noinst_DATA = pre_stage2 start start_eltorito
+ @DISKLESS_SUPPORT_TRUE at noinst_DATA = pre_stage2 start start_eltorito nbloader pxeloader diskless
+ MOSTLYCLEANFILES = $(noinst_PROGRAMS)
+-PRE_STAGE2_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8200
+-START_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8000
+-NBLOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,0
+-PXELOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00
+-START_ELTORITO_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00
++PRE_STAGE2_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8200 $(LOADER_LDFLAGS)
++START_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8000 $(LOADER_LDFLAGS)
++NBLOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,0 $(LOADER_LDFLAGS)
++PXELOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00 $(LOADER_LDFLAGS)
++START_ELTORITO_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00 $(LOADER_LDFLAGS)
+ @NETBOOT_SUPPORT_FALSE at NETBOOT_FLAGS =
+ @NETBOOT_SUPPORT_TRUE at NETBOOT_FLAGS = -I$(top_srcdir)/netboot -DSUPPORT_NETBOOT=1
+ @SERIAL_SUPPORT_FALSE at SERIAL_FLAGS =
@SERIAL_SUPPORT_TRUE at SERIAL_FLAGS = -DSUPPORT_SERIAL=1
@HERCULES_SUPPORT_FALSE at HERCULES_FLAGS =
@HERCULES_SUPPORT_TRUE at HERCULES_FLAGS = -DSUPPORT_HERCULES=1
@@ -14790,9 +14801,12 @@
- $(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS)
+ $(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS) $(GRAPHICS_FLAGS)
- STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000
+-STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000
++STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000 $(LOADER_LDFLAGS)
STAGE1_5_COMPILE = $(STAGE2_COMPILE) -DNO_DECOMPRESSION=1 -DSTAGE1_5=1
-@@ -490,7 +519,8 @@ pre_stage2_exec_SOURCES = asm.S bios.c boot.c builtins.c char_io.c \
+
+ # For stage2 target.
+@@ -490,7 +520,8 @@ pre_stage2_exec_SOURCES = asm.S bios.c boot.c builtins.c char_io.c \
cmdline.c common.c console.c disk_io.c fsys_ext2fs.c \
fsys_fat.c fsys_ffs.c fsys_iso9660.c fsys_jfs.c fsys_minix.c \
fsys_reiserfs.c fsys_ufs2.c fsys_vstafs.c fsys_xfs.c gunzip.c \
@@ -14802,7 +14816,7 @@
pre_stage2_exec_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
pre_stage2_exec_CCASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
-@@ -498,7 +528,7 @@ pre_stage2_exec_LDFLAGS = $(PRE_STAGE2_LINK)
+@@ -498,7 +529,7 @@ pre_stage2_exec_LDFLAGS = $(PRE_STAGE2_LINK)
@NETBOOT_SUPPORT_TRUE at pre_stage2_exec_LDADD = ../netboot/libdrivers.a
@DISKLESS_SUPPORT_FALSE at BUILT_SOURCES = stage2_size.h
@DISKLESS_SUPPORT_TRUE at BUILT_SOURCES = stage2_size.h diskless_size.h
@@ -14811,7 +14825,7 @@
start_exec_SOURCES = start.S
start_exec_CCASFLAGS = $(STAGE2_COMPILE)
start_exec_LDFLAGS = $(START_LINK)
-@@ -695,52 +725,52 @@ clean-noinstPROGRAMS:
+@@ -695,52 +726,52 @@ clean-noinstPROGRAMS:
-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
diskless.exec$(EXEEXT): $(diskless_exec_OBJECTS) $(diskless_exec_DEPENDENCIES)
@rm -f diskless.exec$(EXEEXT)
@@ -14880,7 +14894,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -748,6 +778,7 @@ mostlyclean-compile:
+@@ -748,6 +779,7 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@@ -14888,7 +14902,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/diskless_exec-bios.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/diskless_exec-boot.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/diskless_exec-builtins.Po at am__quote@
-@@ -766,6 +797,7 @@ distclean-compile:
+@@ -766,6 +798,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/diskless_exec-fsys_ufs2.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/diskless_exec-fsys_vstafs.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/diskless_exec-fsys_xfs.Po at am__quote@
@@ -14896,7 +14910,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/diskless_exec-gunzip.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/diskless_exec-hercules.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/diskless_exec-md5.Po at am__quote@
-@@ -774,36 +806,46 @@ distclean-compile:
+@@ -774,36 +807,46 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/diskless_exec-stage2.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/diskless_exec-terminfo.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/diskless_exec-tparm.Po at am__quote@
@@ -14943,7 +14957,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgrub_a-boot.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgrub_a-builtins.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgrub_a-char_io.Po at am__quote@
-@@ -820,18 +862,23 @@ distclean-compile:
+@@ -820,18 +863,23 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgrub_a-fsys_ufs2.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgrub_a-fsys_vstafs.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgrub_a-fsys_xfs.Po at am__quote@
@@ -14967,7 +14981,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pre_stage2_exec-bios.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pre_stage2_exec-boot.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pre_stage2_exec-builtins.Po at am__quote@
-@@ -850,6 +897,7 @@ distclean-compile:
+@@ -850,6 +898,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pre_stage2_exec-fsys_ufs2.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pre_stage2_exec-fsys_vstafs.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pre_stage2_exec-fsys_xfs.Po at am__quote@
@@ -14975,7 +14989,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pre_stage2_exec-gunzip.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pre_stage2_exec-hercules.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pre_stage2_exec-md5.Po at am__quote@
-@@ -858,2099 +906,2367 @@ distclean-compile:
+@@ -858,2099 +907,2367 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pre_stage2_exec-stage2.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pre_stage2_exec-terminfo.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pre_stage2_exec-tparm.Po at am__quote@
@@ -17947,7 +17961,7 @@
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -3002,9 +3318,9 @@ distclean-tags:
+@@ -3002,9 +3319,9 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -17959,7 +17973,7 @@
if test -n "$$list"; then \
for tst in $$list; do \
if test -f ./$$tst; then dir=./; \
-@@ -3013,7 +3329,7 @@ check-TESTS: $(TESTS)
+@@ -3013,7 +3330,7 @@ check-TESTS: $(TESTS)
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -17968,7 +17982,7 @@
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
echo "XPASS: $$tst"; \
-@@ -3025,7 +3341,7 @@ check-TESTS: $(TESTS)
+@@ -3025,7 +3342,7 @@ check-TESTS: $(TESTS)
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -17977,7 +17991,7 @@
xfail=`expr $$xfail + 1`; \
echo "XFAIL: $$tst"; \
;; \
-@@ -3075,22 +3391,21 @@ check-TESTS: $(TESTS)
+@@ -3075,22 +3392,21 @@ check-TESTS: $(TESTS)
else :; fi
distdir: $(DISTFILES)
@@ -18013,7 +18027,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -3108,8 +3423,8 @@ check: $(BUILT_SOURCES)
+@@ -3108,8 +3424,8 @@ check: $(BUILT_SOURCES)
all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
$(HEADERS)
installdirs:
@@ -18024,7 +18038,7 @@
done
install: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) install-am
-@@ -3160,14 +3475,22 @@ info: info-am
+@@ -3160,14 +3476,22 @@ info: info-am
info-am:
@@ -18049,7 +18063,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -3187,19 +3510,22 @@ ps: ps-am
+@@ -3187,19 +3511,22 @@ ps: ps-am
ps-am:
@@ -18078,15 +18092,6 @@
stage2_size.h: pre_stage2
-@@ -3244,7 +3570,7 @@ pxegrub: pxeloader diskless
- -rm -f $@
- cat $^ > $@
- .exec:
-- $(OBJCOPY) -O binary $< $@
-+ $(OBJCOPY) -O binary -R .note.gnu.build-id $< $@
- # 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:
diff --git a/stage2/asm.S b/stage2/asm.S
index 34b6e7d..655e707 100644
--- a/stage2/asm.S
@@ -21603,7 +21608,7 @@
EXTRA_DIST = mkbimage
diff --git a/util/Makefile.in b/util/Makefile.in
-index e700cf7..65c4607 100644
+index e700cf7..aa5a12e 100644
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -1,8 +1,8 @@
@@ -21705,8 +21710,11 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -115,12 +103,9 @@ LIBOBJS = @LIBOBJS@
+@@ -113,14 +101,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
++LOADER_LDFLAGS = @LOADER_LDFLAGS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
@@ -21719,7 +21727,7 @@
NET_CFLAGS = @NET_CFLAGS@
NET_EXTRAFLAGS = @NET_EXTRAFLAGS@
OBJCOPY = @OBJCOPY@
-@@ -134,22 +119,17 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+@@ -134,22 +120,17 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
RANLIB = @RANLIB@
@@ -21746,7 +21754,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -161,31 +141,40 @@ build_alias = @build_alias@
+@@ -161,31 +142,40 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -21790,7 +21798,7 @@
noinst_SCRIPTS = grub-image mkbimage
EXTRA_DIST = mkbimage
-@@ -234,11 +223,9 @@ grub-md5-crypt: $(top_builddir)/config.status $(srcdir)/grub-md5-crypt.in
+@@ -234,11 +224,9 @@ grub-md5-crypt: $(top_builddir)/config.status $(srcdir)/grub-md5-crypt.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
grub-terminfo: $(top_builddir)/config.status $(srcdir)/grub-terminfo.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
@@ -21803,7 +21811,7 @@
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
-@@ -261,10 +248,10 @@ clean-binPROGRAMS:
+@@ -261,10 +249,10 @@ clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
mbchk$(EXEEXT): $(mbchk_OBJECTS) $(mbchk_DEPENDENCIES)
@rm -f mbchk$(EXEEXT)
@@ -21816,7 +21824,7 @@
@list='$(sbin_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -291,19 +278,18 @@ distclean-compile:
+@@ -291,19 +279,18 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mbchk.Po at am__quote@
.c.o:
@@ -21840,7 +21848,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-@@ -354,22 +340,21 @@ distclean-tags:
+@@ -354,22 +341,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -21876,7 +21884,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -385,7 +370,7 @@ check: check-am
+@@ -385,7 +371,7 @@ check: check-am
all-am: Makefile $(PROGRAMS) $(SCRIPTS)
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"; do \
@@ -21885,7 +21893,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -433,12 +418,20 @@ info-am:
+@@ -433,12 +419,20 @@ info-am:
install-data-am:
@@ -21906,7 +21914,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -458,20 +451,23 @@ ps: ps-am
+@@ -458,20 +452,23 @@ ps: ps-am
ps-am:
More information about the fedora-extras-commits
mailing list