Correct unionfs-fuse bincache path and clean up debugging code

diff --git a/ChangeLog b/ChangeLog
index c90476d3ff37e33fdf7272d11a7a79bb96186262..371a73aa65521c647e9117ee8cb17832f4495499 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney
 # Distributed under the GPL v2
 
+  13 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> gen_compile.sh,
+  gen_initramfs.sh:
+  Correct unionfs-fuse bincache path and clean up debugging code
+
   13 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> gen_compile.sh:
   Add -L line into LIB= in Makefile
 

diff --git a/gen_compile.sh b/gen_compile.sh
index 87cc28ecfa7584ad1b01d38f36e1e9d61aea9614..e10ad779841d3db74cf9dd4305c716a869cd0f7a 100644 (file)
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -562,15 +562,9 @@ compile_unionfs_fuse() {
                [ ! -d "${UNIONFS_FUSE_DIR}" ] &&
                        gen_die "unionfs-fuse directory ${UNIONFS_FUSE_DIR} invalid"
                cd "${UNIONFS_FUSE_DIR}"
-#              mkdir "fuse_tmp"
-#              cd "fuse_tmp"
-#              tar -zxpf "${FUSE_SRCTAR}"
-#              cd ..
                print_info 1 'unionfs-fuse: >> Compiling...'
                sed -i "/^\(CFLAGS\|CPPFLAGS\)/s:^\\(.*\\)$:\\1 -I${TEMP}/${FUSE_DIR}/include -L${TEMP}/${FUSE_DIR}/lib/.libs:" Makefile src/Makefile
                sed -i "/^LIB = /s:^LIB = \(.*\)$:LIB = -L${TEMP}/${FUSE_DIR}/lib/.libs \1:" Makefile src/Makefile
-               cat Makefile src/Makefile
-               bash
                MAKE=${UTILS_MAKE} compile_generic "" ""
                print_info 1 'unionfs-fuse: >> Copying to cache...'
                [ -f "${TEMP}/${UNIONFS_FUSE_DIR}/src/unionfs" ] ||

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index bd0ddf1fb6acfd645f5e587d097a0914e4fae8c1..0bd9e2105b6d3dce68eb0c4646a514d5a878a0d2 100644 (file)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -91,8 +91,8 @@ append_unionfs_fuse() {
                rm -r "${TEMP}/initramfs-unionfs-fuse-temp"
        fi
        cd ${TEMP}
-       mkdir -p "${TEMP}/initramfs-unionfs-fuse-temp/bin/"
-       bzip2 -dc "${UNIONFS_FUSE_BINCACHE}" > "${TEMP}/initramfs-uniwonfs-fuse-temp/bin/unionfs" ||
+       mkdir -p "${TEMP}/initramfs-unionfs-fuse-temp/sbin/"
+       bzip2 -dc "${UNIONFS_FUSE_BINCACHE}" > "${TEMP}/initramfs-unionfs-fuse-temp/sbin/unionfs" ||
                gen_die 'Could not extract unionfs-fuse binary cache!'
        cd "${TEMP}/initramfs-unionfs-fuse-temp/"
        find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"