From 4aa3eb3449ef580152c1a199a2bd6fc185b05a4e Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Mon, 6 Oct 2014 19:25:56 -0400
Subject: [PATCH] Fix invalid installation of udev libs to /lib

---
 stage1/bootscripts/udev | 10 +++++-----
 stage1/hv-install-2     |  4 +---
 stage1/pkg/eudev        | 19 ++++++-------------
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/stage1/bootscripts/udev b/stage1/bootscripts/udev
index 12527a5..18baaa1 100644
--- a/stage1/bootscripts/udev
+++ b/stage1/bootscripts/udev
@@ -3,7 +3,7 @@
 # udev
 # Udev cold-plugging script
 
-DAEMON=/sbin/udevd
+DAEMON=/tools/sbin/udevd
 DAEMON_DESC=UDEV
 DAEMON_OPTS="--daemon"
 
@@ -18,11 +18,11 @@ udev_coldplug()
     mkdir -p /dev/udev/queue &&
 
     # Configure all devices
-    /sbin/udevadm trigger --action=add --type=subsystems &&
-    /sbin/udevadm trigger --action=add --type=devices &&
+    /tools/sbin/udevadm trigger --action=add --type=subsystems &&
+    /tools/sbin/udevadm trigger --action=add --type=devices &&
 
     # Now wait for udevd to process the uevents we triggered
-    /sbin/udevadm settle
+    /tools/sbin/udevadm settle
 }
 
 udev_start()
@@ -42,7 +42,7 @@ case "$1" in
 	    boot_failure "FAILURE: Unable to create devices without a SysFS filesystem."
         fi
 
-	cmd_run_log_box "Copying static /dev entries" cp --preserve=all --recursive --remove-destination /lib/udev/devices/* /dev
+	cmd_run_log_box "Copying static /dev entries" cp --preserve=all --recursive --remove-destination /tools/lib/udev/devices/* /dev
 	cmd_run_log_box "Setting permissons on /dev/shm" chmod 1777 /dev/shm
 
 	cmd_run_log_box_warn "${DAEMON_DESC} start" udev_start
diff --git a/stage1/hv-install-2 b/stage1/hv-install-2
index 467109d..1411a4e 100755
--- a/stage1/hv-install-2
+++ b/stage1/hv-install-2
@@ -63,9 +63,7 @@ ipkg ${SHADOW} "\
 ipkg ${E2FSPROGS}
 ipkg -m noac ${SYSVINIT}
 ipkg ${KMOD}
-
-LDFLAGS="-Wl,-rpath,/tools/lib:/lib" \
-    ipkg ${EUDEV}
+ipkg ${EUDEV}
 ipkg -c -m noac ${KERNEL}
 
 rscr once "Creating default users" create-users
diff --git a/stage1/pkg/eudev b/stage1/pkg/eudev
index 5335593..f2baecd 100644
--- a/stage1/pkg/eudev
+++ b/stage1/pkg/eudev
@@ -4,28 +4,21 @@ hvconfig_pre()
 {
     # --disable-keymap: to remove gperf dependency
 
-    CONFIGURE_OPTS="\
-        --prefix=${LFS} \
-        --with-sysroot=${LFS} \
-        --build=${CLFS_HOST} \
-        --host=${CLFS_TARGET} \
-        --bindir=${LFS}/sbin \
-        --datarootdir=${LFS}/usr/share \
-        --includedir=${LFS}/usr/include \
+    CONFIGURE_OPTS+="\
         --disable-introspection \
         --disable-gtk-doc-html \
         --disable-gudev \
         --disable-keymap \
-        --with-firmware-path=/lib/firmware \
+        --with-firmware-path=/tools/lib/firmware \
         --enable-libkmod"
 }
 
 hvbuild_post()
 {
-    install -dv ${LFS}/lib/{firmware,udev/devices/{pts,shm}}
+    install -dv ${LFS}/tools/lib/{firmware,udev/devices/{pts,shm}}
 
     # Move udev pkgconfig file to /usr
-    install -dv ${LFS}/usr/lib/pkgconfig
-    mv ${LFS}/lib/pkgconfig/libudev.pc ${LFS}/usr/lib/pkgconfig
-    rmdir --ignore-fail-on-non-empty ${LFS}/lib/pkgconfig
+    #install -dv ${LFS}/usr/lib/pkgconfig
+    #mv ${LFS}/lib/pkgconfig/libudev.pc ${LFS}/usr/lib/pkgconfig
+    #rmdir --ignore-fail-on-non-empty ${LFS}/lib/pkgconfig
 }
-- 
2.20.1