X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fgrub;h=2b0544bd7c053cac6a754d2d2168b62f5410e5bc;hp=56935f0f7ecf17cda03c333c2c86401fbe6379b6;hb=7d7d5092d3a17ec38f3a8baa5a214075dc269ed3;hpb=98603963381ca8c7396d68786ddf4f1e32f650e5

diff --git a/lfs/grub b/lfs/grub
index 56935f0f7..2b0544bd7 100644
--- a/lfs/grub
+++ b/lfs/grub
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -32,8 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = i586
-CFLAGS     = -O0 -fno-reorder-functions -fno-strict-aliasing -Wall -Werror \
-	-Wno-shadow -Wno-unused -Wno-pointer-sign
+CFLAGS     =
 CXXFLAGS   =
 
 ###############################################################################
@@ -76,7 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 
 	# Applying patches.
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-fedora-18.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-gentoo-14.patch
 	cd $(DIR_APP) && autoreconf
 	cd $(DIR_APP) && autoconf
 
@@ -88,10 +87,16 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	# grub files
 	mkdir -vp /boot/grub
-	cp -v /usr/share/grub/i386-pc/stage{1,2} /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
 
+	# generate default file
+	grub-set-default 0
+
+	# Disable PaX mprotect for grub
+	paxctl -m /usr/sbin/grub
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)