[meta-freescale] [PATCH 27/27] linux-qoriq-sdk: move patches to default search path

Matthew McClintock msm at freescale.com
Thu Nov 29 11:15:51 PST 2012


Signed-off-by: Matthew McClintock <msm at freescale.com>
---
 ...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
@@ -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
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
@@ -1,44 +0,0 @@
-Upstream-Status: Pending
-
-From 2e7ffea0c0c09c6d9219d604e0351423f43844f4 Mon Sep 17 00:00:00 2001
-From: Matthew McClintock <msm at freescale.com>
-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)
-NOTE: recipe linux-qoriq-sdk-3.0.34-r5: task do_compile: Failed
-
-Signed-off-by: Matthew McClintock <msm at freescale.com>
----
- 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 at __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
@@ -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
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
@@ -0,0 +1,44 @@
+Upstream-Status: Pending
+
+From 2e7ffea0c0c09c6d9219d604e0351423f43844f4 Mon Sep 17 00:00:00 2001
+From: Matthew McClintock <msm at freescale.com>
+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)
+NOTE: recipe linux-qoriq-sdk-3.0.34-r5: task do_compile: Failed
+
+Signed-off-by: Matthew McClintock <msm at freescale.com>
+---
+ 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 at __used@@;s@<linux/\([^>]*\).*@\"\1\"@" $< > $@
+-- 
+1.7.9.7
+
-- 
1.7.9.7





More information about the meta-freescale mailing list