Correct unionfs-fuse bincache path and clean up debugging code

cleanup-cruft
agaffney 16 years ago
parent 4e38e4d39b
commit 4123ac396c

@ -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

@ -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" ] ||

@ -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}"

Loading…
Cancel
Save