From: agaffney <agaffney@kagome.(none)>
Date: Thu, 13 Nov 2008 04:30:17 +0000 (-0600)
Subject: Correct unionfs-fuse bincache path and clean up debugging code
X-Git-Tag: v3.4.10.902~28
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4123ac396c09f8ac535545facde5ee3521c95045;p=genkernel.git

Correct unionfs-fuse bincache path and clean up debugging code
---

diff --git a/ChangeLog b/ChangeLog
index c90476d..371a73a 100644
--- 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 87cc28e..e10ad77 100644
--- 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 bd0ddf1..0bd9e21 100644
--- 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}"