X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage1%2Fpkg%2Flinux;h=5e1f516366739e0487a8247ff1ff21da4f045f06;hb=39a19cacbb9a44c5ceadd254463ea87c588a82a3;hp=0857772d1c9eb034b92c5add75c1aacc3fbe921f;hpb=3605ab38ca7604b1fe43c3bce5e4963730a85d39;p=hvlinux.git

diff --git a/stage1/pkg/linux b/stage1/pkg/linux
index 0857772..5e1f516 100644
--- a/stage1/pkg/linux
+++ b/stage1/pkg/linux
@@ -1,17 +1,17 @@
 #!/bin/bash
 
-HV_NO_CONFIGURE_SCRIPT=1
-
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-
-    # Move kernel source files to their final destination
-    mkdir -pv ${LFS}/usr/src
+    # Decompress kernel sources
     decompress_package ${PACKAGE} ${LFS}/usr/src
 
-    cd ${LFS}/usr/src/${PACKAGE}
-    ${HVMAKE} mrproper
+    apply_patches ${PACKAGE} ${LFS}/usr/src
+
+    # Copy kernel configuration file in source tree.
+    cp -v ${SCRDIR}/../config/${KERNEL_CONFIG} ${LFS}/usr/src/${PACKAGE}/.config
+
+    # Remove modules support
+    sed -i -e "s!CONFIG_MODULES=y!CONFIG_MODULES=n!" ${LFS}/usr/src/${PACKAGE}/.config
 
     # Install HV kernel compilation script:
     VERSION=$(get_pkg_ver ${PACKAGE})
@@ -25,7 +25,12 @@ hvbuild()
     echo "PATH=\${PATH}:${LFS}/cross-tools/bin" >> ${SCRIPT}
     echo "" >> ${SCRIPT}
 
-    echo "make ARCH=${CLFS_ARCH} CROSS_COMPILE=${CLFS_TARGET}- menuconfig" >> ${SCRIPT}
+    # The 'yes' command repeatedly output a line with all specified string, or
+    # 'y' by default. So, you can use it to simply "press enter", which will
+    # result in using the defaults value for the 'make oldconfig' command.
+    echo 'yes "" | make ARCH=${CLFS_ARCH} CROSS_COMPILE=${CLFS_TARGET}- oldconfig' >> ${SCRIPT}
+
+    echo "#make ARCH=${CLFS_ARCH} CROSS_COMPILE=${CLFS_TARGET}- menuconfig" >> ${SCRIPT}
 
     # Compile the kernel image:
     echo "make ARCH=${CLFS_ARCH} CROSS_COMPILE=${CLFS_TARGET}-" >> ${SCRIPT}
@@ -40,4 +45,9 @@ hvbuild()
     echo "cp -v .config \${DEST}/config-\${KERNEL_NAME}" >> ${SCRIPT}
 
     chmod -v u+x ${SCRIPT}
+
+    cd ${LFS}/usr/src/${PACKAGE}
+
+    # Execute compilation script
+    ${SCRIPT}
 }