From: Charles Manning <cdhmanning@gmail.com>
Date: Thu, 12 May 2011 22:12:55 +0000 (+1200)
Subject: yaffs: Fix patch-ker.sh to handle Kconfigs properly.
X-Git-Tag: pre-driver-refactoring~41^2~9
X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=a608236b1929a912dea67fb2afc92784c4a454e7;ds=sidebyside

yaffs: Fix patch-ker.sh to handle Kconfigs properly.

Thanks to submitters for this.

Signed-off-by: Charles Manning <cdhmanning@gmail.com>
---

diff --git a/patch-ker.sh b/patch-ker.sh
index 41c5089..44152c8 100755
--- a/patch-ker.sh
+++ b/patch-ker.sh
@@ -57,13 +57,13 @@ if [ $MULTIORSINGLE = m ]; then
    MTD1_CODE="yaffs_mtdif1_multi.c"
    MTD2_CODE="yaffs_mtdif2_multi.c"
    YPORTENV="yportenv_multi.h"
-   KCONFIG="Kconfig_multi"
+   KCONFIG_SRC="Kconfig_multi"
 elif [ $MULTIORSINGLE = s ]; then
    VFS_CODE="yaffs_vfs_single.c"
    MTD1_CODE="yaffs_mtdif1_single.c"
    MTD2_CODE="yaffs_mtdif2_single.c"
    YPORTENV="yportenv_single.h"
-   KCONFIG="Kconfig_single"
+   KCONFIG_SRC="Kconfig_single"
 
    echo ""
    echo "*** Warning ***"
@@ -144,10 +144,10 @@ then
    echo "already there then delete $YAFFSDIR and re-run this script"
    echo " eg.  \"rm -rf $YAFFSDIR\" "
 else
-   rm yaffs*.mod.c
+   rm yaffs*.mod.c 2> /dev/null
    mkdir $LINUXDIR/fs/yaffs2
    $CPY  $PWD/Makefile.kernel $LINUXDIR/fs/yaffs2/Makefile
-   $CPY $PWD/$KCONFIG $LINUXDIR/fs/yaffs2/Kconfig
+   $CPY $PWD/$KCONFIG_SRC $LINUXDIR/fs/yaffs2/Kconfig
    $CPY $PWD/*.c $PWD/*.h  $LINUXDIR/fs/yaffs2
    rm $LINUXDIR/fs/yaffs2/yaffs_vfs*.c $LINUXDIR/fs/yaffs2/yaffs_mtdif[12]*.c
    rm $LINUXDIR/fs/yaffs2/yportenv*.h