Add temporary hack for libtool when using DESTDIR in stage1

[hvlinux.git] / stage1 / pkg / util-linux

diff --git a/stage1/pkg/util-linux b/stage1/pkg/util-linux
index 1ff721f..83ec824 100644 (file)
--- a/stage1/pkg/util-linux
+++ b/stage1/pkg/util-linux
@@ -4,7 +4,27 @@
 # cross-compiling:
 hvconfig_cache()
 {
-cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF
+cat > ${BUILD_DIR}/config.cache << EOF
 scanf_cv_type_modifier=as
 EOF
 }
+
+hvbuild_post()
+{
+    # 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
+}