on master, move linux patches under newly created files subdirectory

PATCH In review Bob Cochran 3 participants 4 messages Jan 7, 2013

Share & tools

Bob Cochran

author

2013-01-07 15:39 UTC #0 lore raw

PATCH 1/1 on master, move linux patches under newly created files subdirectory

As I reported back on 11/27, I get linux-qoriq-sdk-headers build errors with the linux patch files located in meta-fsl-ppc/recipes-kernel/linux.
Therefore, I created a files subdirectioy and moved the patch files
under there.

Signed-off-by Robert Cochran <[email protected]>

---
 ...Undef-before-redefining-__attribute_const.patch |   28 -------------
 ...-build-dependencies-for-c-files-requiring.patch |   44 
--------------------
 ...Undef-before-redefining-__attribute_const.patch |   28 +++++++++++++
 ...-build-dependencies-for-c-files-requiring.patch |   44 
++++++++++++++++++++
 4 files changed, 72 insertions(+), 72 deletions(-)
 delete mode 100644 
recipes-kernel/linux/0001-compiler.h-Undef-before-redefining-__attribute_const.patch
 delete mode 100644 
recipes-kernel/linux/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch
 create mode 100644 
recipes-kernel/linux/files/0001-compiler.h-Undef-before-redefining-__attribute_const.patch
 create mode 100644

recipes-kernel/linux/files/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch

recipes-kernel/linux/0001-compiler.h-Undef-before-redefining-__attribute_const.patch deleted +0 ~~-28~~

deleted file mode 100644
index 597fd3b..0000000
@@ -1,28 +0,0 @@
-From 6f92ab6de9d8daeb575949bbbcbc7bcdcebc60af Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem at gmail.com>
-Date: Thu, 5 Jan 2012 11:42:35 -0800
-Subject: [PATCH] compiler.h: Undef before redefining __attribute_const__
-
-This is required to avoid warnings like
-util/include/linux/compiler.h:8:0: error: "__attribute_const__" redefined [-Werror]
-
-Signed-off-by: Khem Raj <raj.khem at gmail.com>
----
- tools/perf/util/include/linux/compiler.h |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
---- a/tools/perf/util/include/linux/compiler.h
-+++ b/tools/perf/util/include/linux/compiler.h
-@@ -4,9 +4,11 @@
- #ifndef __always_inline
- #define __always_inline	inline
- #endif
-+#undef __user
- #define __user
-+#undef __attribute_const__
- #define __attribute_const__
--
-+#undef __used
- #define __used		__attribute__((__unused__))
-
- #endif

recipes-kernel/linux/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch deleted +0 ~~-44~~

44 lines not on this page · raw message

recipes-kernel/linux/files/0001-compiler.h-Undef-before-redefining-__attribute_const.patch new file +28 -0

new file mode 100644
index 0000000..597fd3b
@@ -0,0 +1,28 @@
+From 6f92ab6de9d8daeb575949bbbcbc7bcdcebc60af Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem at gmail.com>
+Date: Thu, 5 Jan 2012 11:42:35 -0800
+Subject: [PATCH] compiler.h: Undef before redefining __attribute_const__
+
+This is required to avoid warnings like
+util/include/linux/compiler.h:8:0: error: "__attribute_const__" redefined [-Werror]
+
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+---
+ tools/perf/util/include/linux/compiler.h |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+--- a/tools/perf/util/include/linux/compiler.h
++++ b/tools/perf/util/include/linux/compiler.h
+@@ -4,9 +4,11 @@
+ #ifndef __always_inline
+ #define __always_inline	inline
+ #endif
++#undef __user
+ #define __user
++#undef __attribute_const__
+ #define __attribute_const__
+-
++#undef __used
+ #define __used		__attribute__((__unused__))
+
+ #endif

recipes-kernel/linux/files/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch new file +44 -0

44 lines not on this page · raw message

Signature · 1 line

1.7.9.5

Otavio Salvador

2013-01-07 17:06 UTC #1 lore raw

Quoted 6 lines · Bob Cochran

