Fix segfault with evince

[hvlinux.git] / stage1 / pkg / linux

diff --git a/stage1/pkg/linux b/stage1/pkg/linux
index 5bacbde..79d09cd 100644 (file)
--- a/stage1/pkg/linux
+++ b/stage1/pkg/linux
@@ -5,6 +5,8 @@ hvbuild()
     # Decompress kernel sources
     decompress_package ${PACKAGE} ${LFS}/usr/src
 
+    apply_patches ${PACKAGE} ${LFS}/usr/src
+
     # Copy kernel configuration file in source tree.
     cp -v ${SCRDIR}/../config/${KERNEL_CONFIG} ${LFS}/usr/src/${PACKAGE}/.config
 
@@ -23,6 +25,11 @@ hvbuild()
     echo "PATH=\${PATH}:${LFS}/cross-tools/bin" >> ${SCRIPT}
     echo "" >> ${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:
@@ -30,6 +37,7 @@ hvbuild()
 
     # Install the kernel:
     echo "cp -v arch/${CLFS_ARCH}/boot/bzImage \${DEST}/vmlinuz-\${KERNEL_NAME}" >> ${SCRIPT}
+    echo "ln -svf vmlinuz-\${KERNEL_NAME} \${DEST}/vmlinuz" >> ${SCRIPT}
 
     # Install map file:
     echo "cp -v System.map \${DEST}/System.map-\${KERNEL_NAME}" >> ${SCRIPT}
@@ -40,12 +48,6 @@ hvbuild()
     chmod -v u+x ${SCRIPT}
 
     cd ${LFS}/usr/src/${PACKAGE}
-    ${HVMAKE} mrproper
-
-    # 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.
-    yes "" | make oldconfig
 
     # Execute compilation script
     ${SCRIPT}