Zwischencommit beim Umzug auf LFS 6.2.

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

diff --git a/lfs/grub b/lfs/grub
index 9acc595e128883b146db39183b09413ec635d129..d04297099843f3da211052050d3c0034d25bdf90 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,7 +26,6 @@
 
 include Config
 
-#VER        = 0.95
 VER        = 0.97
 
 THISAPP    = grub-$(VER)
@@ -81,8 +74,8 @@ $(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/grub-0.97-disk_geometry-1.patch
+       ### WHICH ONE OF THESE PATCHES DO WE REALLY NEED? CAN WE DELETE ANY?
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/grub-0.97-path-patch
        cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/grub-0.97/use_ferror.diff
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/grub-R
@@ -101,24 +94,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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
+           ./configure --prefix=/usr
+       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