As I reported back on 11/27, I get linux-qoriq-sdk-headers build errors with the linux patch files located in meta-fsl-ppc/recipes-kernel/linux. Therefore, I created a files subdirectioy and moved the patch files under there.
Signed-off-by Robert Cochran <[email protected]>

'As I reported ...' is not a good commit log. The commit log is to explain why something is changed so I'd use something like:

--3<--
linux-qoriq-sdk-headers: Fix build error due wrong patch path

The patch files need to be in the bitbake fetch patch otherwise it won't be found during the build. We move the files to the 'files' directory fixing the fetch error.

Signed-off-by ...
--3<--

And you should check the commit log of the uboot fix as well.

--
Otavio Salvador O.S. Systems
E-mail: [email protected] http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br

McClintock Matthew-B29882

2013-01-07 20:14 UTC #2 lore raw

In reply to Bob Cochran

Quoted 4 lines · Bob Cochran

As I reported back on 11/27, I get linux-qoriq-sdk-headers build errors with the linux patch files located in meta-fsl-ppc/recipes-kernel/linux. Therefore, I created a files subdirectioy and moved the patch files under there.

This is in master-next...

http://git.yoctoproject.org/cgit/cgit.cgi/meta-fsl-ppc/commit/?h=master-next&id=88c9c66b588346143a2277f119f78bb2e82e3db3

I'm sorry I've not tested and pushed to master but I've had serious issues with our build machines and testing the builds, between that and holiday vacation. Progress is being made again.

-M

Quoted 213 lines

Signed-off-by Robert Cochran <[email protected]>
---
 ...Undef-before-redefining-__attribute_const.patch |   28 -------------
 ...-build-dependencies-for-c-files-requiring.patch |   44
--------------------
 ...Undef-before-redefining-__attribute_const.patch |   28 +++++++++++++
 ...-build-dependencies-for-c-files-requiring.patch |   44
++++++++++++++++++++
 4 files changed, 72 insertions(+), 72 deletions(-)
 delete mode 100644
recipes-kernel/linux/0001-compiler.h-Undef-before-redefining-__attribute_const.patch
 delete mode 100644
recipes-kernel/linux/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch
 create mode 100644
recipes-kernel/linux/files/0001-compiler.h-Undef-before-redefining-__attribute_const.patch
 create mode 100644
