From 7e118a4970d79177ec95eecf75158eca57c0a9e4 Mon Sep 17 00:00:00 2001
From: gobo72 <gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Sat, 19 Mar 2011 05:01:36 +0000
Subject: [PATCH] =?utf8?q?R=C3=A9gl=C3=A9=20une=20erreur:=20les=20headers?=
 =?utf8?q?=20de=20Linux=20n'=C3=A9taient=20pas=20r=C3=A9install=C3=A9s=20a?=
 =?utf8?q?u=20stage2=20(mon=20erreur)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 config/sysinfos.hp-mini |  2 +-
 stage2/pkg/linux        | 31 +++++++++++++++----------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/config/sysinfos.hp-mini b/config/sysinfos.hp-mini
index 218ec44..45613d8 100644
--- a/config/sysinfos.hp-mini
+++ b/config/sysinfos.hp-mini
@@ -5,7 +5,7 @@
 
 INST_TYPE="workstation"
 HVL_TARGET="x86"
-MAKEJOBS=2
+MAKEJOBS=1
 
 # Destination path where to install new Linux-HV system. This is usually where
 # you have mounted your new LFS partition, but it can also be any directory.
diff --git a/stage2/pkg/linux b/stage2/pkg/linux
index dd0af0b..a3ee9f5 100644
--- 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
-- 
2.20.1