gcc-cross-sdk: Fixup sdk packaging to be self contained and drop gcc-package-target.inc

diff --git a/packages/gcc/gcc-cross-kernel-3.3.3_3.3.3.bb b/packages/gcc/gcc-cross-kernel-3.3.3_3.3.3.bb
index 7f274bee304c85b08bc090d8a67747c2ef8ed670..a1991324c581e1b46fdab859f741953f4d5c586a 100644 (file)
--- a/packages/gcc/gcc-cross-kernel-3.3.3_3.3.3.bb
+++ b/packages/gcc/gcc-cross-kernel-3.3.3_3.3.3.bb
@@ -1,4 +1,3 @@
-SECTION = "devel"
 # cut-down gcc for kernel builds
 # only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc.
 

diff --git a/packages/gcc/gcc-cross-kernel-3.3.4_3.3.4.bb b/packages/gcc/gcc-cross-kernel-3.3.4_3.3.4.bb
index ba894521873e232347d9531395e5bc73feba2c0c..ef59dc87166f36a683a23e97f6cad6356e0f03d3 100644 (file)
--- a/packages/gcc/gcc-cross-kernel-3.3.4_3.3.4.bb
+++ b/packages/gcc/gcc-cross-kernel-3.3.4_3.3.4.bb
@@ -1,4 +1,3 @@
-SECTION = "devel"
 # cut-down gcc for kernel builds
 # only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc.
 

diff --git a/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb b/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb
index 03c6ce2b860b2eeb9e1b22ad5a11fe071e52c9f0..c4d58c14babcbb00edd936648ce0fa03c54d7d17 100644 (file)
--- a/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb
+++ b/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb
@@ -1,4 +1,3 @@
-SECTION = "devel"
 # cut-down gcc for kernel builds
 # only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc.
 

diff --git a/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb b/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
index d9c818979c701d1e23b1d0603a70eb2eeb6bcf84..d1cb6e47864b901a0310995e89df37cf93a71c74 100644 (file)
--- a/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
@@ -3,7 +3,6 @@
 
 DEFAULT_PREFERENCE = "-1"
 
-SECTION = "devel"
 # cut-down gcc for kernel builds
 # only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc.
 

diff --git a/packages/gcc/gcc-cross-sdk_3.3.4.bb b/packages/gcc/gcc-cross-sdk_3.3.4.bb
index 4f98905b1775e81615f3d06e8bd295327bc72222..17faff5fff2c9f43eb13c51cb371b59915c49a2d 100644 (file)
--- a/packages/gcc/gcc-cross-sdk_3.3.4.bb
+++ b/packages/gcc/gcc-cross-sdk_3.3.4.bb
@@ -1,11 +1,9 @@
-require gcc-${PV}.inc
-require gcc-package-target.inc
 PR = "r3"
 
 inherit sdk
 
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
-PACKAGES = "${PN}"
-
+require gcc-${PV}.inc
 require gcc3-build-sdk.inc
 require gcc-package-sdk.inc
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"

diff --git a/packages/gcc/gcc-cross-sdk_3.4.3.bb b/packages/gcc/gcc-cross-sdk_3.4.3.bb
index 739c589d2bd6ddcf342fb072a2dbebf78efb42e6..721e677a292d3adcb734df92fe7f000253d99f68 100644 (file)
--- a/packages/gcc/gcc-cross-sdk_3.4.3.bb
+++ b/packages/gcc/gcc-cross-sdk_3.4.3.bb
@@ -1,11 +1,9 @@
-require gcc-${PV}.inc
-require gcc-package-target.inc
 PR = "r1"
 
 inherit sdk
 
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
-PACKAGES = "${PN}"
-
+require gcc-${PV}.inc
 require gcc3-build-sdk.inc
 require gcc-package-sdk.inc
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
\ No newline at end of file

diff --git a/packages/gcc/gcc-cross-sdk_3.4.4.bb b/packages/gcc/gcc-cross-sdk_3.4.4.bb
index 4f98905b1775e81615f3d06e8bd295327bc72222..14d00830ac2606944fd1ca259ed9ecdfe35e9b11 100644 (file)
--- a/packages/gcc/gcc-cross-sdk_3.4.4.bb
+++ b/packages/gcc/gcc-cross-sdk_3.4.4.bb
@@ -1,11 +1,9 @@
-require gcc-${PV}.inc
-require gcc-package-target.inc
 PR = "r3"
 
 inherit sdk
 
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
-PACKAGES = "${PN}"
-
+require gcc-${PV}.inc
 require gcc3-build-sdk.inc
 require gcc-package-sdk.inc
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
\ No newline at end of file

