aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-12-06 16:06:00 -0800
committerKoen Kooi <koen.kooi@linaro.org>2013-12-09 14:25:16 +0100
commit9865e69bf1ec264608a99678b262f7ab5c1ee754 (patch)
tree03ffcebca000a3055015468a2816af4d2b9112a7
parent4812a8b20c095acb9669411e440dd62e927bd152 (diff)
downloadmeta-linaro-9865e69bf1ec264608a99678b262f7ab5c1ee754.tar.gz
gcc-linaro: Re-arrage include to avoid duplicate inclusion warnings
Fixes warning like WARNING: Duplicate inclusion for /home/kraj/work/angstrom-repo/sources/meta-linaro/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-common-4.7.inc in /home/kraj/work/angstrom-repo/sources/meta-linaro/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross_linaro-4.7.bb bitbake is now able to flag duplicate includes in recipes this patch fixes the warnings like that posing from meta-linaro Change-Id: Ie4f020e346859a028410bbbbce5a8cb30225251f Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-4.7.bb3
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-4.8.bb3
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross_linaro-4.7.bb3
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross_linaro-4.8.bb3
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7.inc3
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.8.inc2
6 files changed, 10 insertions, 7 deletions
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-4.7.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-4.7.bb
index d0ec13f2..c51f81e7 100644
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-4.7.bb
+++ b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-4.7.bb
@@ -1,2 +1,3 @@
-require gcc-linaro-common-4.7.inc
+BASEPV = "4.7"
+PV = "linaro-${BASEPV}"
require recipes-devtools/gcc/gcc-cross-initial_${BASEPV}.bb
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-4.8.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-4.8.bb
index ad9420d7..c13cecff 100644
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-4.8.bb
+++ b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-4.8.bb
@@ -1,2 +1,3 @@
-require gcc-linaro-common-4.8.inc
+BASEPV = "4.8"
+PV = "linaro-${BASEPV}"
require recipes-devtools/gcc/gcc-cross-initial_${BASEPV}.bb
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross_linaro-4.7.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross_linaro-4.7.bb
index 0ecec160..d91b6562 100644
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross_linaro-4.7.bb
+++ b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross_linaro-4.7.bb
@@ -1,2 +1,3 @@
-require gcc-linaro-common-4.7.inc
+BASEPV = "4.7"
+PV = "linaro-${BASEPV}"
require recipes-devtools/gcc/gcc-cross_${BASEPV}.bb
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross_linaro-4.8.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross_linaro-4.8.bb
index 9c45a1df..05de58bd 100644
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross_linaro-4.8.bb
+++ b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross_linaro-4.8.bb
@@ -1,2 +1,3 @@
-require gcc-linaro-common-4.8.inc
+BASEPV = "4.8"
+PV = "linaro-${BASEPV}"
require recipes-devtools/gcc/gcc-cross_${BASEPV}.bb
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7.inc b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7.inc
index dbe4146e..258a7e50 100644
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7.inc
+++ b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7.inc
@@ -1,6 +1,5 @@
require recipes-devtools/gcc/gcc-4.7.inc
-require gcc-linaro-common-4.7.inc
-
+PV = "linaro-${BASEPV}"
MMYY = "13.11"
RELEASE = "20${MMYY}"
PR = "r${RELEASE}"
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.8.inc b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.8.inc
index dfd1f55c..53d24d82 100644
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.8.inc
+++ b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.8.inc
@@ -1,5 +1,5 @@
require recipes-devtools/gcc/gcc-4.8.inc
-require gcc-linaro-common-4.8.inc
+PV = "linaro-${BASEPV}"
MMYY = "13.11"
RELEASE = "20${MMYY}"