gcc-cross: Drop gcc-package-target.inc, gcc-package-cross overrides or sets everything needed

14 files changed, 2 insertions, 21 deletions

diff --git a/packages/gcc/gcc-cross_3.3.4.bb b/packages/gcc/gcc-cross_3.3.4.bb
index 8eca4dbd1f..32c052c73b 100644
--- a/packages/gcc/gcc-cross_3.3.4.bb
+++ b/packages/gcc/gcc-cross_3.3.4.bb
@@ -1,7 +1,6 @@
 PR="r6"
 
 require gcc-${PV}.inc
-require gcc-package-target.inc
 require gcc-cross.inc
 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 b2d4129c0f..5aeb2c2eb9 100644
--- a/packages/gcc/gcc-cross_3.4.3.bb
+++ b/packages/gcc/gcc-cross_3.4.3.bb
@@ -1,7 +1,6 @@
 PR = "r13"
 
 require gcc-${PV}.inc
-require gcc-package-target.inc
 require gcc-cross.inc
 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 b21c5e8a7b..dafdf4afad 100644
--- a/packages/gcc/gcc-cross_3.4.4.bb
+++ b/packages/gcc/gcc-cross_3.4.4.bb
@@ -1,7 +1,6 @@
 PR = "r8"
 
 require gcc-${PV}.inc
-require gcc-package-target.inc
 require gcc-cross.inc
 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 320e247d15..3b8b898464 100644
--- a/packages/gcc/gcc-cross_4.0.0.bb
+++ b/packages/gcc/gcc-cross_4.0.0.bb
@@ -1,7 +1,6 @@
 PR = "r4"
 
 require gcc-${PV}.inc
-require gcc-package-target.inc
 require gcc-cross4.inc
 require gcc3-build-cross.inc
 require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_4.0.2.bb b/packages/gcc/gcc-cross_4.0.2.bb
index 5379866587..451136e4c4 100644
--- a/packages/gcc/gcc-cross_4.0.2.bb
+++ b/packages/gcc/gcc-cross_4.0.2.bb
@@ -1,7 +1,6 @@
 PR = "r10"
 
 require gcc-${PV}.inc
-require gcc-package-target.inc
 require gcc-cross4.inc
 require gcc3-build-cross.inc
 require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb
index e3d4a51df6..8d2d4dad89 100644
--- a/packages/gcc/gcc-cross_4.1.0.bb
+++ b/packages/gcc/gcc-cross_4.1.0.bb
@@ -1,7 +1,6 @@
 PR = "r5"
 
 require gcc-${PV}.inc
-require gcc-package-target.inc
 require gcc-cross4.inc
 require gcc3-build-cross.inc
 require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb
index 289252fdc1..6788bc0d82 100644
--- a/packages/gcc/gcc-cross_4.1.1.bb
+++ b/packages/gcc/gcc-cross_4.1.1.bb
@@ -1,7 +1,6 @@
 PR = "r18"
 
 require gcc-${PV}.inc
-require gcc-package-target.inc
 require gcc-cross4.inc
 require gcc3-build-cross.inc
 require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb
index a9bf0b2ff6..942c794669 100644
--- a/packages/gcc/gcc-cross_4.1.2.bb
+++ b/packages/gcc/gcc-cross_4.1.2.bb
@@ -1,7 +1,6 @@
 PR = "r14"
 
 require gcc-${PV}.inc
-require gcc-package-target.inc
 require gcc-cross4.inc
 require gcc3-build-cross.inc
 require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb
index 8ddee97ee1..d03ce778ae 100644
--- a/packages/gcc/gcc-cross_4.2.1.bb
+++ b/packages/gcc/gcc-cross_4.2.1.bb
@@ -1,7 +1,6 @@
 PR = "r13"
 
 require gcc-${PV}.inc
-require gcc-package-target.inc
 require gcc-cross4.inc
 require gcc3-build-cross.inc
 require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_4.2.2.bb b/packages/gcc/gcc-cross_4.2.2.bb
index d1c19f728d..83d9ca9f6a 100644
--- a/packages/gcc/gcc-cross_4.2.2.bb
+++ b/packages/gcc/gcc-cross_4.2.2.bb
@@ -1,7 +1,6 @@
 PR = "r6"
 
 require gcc-${PV}.inc
-require gcc-package-target.inc
 require gcc-cross4.inc
 require gcc3-build-cross.inc
 require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-2005q3.bb b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
index 9c062700b3..2b7b81ee80 100644
--- a/packages/gcc/gcc-cross_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
@@ -1,7 +1,6 @@
 PR = "r2"
 
 require gcc-csl-arm-2005q3.inc
-require gcc-package-target.inc
 require gcc-cross.inc
 require gcc3-build-cross.inc
 require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-cvs.bb b/packages/gcc/gcc-cross_csl-arm-cvs.bb
index 6ff1ec66d7..33d64dc8e7 100644
--- a/packages/gcc/gcc-cross_csl-arm-cvs.bb
+++ b/packages/gcc/gcc-cross_csl-arm-cvs.bb
@@ -1,7 +1,6 @@
 PR = "r1"
 
 require gcc-csl-arm-cvs.inc
-require gcc-package-target.inc
 require gcc-cross.inc
 require gcc3-build-cross.inc
 require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_csl-arm.bb b/packages/gcc/gcc-cross_csl-arm.bb
index 02af390869..be567b4a1d 100644
--- a/packages/gcc/gcc-cross_csl-arm.bb
+++ b/packages/gcc/gcc-cross_csl-arm.bb
@@ -1,7 +1,6 @@
 PR = "r1"
 
 require gcc-csl-arm.inc
-require gcc-package-target.inc
 require gcc-cross.inc
 require gcc3-build-cross.inc
 require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-package-cross.inc b/packages/gcc/gcc-package-cross.inc
index 51a45cd633..ca940aa6b0 100644
--- a/packages/gcc/gcc-package-cross.inc
+++ b/packages/gcc/gcc-package-cross.inc
@@ -28,16 +28,10 @@ FILES_libstdc++-dev = "${target_includedir}/c++/${PV} \
 		       ${target_libdir}/libsupc++.la \
 		       ${target_libdir}/libsupc++.a"
 
-python do_package() {
-	if bb.data.getVar('DEBIAN_NAMES', d, 1):
-		bb.data.setVar('PKG_libgcc', 'libgcc1', d)
-	bb.build.exec_func('package_do_package', d)
-}
-
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
 
-  # Move libgcc_s into /lib
+	# Move libgcc_s into /lib
         mkdir -p ${D}${target_base_libdir}
         if [ -f ${D}${target_base_libdir}/libgcc_s.so.? ]; then
                 # Already in the right location
@@ -53,7 +47,7 @@ do_install () {
 
 
 
-   # Move libstdc++ and libg2c into libdir (resetting our prefix to /usr
+	# Move libstdc++ and libg2c into libdir (resetting our prefix to /usr
         mkdir -p ${D}${target_libdir}
 
         if [ -f ${D}${prefix}/*/lib/nof/libstdc++.so ]; then