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

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

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index a5eac73ba40292110a5f8f50f2cde54346443ec6..29a1832b95d45cb0dc2080ed71b71a4ee73f7f54 100644 (file)
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -185,8 +185,6 @@ determine_real_args() {
        UNIONFS_BINCACHE=`arch_replace "${UNIONFS_BINCACHE}"`
        UNIONFS_MODULES_BINCACHE=`arch_replace "${UNIONFS_MODULES_BINCACHE}"`
        
-       UNIONFS_MODULES_BINCACHE=`kv_replace "${UNIONFS_MODULES_BINCACHE}"`
-       
        if [ "${CMD_BOOTSPLASH}" != '' ]
        then
                BOOTSPLASH=${CMD_BOOTSPLASH}
@@ -360,6 +358,7 @@ determine_real_args() {
        else
                DMRAID=0
        fi
-       #get_KV has to be last
+       
        get_KV
+       UNIONFS_MODULES_BINCACHE=`kv_replace "${UNIONFS_MODULES_BINCACHE}"`
 }