diff --git a/packages/gcc/gcc-cross-sdk_4.1.0.bb b/packages/gcc/gcc-cross-sdk_4.1.0.bb
index a6f0157428fae4b9ffc03d576306a7bc426321b1..7ccb2f3c66b86a6e1bc4fa0f881669673c3e68a7 100644 (file)
--- a/packages/gcc/gcc-cross-sdk_4.1.0.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.0.bb
@@ -1,11 +1,9 @@
-require gcc-${PV}.inc
-require gcc-package-target.inc
 PR = "r2"
 
 inherit sdk
 
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
-PACKAGES = "${PN}"
-
+require gcc-${PV}.inc
 require gcc4-build-sdk.inc
 require gcc-package-sdk.inc
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
\ No newline at end of file

diff --git a/packages/gcc/gcc-cross-sdk_4.1.1.bb b/packages/gcc/gcc-cross-sdk_4.1.1.bb
index 069a524ed0b28e0425ef4ae08d7e1d52b69cad53..e07d568f6a6fafc81ad4f64f2bb4903074693f1e 100644 (file)
--- a/packages/gcc/gcc-cross-sdk_4.1.1.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.1.bb
@@ -2,10 +2,8 @@ PR = "r3"
 
 inherit sdk
 
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
-PACKAGES = "${PN}"
-
 require gcc-${PV}.inc
-require gcc-package-target.inc
 require gcc4-build-sdk.inc
 require gcc-package-sdk.inc
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
\ No newline at end of file

diff --git a/packages/gcc/gcc-cross-sdk_4.1.2.bb b/packages/gcc/gcc-cross-sdk_4.1.2.bb
index ce58198734197ccaefc8f57eaf8246a19bd251b5..1f28791ad4b69cda66bca3d2304832a399258037 100644 (file)
--- a/packages/gcc/gcc-cross-sdk_4.1.2.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.2.bb
@@ -2,11 +2,10 @@ PR = "r5"
 
 inherit sdk
 
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
-
 require gcc-${PV}.inc
-require gcc-package-target.inc
 require gcc4-build-sdk.inc
 require gcc-package-sdk.inc
 
+DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
+
 EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"

diff --git a/packages/gcc/gcc-cross-sdk_4.2.2.bb b/packages/gcc/gcc-cross-sdk_4.2.2.bb
index 6bdf60b2177eba2f9e16c6bb2eb0959f00ccd795..b9fc685d9851a8c0ea08bca6b334ea623ffd5d21 100644 (file)
--- a/packages/gcc/gcc-cross-sdk_4.2.2.bb
+++ b/packages/gcc/gcc-cross-sdk_4.2.2.bb
@@ -2,10 +2,7 @@ PR = "r3"
 
 inherit sdk
 
-PACKAGES = "${PN}"
-
 require gcc-${PV}.inc
-require gcc-package-target.inc
 require gcc4-build-sdk.inc
 require gcc-package-sdk.inc
 

diff --git a/packages/gcc/gcc-package-sdk.inc b/packages/gcc/gcc-package-sdk.inc
index 635ab6d1f49d81c5a3904e595caaf11f10d9b67c..8b68d29938d6588f0c4fe56a74455c9818823641 100644 (file)
--- a/packages/gcc/gcc-package-sdk.inc
+++ b/packages/gcc/gcc-package-sdk.inc
@@ -1,9 +1,3 @@
-#
-# Note gcc-package.inc was already included before us. 
-#
-# We override PACKAGES and FILES to change the packaging
-#
-
 INHIBIT_PACKAGE_STRIP ?= ""
 HAS_G2C ?= "yes"
 HAS_GFORTRAN ?= "no"
@@ -29,6 +23,12 @@ FILES_${PN} = "\
     ${prefix}/${TARGET_SYS}/bin/* \
     ${prefix}/${TARGET_SYS}/lib/* \
     "
+FILES_${PN}-doc = "\
+    ${infodir} \
+    ${mandir} \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \
+    "
+
 do_install () {
        oe_runmake 'DESTDIR=${D}' install