From: gobo72 <gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Wed, 2 Mar 2011 20:47:06 +0000 (+0000)
Subject: Réglé problème avec module-init-tools et enlevé /tools à la fin du stage2
X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=2a71f1dd83720c7648a846742a09b3b60b69c321;p=hvlinux.git

Réglé problème avec module-init-tools et enlevé /tools à la fin du stage2
---

diff --git a/stage2/install-2 b/stage2/install-2
index dd21aae..4d855d2 100755
--- a/stage2/install-2
+++ b/stage2/install-2
@@ -40,9 +40,11 @@ ipkg -m noac ${UDEV_CONFIG}
 ipkg ${GRUB}
 ipkg -m acnb ${DHCP}
 
-rscr once  "Installing HV-utilities" install-hv-utilities
+rscr once "Installing HV-utilities" install-hv-utilities
+rscr once "Installing bootscripts"  install-bootscripts
+rscr once "Creating default config files" create-config-files
+
 rscr mult  "Compressing man pages"   compressdoc
-rscr once  "Installing bootscripts"  install-bootscripts
 #rscr mult "Stripping" stripping
 
 echo "Total build time: $(get_total_build_time ${LFS_LOG_FILE})h"
diff --git a/stage2/pkg/module-init-tools b/stage2/pkg/module-init-tools
index a7d9c13..e7b8c1d 100644
--- a/stage2/pkg/module-init-tools
+++ b/stage2/pkg/module-init-tools
@@ -2,16 +2,22 @@
 
 hvconfig_pre()
 {
+    # To avoid a problem with regenerating the man pages when not needed,
+    # first rewrite a file that just points to another man page:
+    echo '.so man5/modprobe.conf.5' > ${LFS_TMP}/${PACKAGE}/modprobe.d.5
+
     # --enable-zlib-dynamic: To handle compressed kernel modules.
     CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
-        --enable-zlib-dynamic \
-        --mandir=/usr/share/man"
+        --prefix=/usr \
+        --bindir=/bin \
+        --sbindir=/sbin \
+        --sysconfdir=/etc \
+        --enable-zlib-dynamic"
 }
 
 hvbuild()
 {
-    make -j ${MAKEJOBS} DOCBOOKTOMAN=""
+    make
 
     # INSTALL=install
     # Normally, make install will not install the binaries if they already
diff --git a/stage2/post-install b/stage2/post-install
index cee7e86..f0f33e0 100755
--- a/stage2/post-install
+++ b/stage2/post-install
@@ -31,6 +31,15 @@ chown -v root:root /tmp
 chown -v root:root /var
 chown -v root:root /var/log
 
+# Removing /tools from PATH:
+SED_REP='/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin'
+sed -i -e "s!^\(PATH=\).*tools.*!\1${SED_REP}!" /etc/profile
+
+# Removing /tools directory
+if [ -d /tools ]; then
+    mv /tools /tools.to.remove.after.stage2
+fi
+
 ldconfig
 
 exit $?