Skip to contentSkip to conversation

kobs-ng: rename patch to comply to convention

PATCH New Sergey Alyoshin 3 participants 8 messages Oct 23, 2013 – Oct 27, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 kobs-ng: rename patch to comply to convention

---
 ...obs-ng-fix-mtd-defines.patch => kobs-ng-0001-fix-mtd-defines.patch} |    0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/kobs-ng/{kobs-ng-fix-mtd-defines.patch => kobs-ng-0001-fix-mtd-defines.patch} (100%)
package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch renamed from package/kobs-ng/kobs-ng-fix-mtd-defines.patch +0 -0
similarity index 100%
rename from package/kobs-ng/kobs-ng-fix-mtd-defines.patch
rename to package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 2/2 kobs-ng: test kernel version for redefines

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.

---
 package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch +5 -6
index 39d7474..4a9a626 100644
@@ -56,16 +56,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, 1, 0)
++# define MTD_MODE_NORMAL MTD_FILE_MODE_NORMAL
++# define MTD_MODE_RAW MTD_FILE_MODE_RAW
 +#endif
 +
  //------------------------------------------------------------------------------
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 2/2 kobs-ng: test kernel version for redefines

Hi Sergey,

package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch

Quoted 24 lines · Sergey Alyoshin

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.

---
 package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch +0 -0
index 39d7474..4a9a626 100644

Since you're changing a patch written by Paul Henson, I think you should add your Signed-off-by: line also after his, inside the patch. Otherwise it would seem that Paul Henson wrote your changes.

Quoted 7 lines
package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch +1 -1
@@ -56,16 +56,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"

package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch 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 · line 65

Quoted 10 lines
package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch +2 -5
  #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, 1, 0)

Are you sure about this check?
If I look at the Free Electrons LXR, linux 3.1 still used MTD_MODE_NORMAL, while 3.2 has MTD_FILE_MODE_NORMAL.
http://lxr.free-electrons.com/source/include/mtd/mtd-abi.h?v=3.1

I haven't checked the versions in between (3.1.1, 3.1.2, etc.). Could you verify what is the right check?

package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch 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 · line 67

Quoted 2 lines
package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch +2 -0
++# define MTD_MODE_NORMAL MTD_FILE_MODE_NORMAL
++# define MTD_MODE_RAW MTD_FILE_MODE_RAW

Best regards,
Thomas

#3 lore raw

PATCH 2/2 kobs-ng: test kernel version for redefines

Quoted 3 lines · Thomas De Schampheleire

Since you're changing a patch written by Paul Henson, I think you should add your Signed-off-by: line also after his, inside the patch. Otherwise it would seem that Paul Henson wrote your changes.

I will add it.

Quoted 23 lines
Quoted 7 lines
package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch +1 -1
@@ -56,16 +56,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"

package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch 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 · line 65

Quoted 10 lines
package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch +2 -5
  #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, 1, 0)

Are you sure about this check?
If I look at the Free Electrons LXR, linux 3.1 still used MTD_MODE_NORMAL, while 3.2 has MTD_FILE_MODE_NORMAL.
http://lxr.free-electrons.com/source/include/mtd/mtd-abi.h?v=3.1

Quoted 2 lines

I haven't checked the versions in between (3.1.1, 3.1.2, etc.). Could you verify what is the right check?

My mistake, git commit beb133fc165e1289c858d8f952b982b7d0b313cd is from 3.2.0, not in any 3.1.x

Updated patch will be follow.

#4 lore raw

PATCH 2/2 kobs-ng: test kernel version for redefines

In reply to Sergey Alyoshin

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.

---
 package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch +6 -6
index 39d7474..3ffba71 100644
@@ -3,6 +3,7 @@ MEMSETOOBSEL. Allow code to work with both older and newer kernel
 versions.
 
 Signed-off-by: Paul B. Henson <[email protected]>
+Signed-off-by: Sergey Alyoshin <[email protected]>
 
 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
 +
  //------------------------------------------------------------------------------
Signature · 1 line
1.7.10.4
#5 lore raw

PATCH 2/2 kobs-ng: test kernel version for redefines

Quoted 13 lines · Sergey Alyoshin

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)

Quoted 7 lines

Do kernel version test before enum redefines.

---
 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:

(compile-tested with 2.6.36, 3.1.11 and 3.2 kernel headers)

#6 lore raw

PATCH 1/2 kobs-ng: rename patch to comply to convention

In reply to Sergey Alyoshin

package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch

Quoted 11 lines · Sergey Alyoshin
---
 ...obs-ng-fix-mtd-defines.patch => kobs-ng-0001-fix-mtd-defines.patch} |    0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/kobs-ng/{kobs-ng-fix-mtd-defines.patch => kobs-ng-0001-fix-mtd-defines.patch} (100%)
package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch renamed from package/kobs-ng/kobs-ng-fix-mtd-defines.patch +0 -0
similarity index 100%
rename from package/kobs-ng/kobs-ng-fix-mtd-defines.patch
rename to package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch