From 781acd83f772630262c2a8ba22c8fe7507801852 Mon Sep 17 00:00:00 2001
From: gobo72 <gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Sun, 8 Jan 2012 01:54:34 +0000
Subject: [PATCH] =?utf8?q?Corrections=20erreurs=20de=20compilation=20udev?=
 =?utf8?q?=20et=20module-init-tools,=20et=20d=C3=A9plac=C3=A9=20les=20?=
 =?utf8?q?=C3=A9x=C3=A9cutables=20de=20dhcp=20de=20/usr/local=20vers=20/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 stage2/hv-install-2          |  2 +-
 stage2/pkg/dhcp              | 11 -----------
 stage2/pkg/module-init-tools |  4 ++++
 stage2/pkg/udev              |  4 ++++
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/stage2/hv-install-2 b/stage2/hv-install-2
index 824ff26..d9ed780 100755
--- a/stage2/hv-install-2
+++ b/stage2/hv-install-2
@@ -41,7 +41,7 @@ FORCE_UNSAFE_CONFIGURE=1 ipkg ${TAR_PACKAGE} "--bindir=/bin --libexecdir=/usr/sb
 ipkg ${TEXINFO}
 ipkg ${UDEV}
 ipkg ${GRUB}
-ipkg -m acnb ${DHCP}
+ipkg -m acnb ${DHCP} "--exec-prefix=/"
 
 if [ -n "${WIFI_SUPPORT}" ]; then
     PREFIX=/usr ipkg -m noac -s wireless-tools ${WIRELESS_TOOLS}
diff --git a/stage2/pkg/dhcp b/stage2/pkg/dhcp
index ce13b4b..391e31f 100644
--- a/stage2/pkg/dhcp
+++ b/stage2/pkg/dhcp
@@ -1,16 +1,5 @@
 #!/bin/bash
 
-hvconfig_pre()
-{
-    CONFIGURE_OPTS=""
-}
-
-hvbuild()
-{
-    ${HVMAKE}
-    ${HVMAKE} LIBDIR=/usr/lib INCDIR=/usr/include install
-}
-
 hvbuild_post()
 {
     # This is for the DHCP client
diff --git a/stage2/pkg/module-init-tools b/stage2/pkg/module-init-tools
index e7b8c1d..5a0d77d 100644
--- a/stage2/pkg/module-init-tools
+++ b/stage2/pkg/module-init-tools
@@ -6,6 +6,8 @@ hvconfig_pre()
     # first rewrite a file that just points to another man page:
     echo '.so man5/modprobe.conf.5' > ${LFS_TMP}/${PACKAGE}/modprobe.d.5
 
+    export DOCBOOKTOMAN=/bin/true
+
     # --enable-zlib-dynamic: To handle compressed kernel modules.
     CONFIGURE_OPTS="\
         --prefix=/usr \
@@ -29,4 +31,6 @@ hvbuild()
 hvbuild_post()
 {
     install -dv ${LFS}/etc/modprobe.d
+
+    unset DOCBOOKTOMAN
 }
diff --git a/stage2/pkg/udev b/stage2/pkg/udev
index 1cea3cb..aa2c177 100644
--- a/stage2/pkg/udev
+++ b/stage2/pkg/udev
@@ -2,6 +2,8 @@
 
 hvconfig_pre()
 {
+    # --disable-keymap: to remove gperf dependency
+
     CONFIGURE_OPTS="\
         ${CONFIGURE_OPTS} \
         --sbindir=/sbin \
@@ -9,6 +11,8 @@ hvconfig_pre()
         --libexecdir=/lib/udev \
         --docdir=/usr/share/doc/${PACKAGE} \
         --disable-extras \
+        --disable-hwdb \
+        --disable-keymap \
         --disable-introspection"
 }
 
-- 
2.20.1