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

diff --git a/packages/gcc/gcc-cross_3.3.4.bb b/packages/gcc/gcc-cross_3.3.4.bb
index 8eca4dbd1fcf4ddbbd850ce82909e66494a333fc..32c052c73bc460ac1dd21b8da3ae7d0f7a767646 100644 (file)
--- 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 b2d4129c0fa63d2e92fae810f1302b083f890642..5aeb2c2eb9f4e69d1f975234444c22126f68ae61 100644 (file)
--- 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 b21c5e8a7be20fbeb0b958d58459bb9d3c0ab0db..dafdf4afadc1299d6f83529b641607f7edf03c51 100644 (file)
--- 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 320e247d15264ed29ecc807cccedbd334993f653..3b8b898464b9bfec4b7b2207976f3f97564b7c99 100644 (file)
--- 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 5379866587edb2003104e9fab9f934fdc3168752..451136e4c46d4eb0eee8df7db175582845d379b2 100644 (file)
--- 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 e3d4a51df6a3c1780f11c4e00c1089d3ab41b577..8d2d4dad89e6b44f475c2fa800d978b690070fe9 100644 (file)
--- 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 289252fdc1dec1558aee1dbd1611c50c238a7e03..6788bc0d82149f6dbfd5fb7a4effaef5c03643ec 100644 (file)
--- 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 a9bf0b2ff61e8f1cd8fc026cb6937b2e2ea4179f..942c794669bf2ff973b0032867f6df81522582a3 100644 (file)
--- 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 8ddee97ee1b532909eec8b278109ebdbe9ed54af..d03ce778ae933da4dfdaeaf1d739d6ac3030b20d 100644 (file)
--- 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 d1c19f728d5c12a950b135b55f1a454ec0437701..83d9ca9f6a77d1fc781570d9bbe0c7076a4ba465 100644 (file)
--- 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 9c062700b3adbc37ef6483c54e2f85c1aee2ccfa..2b7b81ee80968eab6227b1eba5fd90096dd1a993 100644 (file)
--- 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 6ff1ec66d7f7cad64051a3bc8053fc79c903113a..33d64dc8e79c7064658fbfa4c280dda45418c22d 100644 (file)
--- 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 02af390869e4b0fcc47f0f62d01e1b9ca5daaebc..be567b4a1defd4dc812c92097f6e7dd32627b9ba 100644 (file)
--- 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 51a45cd63360214accaafe9faa445222c0bd9436..ca940aa6b0a5f15cb81d8eb4e6e321acea7966f5 100644 (file)
--- 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