makegraphs umgebaut, sodass nurnoch rrd daten geschrieben werden die graphen

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

diff --git a/lfs/grub b/lfs/grub
index c82d220cd947e4296ad134245dd310b3427da4ac..385d7c1f8f394fda43f26706890f11be4ea73968 100644 (file)
--- a/lfs/grub
+++ b/lfs/grub
@@ -29,8 +29,8 @@ include Config
 VER        = 0.97
 
 THISAPP    = grub-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_AGNU)/grub
+DL_FILE    = $(THISAPP)-reiser4-20050808.tar.gz
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 CFLAGS     =
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = cd3f3eb54446be6003156158d51f4884
+$(DL_FILE)_MD5 = c5a860a4cd81cffc95a3b9ca5624aa7b
 
 install : $(TARGET)
 
@@ -74,29 +74,17 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       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
-       #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/bad-assert-sideeffect
+
+       # This fails, but doesn't matter
+       -cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-disk_geometry-1.patch
        cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/grub-0.97/grub-gfxmenu-v8.diff
-       #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/grub-0.97-devicemap.diff
-       #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/grub-linux-setup-fix
-       #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/fix-uninitialized
-       #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/force-LBA-off.diff
-       #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/grub-0.97-initrdaddr.diff
-       #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/grub-0.97-protexec.patch
-       #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/grub-path-cfg.diff
 
        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) && ./configure --prefix=/usr
-       # Temporary commented.
-       #       CFLAGS="-0s -fno-stack-protector" \
-       #       STAGE2_CFLAGS="-0s -fno-stack-protector" \
-           
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 
@@ -108,7 +96,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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)