fix unionfs-modules-bincache naming error. Fix directory change error on unionfs

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@237 67a159dc-881f-0410-a524-ba9dfbe2cb84
cleanup-cruft
Eric Edgar 20 years ago
parent 28f45d727f
commit 3cbbcee9c5

@ -274,14 +274,15 @@ compile_unionfs_modules() {
# Setup the kernel sources to compile modules # Setup the kernel sources to compile modules
cd ${KERNEL_DIR} cd ${KERNEL_DIR}
compile_generic "modules_prepare" kernel compile_generic "modules_prepare" kernel
cd "${TEMP}"
cd "${UNIONFS_DIR}" cd "${UNIONFS_DIR}"
compile_generic unionfs2.6 kernel compile_generic unionfs2.6 kernel
else else
compile_generic unionfs2.4 kernel compile_generic unionfs2.4 kernel
fi fi
print_info 1 'unionfs: >> Copying to cache...' print_info 1 'unionfs: >> Copying to cache...'
mkdir -p ${TEMP}/unionfs/lib/modules/${KV}/kernel/fs mkdir -p ${TEMP}/unionfs/lib/modules/${KV}/kernel/fs
if [ -f unionfs.ko ] if [ -f unionfs.ko ]
@ -289,12 +290,12 @@ compile_unionfs_modules() {
cp unionfs.ko ${TEMP}/unionfs/lib/modules/${KV}/kernel/fs cp unionfs.ko ${TEMP}/unionfs/lib/modules/${KV}/kernel/fs
else else
cp unionfs.o ${TEMP}/unionfs/lib/modules/${KV}/kernel/fs cp unionfs.o ${TEMP}/unionfs/lib/modules/${KV}/kernel/fs
fi fi
cd ${TEMP}/unionfs cd ${TEMP}/unionfs
/bin/tar -cjf "${UNIONFS_MODULES_BINCACHE}" . || /bin/tar -cjf "${UNIONFS_MODULES_BINCACHE}" . ||
gen_die 'Could not create unionfs modules binary cache' gen_die 'Could not create unionfs modules binary cache'
cd "${TEMP}" cd "${TEMP}"
rm -rf "${UNIONFS_DIR}" > /dev/null rm -rf "${UNIONFS_DIR}" > /dev/null
rm -rf unionfs > /dev/null rm -rf unionfs > /dev/null

@ -185,8 +185,6 @@ determine_real_args() {
UNIONFS_BINCACHE=`arch_replace "${UNIONFS_BINCACHE}"` UNIONFS_BINCACHE=`arch_replace "${UNIONFS_BINCACHE}"`
UNIONFS_MODULES_BINCACHE=`arch_replace "${UNIONFS_MODULES_BINCACHE}"` UNIONFS_MODULES_BINCACHE=`arch_replace "${UNIONFS_MODULES_BINCACHE}"`
UNIONFS_MODULES_BINCACHE=`kv_replace "${UNIONFS_MODULES_BINCACHE}"`
if [ "${CMD_BOOTSPLASH}" != '' ] if [ "${CMD_BOOTSPLASH}" != '' ]
then then
BOOTSPLASH=${CMD_BOOTSPLASH} BOOTSPLASH=${CMD_BOOTSPLASH}
@ -360,6 +358,7 @@ determine_real_args() {
else else
DMRAID=0 DMRAID=0
fi fi
#get_KV has to be last
get_KV get_KV
UNIONFS_MODULES_BINCACHE=`kv_replace "${UNIONFS_MODULES_BINCACHE}"`
} }

Loading…
Cancel
Save