gcc: Clean up FILESDIR settings (move to gcc-common.inc)

diff --git a/packages/gcc/gcc-common.inc b/packages/gcc/gcc-common.inc
index b066434..36a491a 100644 (file)
--- a/packages/gcc/gcc-common.inc
+++ b/packages/gcc/gcc-common.inc
@@ -5,6 +5,8 @@ LICENSE = "GPL"
 
 inherit autotools gettext
 
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
+
 def get_gcc_fpu_setting(bb, d):
     if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
         return "--with-float=soft"

diff --git a/packages/gcc/gcc-cross-sdk_3.3.4.bb b/packages/gcc/gcc-cross-sdk_3.3.4.bb
index 2569a97..4f98905 100644 (file)
--- a/packages/gcc/gcc-cross-sdk_3.3.4.bb
+++ b/packages/gcc/gcc-cross-sdk_3.3.4.bb
@@ -4,8 +4,6 @@ PR = "r3"
 
 inherit sdk
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PACKAGES = "${PN}"
 

diff --git a/packages/gcc/gcc-cross-sdk_3.4.3.bb b/packages/gcc/gcc-cross-sdk_3.4.3.bb
index cb31e09..739c589 100644 (file)
--- a/packages/gcc/gcc-cross-sdk_3.4.3.bb
+++ b/packages/gcc/gcc-cross-sdk_3.4.3.bb
@@ -4,8 +4,6 @@ PR = "r1"
 
 inherit sdk
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PACKAGES = "${PN}"
 

diff --git a/packages/gcc/gcc-cross-sdk_3.4.4.bb b/packages/gcc/gcc-cross-sdk_3.4.4.bb
index 2569a97..4f98905 100644 (file)
--- a/packages/gcc/gcc-cross-sdk_3.4.4.bb
+++ b/packages/gcc/gcc-cross-sdk_3.4.4.bb
@@ -4,8 +4,6 @@ PR = "r3"
 
 inherit sdk
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PACKAGES = "${PN}"
 

diff --git a/packages/gcc/gcc-cross-sdk_4.1.0.bb b/packages/gcc/gcc-cross-sdk_4.1.0.bb
index 0ea1761..a6f0157 100644 (file)
--- a/packages/gcc/gcc-cross-sdk_4.1.0.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.0.bb
@@ -4,8 +4,6 @@ PR = "r2"
 
 inherit sdk
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PACKAGES = "${PN}"
 

diff --git a/packages/gcc/gcc-cross-sdk_4.1.1.bb b/packages/gcc/gcc-cross-sdk_4.1.1.bb
index cb47849..069a524 100644 (file)
--- a/packages/gcc/gcc-cross-sdk_4.1.1.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.1.bb
@@ -2,8 +2,6 @@ PR = "r3"
 
 inherit sdk
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PACKAGES = "${PN}"
 

diff --git a/packages/gcc/gcc-cross-sdk_4.1.2.bb b/packages/gcc/gcc-cross-sdk_4.1.2.bb
index 28864f1..ce58198 100644 (file)
--- a/packages/gcc/gcc-cross-sdk_4.1.2.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.2.bb
@@ -2,8 +2,6 @@ PR = "r5"
 
 inherit sdk
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 
 require gcc-${PV}.inc

diff --git a/packages/gcc/gcc-cross-sdk_4.2.2.bb b/packages/gcc/gcc-cross-sdk_4.2.2.bb
index 46ceef7..6bdf60b 100644 (file)
--- a/packages/gcc/gcc-cross-sdk_4.2.2.bb
+++ b/packages/gcc/gcc-cross-sdk_4.2.2.bb
@@ -2,8 +2,6 @@ PR = "r3"
 
 inherit sdk
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
 PACKAGES = "${PN}"
 
 require gcc-${PV}.inc

diff --git a/packages/gcc/gcc-cross_3.3.3.bb b/packages/gcc/gcc-cross_3.3.3.bb
index 068fcff..5fb22c9 100644 (file)
--- a/packages/gcc/gcc-cross_3.3.3.bb
+++ b/packages/gcc/gcc-cross_3.3.3.bb
@@ -4,8 +4,6 @@ require gcc-${PV}.inc
 require gcc-package-target.inc
 inherit cross
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 

diff --git a/packages/gcc/gcc-cross_3.3.4.bb b/packages/gcc/gcc-cross_3.3.4.bb
index fef925e..8eca4db 100644 (file)
--- a/packages/gcc/gcc-cross_3.3.4.bb
+++ b/packages/gcc/gcc-cross_3.3.4.bb
@@ -3,6 +3,5 @@ PR="r6"
 require gcc-${PV}.inc
 require gcc-package-target.inc
 require gcc-cross.inc
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 require gcc3-build-cross.inc
 require gcc-package-cross.inc

diff --git a/packages/gcc/gcc-cross_3.4.3.bb b/packages/gcc/gcc-cross_3.4.3.bb
index dbd23ff..b2d4129 100644 (file)
--- a/packages/gcc/gcc-cross_3.4.3.bb
+++ b/packages/gcc/gcc-cross_3.4.3.bb
@@ -3,6 +3,5 @@ PR = "r13"
 require gcc-${PV}.inc
 require gcc-package-target.inc
 require gcc-cross.inc
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 require gcc3-build-cross.inc
 require gcc-package-cross.inc

diff --git a/packages/gcc/gcc-cross_3.4.4.bb b/packages/gcc/gcc-cross_3.4.4.bb
index 2982f0f..b21c5e8 100644 (file)
--- a/packages/gcc/gcc-cross_3.4.4.bb
+++ b/packages/gcc/gcc-cross_3.4.4.bb
@@ -3,6 +3,5 @@ PR = "r8"
 require gcc-${PV}.inc
 require gcc-package-target.inc
 require gcc-cross.inc
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 require gcc3-build-cross.inc
 require gcc-package-cross.inc

diff --git a/packages/gcc/gcc-cross_4.0.0.bb b/packages/gcc/gcc-cross_4.0.0.bb
index 2bec608..2f8c99c 100644 (file)
--- a/packages/gcc/gcc-cross_4.0.0.bb
+++ b/packages/gcc/gcc-cross_4.0.0.bb
@@ -4,8 +4,6 @@ require gcc-${PV}.inc
 require gcc-package-target.inc
 require gcc-cross.inc
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
 DEPENDS += "gmp-native mpfr-native"
 
 require gcc3-build-cross.inc

diff --git a/packages/gcc/gcc-cross_4.0.2.bb b/packages/gcc/gcc-cross_4.0.2.bb
index 2152734..94dd182 100644 (file)
--- a/packages/gcc/gcc-cross_4.0.2.bb
+++ b/packages/gcc/gcc-cross_4.0.2.bb
@@ -4,8 +4,6 @@ require gcc-${PV}.inc
 require gcc-package-target.inc
 require gcc-cross.inc
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
 DEPENDS += "gmp-native mpfr-native"
 
 require gcc3-build-cross.inc

diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb
index d22c471..4276c16 100644 (file)
--- a/packages/gcc/gcc-cross_4.1.0.bb
+++ b/packages/gcc/gcc-cross_4.1.0.bb
@@ -4,8 +4,6 @@ require gcc-${PV}.inc
 require gcc-package-target.inc
 require gcc-cross.inc
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
 DEPENDS += "gmp-native mpfr-native"
 
 require gcc3-build-cross.inc

diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb
index b108e50..60985a6 100644 (file)
--- a/packages/gcc/gcc-cross_4.1.1.bb
+++ b/packages/gcc/gcc-cross_4.1.1.bb
@@ -4,8 +4,6 @@ require gcc-${PV}.inc
 require gcc-package-target.inc
 require gcc-cross.inc
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
 DEPENDS += "gmp-native mpfr-native"
 
 require gcc3-build-cross.inc

diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb
index def27cf..b46c39c 100644 (file)
--- a/packages/gcc/gcc-cross_4.1.2.bb
+++ b/packages/gcc/gcc-cross_4.1.2.bb
@@ -3,7 +3,6 @@ PR = "r14"
 require gcc-${PV}.inc
 require gcc-package-target.inc
 require gcc-cross.inc
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 
 DEPENDS += "gmp-native mpfr-native"
 

diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb
index 3dd14e1..140254e 100644 (file)
--- a/packages/gcc/gcc-cross_4.2.1.bb
+++ b/packages/gcc/gcc-cross_4.2.1.bb
@@ -3,7 +3,6 @@ PR = "r13"
 require gcc-${PV}.inc
 require gcc-package-target.inc
 require gcc-cross.inc
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 
 DEPENDS += "gmp-native mpfr-native"
 

diff --git a/packages/gcc/gcc-cross_4.2.2.bb b/packages/gcc/gcc-cross_4.2.2.bb
index b2b2bbd..e392e72 100644 (file)
--- a/packages/gcc/gcc-cross_4.2.2.bb
+++ b/packages/gcc/gcc-cross_4.2.2.bb
@@ -4,7 +4,6 @@ require gcc-${PV}.inc
 require gcc-package-target.inc
 require gcc-cross.inc
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 DEPENDS += "gmp-native mpfr-native"
 
 require gcc3-build-cross.inc

diff --git a/packages/gcc/gcc-native.inc b/packages/gcc/gcc-native.inc
index 3cf20a4..6fa615f 100644 (file)
--- a/packages/gcc/gcc-native.inc
+++ b/packages/gcc/gcc-native.inc
@@ -4,8 +4,6 @@ PROVIDES = "gcc-native-${PV}"
 
 inherit native
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
 # This is intended to be a -very- basic config
 EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \
                --with-newlib \