recipes-kernel/linux/files/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch
diff --git a/recipes-kernel/linux/0001-compiler.h-Undef-before-redefining-__attribute_const.patch b/recipes-kernel/linux/0001-compiler.h-Undef-before-redefining-__attribute_const.patch deleted file mode 100644
index 597fd3b..0000000
---
a/recipes-kernel/linux/0001-compiler.h-Undef-before-redefining-__attribute_const.patch +++ /dev/null
recipes-kernel/linux/0001-compiler.h-Undef-before-redefining-__attribute_const.patch deleted +0 -7
@@ -1,28 +0,0 @@
-From 6f92ab6de9d8daeb575949bbbcbc7bcdcebc60af Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem at gmail.com>
-Date: Thu, 5 Jan 2012 11:42:35 -0800
-Subject: [PATCH] compiler.h: Undef before redefining __attribute_const__
-
-This is required to avoid warnings like
-util/include/linux/compiler.h:8:0: error: "__attribute_const__" redefined
[-Werror]
recipes-kernel/linux/0001-compiler.h-Undef-before-redefining-__attribute_const.patch deleted +0 ~~-21~~
-
-Signed-off-by: Khem Raj <raj.khem at gmail.com>
----
- tools/perf/util/include/linux/compiler.h |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
---- a/tools/perf/util/include/linux/compiler.h
-+++ b/tools/perf/util/include/linux/compiler.h
-@@ -4,9 +4,11 @@
- #ifndef __always_inline
- #define __always_inline       inline
- #endif
-+#undef __user
- #define __user
-+#undef __attribute_const__
- #define __attribute_const__
--
-+#undef __used
- #define __used                __attribute__((__unused__))
-
- #endif
diff --git a/recipes-kernel/linux/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch b/recipes-kernel/linux/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch deleted file mode 100644
index d3464fb..0000000
---
a/recipes-kernel/linux/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch +++ /dev/null
recipes-kernel/linux/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch deleted +0 ~~-22~~
@@ -1,44 +0,0 @@
-Upstream-Status: Pending
-
-From 2e7ffea0c0c09c6d9219d604e0351423f43844f4 Mon Sep 17 00:00:00 2001
-From: Matthew McClintock <[email protected]>
-Date: Thu, 6 Sep 2012 13:45:21 -0500
-Subject: powerpc: Fix build dependencies for c files requiring libfdt.h
-
-Several files in obj-plat depend on libfdt header file. Sometimes
-when building one can see the following issue. This patch adds
-libfdt as dependency to those object files
-
-| In file included from arch/powerpc/boot/treeboot-iss4xx.c:33:0:
-| arch/powerpc/boot/libfdt.h:854:1: error: unterminated comment
-| In file included from arch/powerpc/boot/treeboot-iss4xx.c:33:0:
-| arch/powerpc/boot/libfdt.h:1:0: error: unterminated #ifndef
-|   BOOTCC  arch/powerpc/boot/inffast.o
-| make[1]: *** [arch/powerpc/boot/treeboot-iss4xx.o] Error 1
-| make[1]: *** Waiting for unfinished jobs....
-|   BOOTCC  arch/powerpc/boot/inflate.o
-| make: *** [uImage] Error 2
-| ERROR: oe_runmake failed
-| ERROR: Function failed: do_compile (see
/srv/home/pokybuild/yocto-autobuilder/yocto-slave/p1022ds/build/build/tmp/work/p1022ds-poky-linux-gnuspe/linux-qoriq-sdk-3.0.34-r5/temp/log.do_compile.2167 for further information)
recipes-kernel/linux/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch deleted +0 ~~-19~~
-NOTE: recipe linux-qoriq-sdk-3.0.34-r5: task do_compile: Failed
-
-Signed-off-by: Matthew McClintock <[email protected]>
----
- arch/powerpc/boot/Makefile |    1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
-index b7d8333..6a15c96 100644
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -107,6 +107,7 @@ src-boot := $(addprefix $(obj)/, $(src-boot))
- obj-boot := $(addsuffix .o, $(basename $(src-boot)))
- obj-wlib := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-wlib))))
- obj-plat := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-plat))))
-+obj-plat: $(libfdt)
-
- quiet_cmd_copy_zlib = COPY    $@
-       cmd_copy_zlib = sed "s@__used@@;s@<linux/$[^>]*$.*@\"\1\"@" $< >
$@
---
-1.7.9.7
-
diff --git a/recipes-kernel/linux/files/0001-compiler.h-Undef-before-redefining-__attribute_const.patch b/recipes-kernel/linux/files/0001-compiler.h-Undef-before-redefining-__attribute_const.patch new file mode 100644
index 0000000..597fd3b
--- /dev/null
+++
b/recipes-kernel/linux/files/0001-compiler.h-Undef-before-redefining-__attribute_const.patch
recipes-kernel/linux/files/0001-compiler.h-Undef-before-redefining-__attribute_const.patch new file +7 -0
@@ -0,0 +1,28 @@
+From 6f92ab6de9d8daeb575949bbbcbc7bcdcebc60af Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem at gmail.com>
+Date: Thu, 5 Jan 2012 11:42:35 -0800
+Subject: [PATCH] compiler.h: Undef before redefining __attribute_const__
+
+This is required to avoid warnings like
+util/include/linux/compiler.h:8:0: error: "__attribute_const__" redefined
[-Werror]
recipes-kernel/linux/files/0001-compiler.h-Undef-before-redefining-__attribute_const.patch new file +21 -0
+
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+---
+ tools/perf/util/include/linux/compiler.h |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+--- a/tools/perf/util/include/linux/compiler.h
++++ b/tools/perf/util/include/linux/compiler.h
+@@ -4,9 +4,11 @@
+ #ifndef __always_inline
+ #define __always_inline       inline
+ #endif
++#undef __user
+ #define __user
++#undef __attribute_const__
+ #define __attribute_const__
+-
++#undef __used
+ #define __used                __attribute__((__unused__))
+
+ #endif
diff --git a/recipes-kernel/linux/files/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch b/recipes-kernel/linux/files/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch new file mode 100644
index 0000000..d3464fb
--- /dev/null
+++
b/recipes-kernel/linux/files/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch
recipes-kernel/linux/files/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch new file +22 -0
@@ -0,0 +1,44 @@
+Upstream-Status: Pending
+
+From 2e7ffea0c0c09c6d9219d604e0351423f43844f4 Mon Sep 17 00:00:00 2001
+From: Matthew McClintock <[email protected]>
+Date: Thu, 6 Sep 2012 13:45:21 -0500
+Subject: powerpc: Fix build dependencies for c files requiring libfdt.h
+
+Several files in obj-plat depend on libfdt header file. Sometimes
+when building one can see the following issue. This patch adds
+libfdt as dependency to those object files
+
+| In file included from arch/powerpc/boot/treeboot-iss4xx.c:33:0:
+| arch/powerpc/boot/libfdt.h:854:1: error: unterminated comment
+| In file included from arch/powerpc/boot/treeboot-iss4xx.c:33:0:
+| arch/powerpc/boot/libfdt.h:1:0: error: unterminated #ifndef
+|   BOOTCC  arch/powerpc/boot/inffast.o
+| make[1]: *** [arch/powerpc/boot/treeboot-iss4xx.o] Error 1
+| make[1]: *** Waiting for unfinished jobs....
+|   BOOTCC  arch/powerpc/boot/inflate.o
+| make: *** [uImage] Error 2
+| ERROR: oe_runmake failed
+| ERROR: Function failed: do_compile (see
/srv/home/pokybuild/yocto-autobuilder/yocto-slave/p1022ds/build/build/tmp/work/p1022ds-poky-linux-gnuspe/linux-qoriq-sdk-3.0.34-r5/temp/log.do_compile.2167 for further information)
recipes-kernel/linux/files/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch new file +19 -0
+NOTE: recipe linux-qoriq-sdk-3.0.34-r5: task do_compile: Failed
+
+Signed-off-by: Matthew McClintock <[email protected]>
+---
+ arch/powerpc/boot/Makefile |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
+index b7d8333..6a15c96 100644
+--- a/arch/powerpc/boot/Makefile
++++ b/arch/powerpc/boot/Makefile
+@@ -107,6 +107,7 @@ src-boot := $(addprefix $(obj)/, $(src-boot))
+ obj-boot := $(addsuffix .o, $(basename $(src-boot)))
+ obj-wlib := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-wlib))))
+ obj-plat := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-plat))))
++obj-plat: $(libfdt)
+
+ quiet_cmd_copy_zlib = COPY    $@
+       cmd_copy_zlib = sed "s@__used@@;s@<linux/$[^>]*$.*@\"\1\"@" $< >
$@
+--
+1.7.9.7
+
--
1.7.9.5
_______________________________________________
meta-freescale mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-freescale

Bob Cochran

author

2013-01-07 20:40 UTC #3 lore raw

Quoted 8 lines · On 01/07/2013 03:14 PM, McClintock Matthew-B29882 wrote:

Quoted 4 lines · Bob Cochran
As I reported back on 11/27, I get linux-qoriq-sdk-headers build errors with the linux patch files located in meta-fsl-ppc/recipes-kernel/linux. Therefore, I created a files subdirectioy and moved the patch files under there.
This is in master-next...

Quoted 9 lines

http://git.yoctoproject.org/cgit/cgit.cgi/meta-fsl-ppc/commit/?h=master-next&id=88c9c66b588346143a2277f119f78bb2e82e3db3
I'm sorry I've not tested and pushed to master but I've had serious issues with our build machines and testing the builds, between that and holiday vacation. Progress is being made again.
-M

Thanks Matthew. I'm glad to hear master will be moving along again.

I have what seems like more than one problem getting Master to make it through the init sequence on my p1010rdb. I'm working it in the margins, and I'll send something out if I discover something meaningful.