Rudimentaere ISDN-Erkennung erstellt.

[people/teissler/ipfire-2.x.git] / lfs / grub

diff --git a/lfs/grub b/lfs/grub
index 3b063a606d8480227e414a4cfb27a0bc0880c858..f60c3b4f48a406ed27f0931192567f5bbd626ac9 100644 (file)
--- a/lfs/grub
+++ b/lfs/grub
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: grub,v 1.9.2.9 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,12 +26,11 @@
 
 include Config
 
-#VER        = 0.95
 VER        = 0.97
 
 THISAPP    = grub-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_AGNU)/grub
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 CFLAGS     =
@@ -81,50 +74,26 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-
-# Patch SuSE 10.2
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/SuSE10.2/grub-0.97-path-patch
-       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/SuSE10.2/use_ferror.diff
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/SuSE10.2/grub-R
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/SuSE10.2/bad-assert-sideeffect
-       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/SuSE10.2/grub-gfxmenu-v8.diff
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/SuSE10.2/grub-0.97-devicemap.diff
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/SuSE10.2/grub-linux-setup-fix
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/SuSE10.2/fix-uninitialized
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/SuSE10.2/force-LBA-off.diff
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/SuSE10.2/grub-0.97-initrdaddr.diff
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/SuSE10.2/grub-0.97-protexec.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/SuSE10.2/grub-path-cfg.diff
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-disk_geometry-1.patch
 
        cd $(DIR_APP) && perl -pi -e 's,/usr/lib/grub/i386-pc,/usr/share/grub/i386-pc,' docs/grub.texi
+       cd $(DIR_APP) && sed -i 's/AM_INIT_AUTOMAKE/&\nAM_PROG_AS/' configure.ac
+
+       cd $(DIR_APP) && aclocal && autoheader && autoconf && automake --add-missing
+       cd $(DIR_APP) && CFLAGS="-Os -s -fno-strict-aliasing" ./configure --prefix=/usr
 
-       cd $(DIR_APP) && autoreconf --install --force
-       cd $(DIR_APP) && CFLAGS="-0s -fno-stack-protector" \
-           STAGE2_CFLAGS="-0s -fno-stack-protector" \
-           ./configure --prefix=/usr --datadir=/usr/share \
-                       --disable-rtl8139 \
-                       --disable-auto-linux-mem-opt \
-                       --disable-ne \
-                       --disable-nls \
-                       --disable-fat \
-                       --disable-ffs \
-                       --disable-minix \
-                       --disable-reiserfs \
-                       --disable-vstafs \
-                       --disable-jfs \
-                       --disable-xfs
-
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 
        # grub files
-       mkdir -p /boot/grub
+       mkdir -vp /boot/grub
+       cp -v /usr/lib/grub/i386-pc/stage{1,2} /boot/grub
        for i in $(DIR_SRC)/config/grub/*; do \
            [ -f $$i ] && cp -f $$i /boot/grub; \
        done
 
        install -m 0755 $(DIR_SRC)/src/install+setup/install/grubbatch /boot/grub
-       /usr/sbin/grub-set-default 0
+       /usr/sbin/grub-set-default 1
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)