Enlevé variable SSID redondante pour wpa (le SSID est le nom du fichier)

[hvlinux.git] / stage2 / pkg / linux

diff --git a/stage2/pkg/linux b/stage2/pkg/linux
index dd0af0b..a3ee9f5 100644 (file)
--- a/stage2/pkg/linux
+++ b/stage2/pkg/linux
@@ -2,25 +2,24 @@
 
 hvbuild()
 {
-    # Check if kernel sources from stage0 are still there
+    # Check if kernel sources from stage0 are still in /usr/src.
+    # If not, recopy them.
     if [ ! -d /usr/src/${PACKAGE} ]; then
-        # If no, then copy them. We don't install headers and
-        # assume that it is a new kernel version installation.
-        mv ${LFS_TMP}/${PACKAGE} /usr/src
-    else
-        # Install headers
-        cd /usr/src/${PACKAGE}
-        make mrproper
-        make headers_check
-
-        # Remove any previous headers install
-        rm -rf dest
-        make INSTALL_HDR_PATH=dest headers_install
-        cp -rv dest/include/* /usr/include
-        find /usr/include -name .install -or -name ..install.cmd | xargs rm -fv
-        rm -rf dest
+        cp -a ${LFS_TMP}/${PACKAGE} /usr/src
     fi
 
+    # Install headers
+    cd /usr/src/${PACKAGE}
+    make mrproper
+    make headers_check
+
+    # Remove any previous headers install
+    rm -rf dest
+    make INSTALL_HDR_PATH=dest headers_install
+    cp -rv dest/include/* /usr/include
+    find /usr/include -name .install -or -name ..install.cmd | xargs rm -fv
+    rm -rf dest
+
     # Install HV kernel compilation script:
     VERSION=$(get_pkg_ver ${PACKAGE})
     SCRIPT=/usr/src/compile-kernel