uefi and bios builds succeeding

phase4/build_order.txt

@@ -54,7 +54,6 @@ diffutils
 gawk
 findutils
 groff
-# Skipping GRUB MBR build since we are using UEFI
 gzip
 iproute2
 kbd
@@ -74,10 +73,3 @@ sysvinit
 lfsbootscripts
 linux
 
-# UEFI Boot Dependencies
-popt
-mandoc
-efivar
-efibootmgr
-grub
-

phase4/efibootmgr.sh

@@ -1,9 +0,0 @@
-# efibootmanager Phase 4
-sed -e '/extern int efi_set_verbose/d' -i src/efibootmgr.c
-
-sed 's/-Werror//' -i Make.defaults
-
-make EFIDIR=LFS EFI_LOADER=grubx64.efi
-
-make install EFIDIR=LFS
-

phase4/efivar.sh

@@ -1,7 +0,0 @@
-# efivar Phase 4
-sed '/prep :/a\\ttouch prep' -i src/Makefile
-
-make
-
-make install LIBDIR=/usr/lib
-

phase4/grub.sh

@@ -1,30 +0,0 @@
-# GRUB Phase 4
-mkdir -p /usr/share/fonts/unifont
-gunzip -c ../$(basename $PKG_UNIFONT) > /usr/share/fonts/unifont/unifont.pcf
-
-unset {C,CPP,CXX,LD}FLAGS
-
-./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --disable-efiemu     \
-            --with-platform=efi  \
-            --target=x86_64      \
-            --disable-werror     
-#           --enable-grub-mkfont (uncomment if using FreeType)
-
-unset TARGET_CC
-
-make
-
-make install
-
-mv /etc/bash_completion.d/grub /usr/share/bash-completion/completions
-
-GRUB_OUTPUT=$(grub-install --bootloader-id=LFS --recheck)
-if [ -n "$(echo $GRUB_OUTPUT | grep "No error reported")" ]
-then
-    echo "An error occured while installing GRUB:"
-    echo $GRUB_OUTPUT
-    exit -1
-fi
-

phase4/linux.sh

@@ -1,4 +1,15 @@
 # LINUX Phase 4
+
+function config_on {
+    local UNCOMMENTED="^${1}=.*\$"
+    local COMMENTED="^# ${1} .*\$"
+    sed -E -i "s/${UCOMMENTED}|${COMMENTED}/${1}=y/" ./.config
+}
+
+function config_off {
+    sed -i "s/^${1}=.*$//" ./.config
+}
+
 CONFIGFILE=config-$KERNELVERS
 make mrproper
 
@@ -8,6 +19,12 @@ then
 else
     # if kernel config not provided, use default architecture config
     make defconfig
+
+    config_off CONFIG_IKHEADERS
+    config_on  CONFIG_FB
+    config_off CONFIG_UEVENT_HELPER
+    config_on  CONFIG_DEVTMPFS
+    config_on  CONFIG_MODULES
 fi
 
 make

phase4/mandoc.sh

@@ -1,15 +0,0 @@
-# mandoc Phase 4
-./configure
-
-make mandoc
-
-if $RUN_TESTS
-then
-    set +e
-    make regress
-    set -e
-fi
-
-install -vm755 mandoc   /usr/bin
-install -vm644 mandoc.1 /usr/share/man/man1
-

phase4/popt.sh

@@ -1,7 +0,0 @@
-# Popt Phase 4
-./configure --prefix=/usr --disable-static
-
-make
-
-make install
-