From: Timothy Manning <tfhmanning@gmail.com>
Date: Wed, 6 Oct 2010 01:55:37 +0000 (+1300)
Subject: Merge branch 'python_play'
X-Git-Tag: pre-name-change~1
X-Git-Url: https://yaffs.net/gitweb/?a=commitdiff_plain;h=29670f031af07612737ffe6f6066859e89b67708;hp=6aacb9c19734f42df0bfedff962fb231793c6423;p=yaffs2.git

Merge branch 'python_play'
---

diff --git a/patch-ker.sh b/patch-ker.sh
index 4393e8d..5894087 100755
--- a/patch-ker.sh
+++ b/patch-ker.sh
@@ -56,6 +56,14 @@ if [ $MULTIORSINGLE = m ]; then
    VFSGLUE="yaffs_vfs_multi.c"
 elif [ $MULTIORSINGLE = s ]; then
    VFSGLUE="yaffs_vfs.c"
+   echo ""
+   echo "*** Warning ***"
+   echo "You have chosen to use the single kernel variant of the yaffs VFS glue code"
+   echo "that only works with the latest Linux kernel tree. If you are using an older"
+   echo "version of Linux then you probably wanted to use the multi-version variant by"
+   echo "re-running the patch-ker.sh script using m as a the second argument."
+   echo " ie $0 $COPYORLINK m $LINUXDIR"
+   echo ""
 else
    echo "unknown multi/single version selection"
    usage;
@@ -123,8 +131,8 @@ YAFFSDIR=$LINUXDIR/fs/yaffs2
 
 if [ -e $YAFFSDIR ]
 then
-   echo "$YAFFSDIR exists, not patching."
-   echo "If you want to replace what is already there then delete $YAFFSDIR"
+   echo "$YAFFSDIR exists, so not patching. If you want to replace what is"
+   echo "already there then delete $YAFFSDIR and re-run this script"
    echo " eg.  \"rm -rf $YAFFSDIR\" "
 else
    mkdir $LINUXDIR/fs/yaffs2