X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage1%2Fpkg%2Futil-linux;h=83ec82464cce64e15579cc4f3dff61d115c984b6;hb=fc7d8c678ca78bef7c6e7eaeeb579269b7c501be;hp=079a34355b4cef9b1056fefa9ef93d22afe1836e;hpb=16f1a75d215e027ad746fc60dd10cd456f07f8d6;p=hvlinux.git

diff --git a/stage1/pkg/util-linux b/stage1/pkg/util-linux
index 079a343..83ec824 100644
--- a/stage1/pkg/util-linux
+++ b/stage1/pkg/util-linux
@@ -1,29 +1,30 @@
 #!/bin/bash
 
-hvconfig_pre()
+# The following cache entries set the values for tests that do not run while
+# cross-compiling:
+hvconfig_cache()
 {
-    CONFIGURE_OPTS="\
-        --build=${CLFS_HOST} \
-        --host=${CLFS_TARGET} \
-        --enable-login-utils \
-        --disable-makeinstall-chown"
-}
-
-hvbuild()
-{
-    ${HVMAKE}
-    ${HVMAKE} DESTDIR=${LFS} install
+cat > ${BUILD_DIR}/config.cache << EOF
+scanf_cv_type_modifier=as
+EOF
 }
 
 hvbuild_post()
 {
-    # Copy Libraries and includes to /tools:
-    rm -fv ${LFS}/usr/lib/lib{blkid,uuid}.la
-    cp -v ${LFS}/usr/lib/lib{blkid,uuid}* /tools/lib
-    cp -v ${LFS}/lib/lib{blkid,uuid}* /tools/lib
-    ln -sfvT libblkid.so.1.1.0 /tools/lib/libblkid.so
-    ln -sfvT libuuid.so.1.3.0 /tools/lib/libuuid.so
-    install -dv /tools/include/{blkid,uuid}
-    cp -av ${LFS}/usr/include/blkid/* /tools/include/blkid/
-    cp -av ${LFS}/usr/include/uuid/* /tools/include/uuid/
+    # Create needed symlinks in sbin for a bootable system:
+    LINKS="agetty blkid fsck"
+
+    for link in ${LINKS}; do
+        ln -svfT /tools/sbin/${link} ${LFS}/sbin/${link}
+    done
+
+    # Create needed symlinks in bin for a bootable system:
+    LINKS="dmesg login mount"
+
+    for link in ${LINKS}; do
+        ln -svfT /tools/bin/${link} ${LFS}/bin/${link}
+    done
+
+    sed -i -e "s@ /tools/lib/libuuid.la@ ${TOOLS_DIR}/lib/libuuid.la@" \
+        ${TOOLS_DIR}/lib/libblkid.la
 }