| Message ID | 1382532900-18456-1-git-send-email-alyoshin.s@gmail.com |
|---|---|
| State | Accepted |
| Commit | fb995444b9b2ce3a38fbb1723151e9a923835da9 |
| Headers | show |
On Wed, Oct 23, 2013 at 2:55 PM, Sergey Alyoshin <alyoshin.s@gmail.com> wrote: > kobs-ng failed to build with 2.6.36, because enum tested with #ifndef > > mtd.c: In function 'mtd_open': > mtd.c:696:42: error: 'MTD_FILE_MODE_NORMAL' undeclared (first use in this > function) > mtd.c:696:42: note: each undeclared identifier is reported only once for each > function it appears in > mtd.c: In function 'mtd_set_ecc_mode': > mtd.c:896:43: error: 'MTD_FILE_MODE_NORMAL' undeclared (first use in this > function) > mtd.c:914:43: error: 'MTD_FILE_MODE_RAW' undeclared (first use in this > function) > > Do kernel version test before enum redefines. > > Signed-off-by: Sergey Alyoshin <alyoshin.s@gmail.com> > --- > package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > Normally, when you send a new version of a patch, one would mark it as 'v2' in the subject, and provide a quick summary of the changes with the previous version (below the '---' line). But as for the actual patch: Tested-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> (compile-tested with 2.6.36, 3.1.11 and 3.2 kernel headers)
diff --git a/package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch b/package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch index 39d7474..3ffba71 100644 --- a/package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch +++ b/package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch @@ -3,6 +3,7 @@ MEMSETOOBSEL. Allow code to work with both older and newer kernel versions. Signed-off-by: Paul B. Henson <henson@acm.org> +Signed-off-by: Sergey Alyoshin <alyoshin.s@gmail.com> diff -u -r kobs-ng-3.0.35-4.0.0-orig/src/mtd.c kobs-ng-3.0.35-4.0.0/src/mtd.c --- kobs-ng-3.0.35-4.0.0-orig/src/mtd.c 2012-12-17 22:37:40.000000000 -0800 @@ -56,16 +57,15 @@ diff -u -r kobs-ng-3.0.35-4.0.0-orig/src/mtd.c kobs-ng-3.0.35-4.0.0/src/mtd.c diff -u -r kobs-ng-3.0.35-4.0.0-orig/src/mtd.h kobs-ng-3.0.35-4.0.0/src/mtd.h --- kobs-ng-3.0.35-4.0.0-orig/src/mtd.h 2012-12-17 22:37:40.000000000 -0800 +++ kobs-ng-3.0.35-4.0.0/src/mtd.h 2013-07-28 19:33:57.000000000 -0700 -@@ -31,6 +31,14 @@ +@@ -31,6 +31,13 @@ #include "BootControlBlocks.h" #include "rom_nand_hamming_code_ecc.h" +// Newer kernel headers renamed define -+#ifndef MTD_MODE_NORMAL -+#define MTD_MODE_NORMAL MTD_FILE_MODE_NORMAL -+#endif -+#ifndef MTD_MODE_RAW -+#define MTD_MODE_RAW MTD_FILE_MODE_RAW ++#include <linux/version.h> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) ++# define MTD_MODE_NORMAL MTD_FILE_MODE_NORMAL ++# define MTD_MODE_RAW MTD_FILE_MODE_RAW +#endif + //------------------------------------------------------------------------------
kobs-ng failed to build with 2.6.36, because enum tested with #ifndef mtd.c: In function 'mtd_open': mtd.c:696:42: error: 'MTD_FILE_MODE_NORMAL' undeclared (first use in this function) mtd.c:696:42: note: each undeclared identifier is reported only once for each function it appears in mtd.c: In function 'mtd_set_ecc_mode': mtd.c:896:43: error: 'MTD_FILE_MODE_NORMAL' undeclared (first use in this function) mtd.c:914:43: error: 'MTD_FILE_MODE_RAW' undeclared (first use in this function) Do kernel version test before enum redefines. Signed-off-by: Sergey Alyoshin <alyoshin.s@gmail.com> --- package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)