projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Adre's patch for Linux 4.9
[yaffs2.git]
/
patch-ker.sh
diff --git
a/patch-ker.sh
b/patch-ker.sh
index 41c50890b9452e15125f55d7f8034c55b81372b9..3da6925fd42163b92c6b26cf4e1a66b397e4accb 100755
(executable)
--- a/
patch-ker.sh
+++ b/
patch-ker.sh
@@
-54,16
+54,14
@@
fi
if [ $MULTIORSINGLE = m ]; then
VFS_CODE="yaffs_vfs_multi.c"
if [ $MULTIORSINGLE = m ]; then
VFS_CODE="yaffs_vfs_multi.c"
- MTD1_CODE="yaffs_mtdif1_multi.c"
- MTD2_CODE="yaffs_mtdif2_multi.c"
+ MTD_CODE="yaffs_mtdif_multi.c"
YPORTENV="yportenv_multi.h"
YPORTENV="yportenv_multi.h"
- KCONFIG="Kconfig_multi"
+ KCONFIG
_SRC
="Kconfig_multi"
elif [ $MULTIORSINGLE = s ]; then
VFS_CODE="yaffs_vfs_single.c"
elif [ $MULTIORSINGLE = s ]; then
VFS_CODE="yaffs_vfs_single.c"
- MTD1_CODE="yaffs_mtdif1_single.c"
- MTD2_CODE="yaffs_mtdif2_single.c"
+ MTD_CODE="yaffs_mtdif_single.c"
YPORTENV="yportenv_single.h"
YPORTENV="yportenv_single.h"
- KCONFIG="Kconfig_single"
+ KCONFIG
_SRC
="Kconfig_single"
echo ""
echo "*** Warning ***"
echo ""
echo "*** Warning ***"
@@
-92,7
+90,7
@@
PATCHLEVEL=`grep -s PATCHLEVEL <$LINUXDIR/Makefile | head -n 1 | sed s/'PATCHLEV
SUBLEVEL=`grep -s SUBLEVEL <$LINUXDIR/Makefile | head -n 1 | sed s/'SUBLEVEL = '//`
# Can we handle this version?
SUBLEVEL=`grep -s SUBLEVEL <$LINUXDIR/Makefile | head -n 1 | sed s/'SUBLEVEL = '//`
# Can we handle this version?
-if [ $VERSION
-ne 2 -o $PATCHLEVEL -lt
6 ]
+if [ $VERSION
$PATCHLEVEL -lt 2
6 ]
then
echo "Cannot patch kernel version $VERSION.$PATCHLEVEL.$SUBLEVEL, must be 2.6.x or higher"
exit 1;
then
echo "Cannot patch kernel version $VERSION.$PATCHLEVEL.$SUBLEVEL, must be 2.6.x or higher"
exit 1;
@@
-144,16
+142,15
@@
then
echo "already there then delete $YAFFSDIR and re-run this script"
echo " eg. \"rm -rf $YAFFSDIR\" "
else
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
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
$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/yaffs_vfs*.c $LINUXDIR/fs/yaffs2/yaffs_mtdif*.c
rm $LINUXDIR/fs/yaffs2/yportenv*.h
rm $LINUXDIR/fs/yaffs2/moduleconfig.h
$CPY $PWD/$VFS_CODE $LINUXDIR/fs/yaffs2/yaffs_vfs.c
rm $LINUXDIR/fs/yaffs2/yportenv*.h
rm $LINUXDIR/fs/yaffs2/moduleconfig.h
$CPY $PWD/$VFS_CODE $LINUXDIR/fs/yaffs2/yaffs_vfs.c
- $CPY $PWD/$MTD1_CODE $LINUXDIR/fs/yaffs2/yaffs_mtdif1.c
- $CPY $PWD/$MTD2_CODE $LINUXDIR/fs/yaffs2/yaffs_mtdif2.c
+ $CPY $PWD/$MTD_CODE $LINUXDIR/fs/yaffs2/yaffs_mtdif.c
$CPY $PWD/$YPORTENV $LINUXDIR/fs/yaffs2/yportenv.h
fi
$CPY $PWD/$YPORTENV $LINUXDIR/fs/yaffs2/yportenv.h
fi