Samba-Update von Maniac...

Reiser4! Juhuu!


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@433 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

lfs/grub

@@ -74,7 +74,13 @@ $(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
+
+	# Reiser4
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-reiser4-20050808.diff
+
+	# This fails, but doesn't matter
+	-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
@@ -90,12 +96,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	#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) && 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) && CFLAGS="-Os -s -fno-strict-aliasing" ./configure --prefix=/usr
 	    
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
@@ -108,7 +112,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)