[Yaffs] PATCH: patch-ker.sh bug - overwriting $KCONFIG

Top Page
Attachments:
Message as email
+ (text/plain)
+ (text/html)
Delete this message
Reply to this message
Author: Skacore Systems
Date:  
To: yaffs
Subject: [Yaffs] PATCH: patch-ker.sh bug - overwriting $KCONFIG
Hello YAFFS,

There is a bug in the latest git's patch-ker.sh. which tries to use $KCONFIG
variable overwritten by some parts of the scripts
(KCONFIG=$LINUXDIR/fs/Kconfig).
The patch follows.

Vilo


--- ./patch-ker.sh      2011-04-19 13:26:52.000000000 +0200
+++ ../../sdk/Linux-2.6.39/yaffs2/patch-ker.sh  2011-05-10
13:44:37.000000000 +0200
@@ -57,13 +57,13 @@
    MTD1_CODE="yaffs_mtdif1_multi.c"
    MTD2_CODE="yaffs_mtdif2_multi.c"
    YPORTENV="yportenv_multi.h"
-   KCONFIG="Kconfig_multi"
+   KCONFIG_YAFFS="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_YAFFS="Kconfig_single"


    echo ""
    echo "*** Warning ***"
@@ -136,7 +136,7 @@


fi

-YAFFSDIR=$LINUXDIR/fs/yaffs2
+YAFFSDIR="$LINUXDIR/fs/yaffs2"

 if [ -e $YAFFSDIR ]
 then
@@ -147,7 +147,7 @@
    rm yaffs*.mod.c
    mkdir $LINUXDIR/fs/yaffs2
    $CPY  $PWD/Makefile.kernel $LINUXDIR/fs/yaffs2/Makefile
-   $CPY $PWD/$KCONFIG $LINUXDIR/fs/yaffs2/Kconfig
+   $CPY $PWD/$KCONFIG_YAFFS $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