binutils-cross-sdk.inc: Create common binutils sdk .inc file with correct sysroot options and use for all versions

9 files changed, 37 insertions, 119 deletions

diff --git a/packages/binutils/binutils-cross-sdk.inc b/packages/binutils/binutils-cross-sdk.inc
new file mode 100644
index 0000000000..b545083d94
--- /dev/null
+++ b/packages/binutils/binutils-cross-sdk.inc
@@ -0,0 +1,25 @@
+inherit sdk
+DEPENDS += "flex-native bison-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
+EXTRA_OECONF = "--with-sysroot=${prefix}/${TARGET_SYS} \
+		--program-prefix=${TARGET_PREFIX}"
+
+do_stage() {
+	:
+}
+
+do_install () {
+        autotools_do_install
+
+	# Fix the ${prefix}/${TARGET_SYS}/bin/* files to be symlinks
+	rm ${D}${prefix}/${TARGET_SYS}/bin/.debug -Rf
+	rm ${D}${prefix}/${TARGET_SYS}/bin/*
+	for l in ${D}${bindir}/*; do
+		ln -sf "${bindir}/`basename $l`" "${D}${prefix}/${TARGET_SYS}/bin/`basename $l | sed -e 's,${TARGET_PREFIX},,'`"
+	done
+
+        # Install the libiberty header
+        install -d ${D}${includedir}
+        install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
+        install -m 644 ${S}/include/libiberty.h ${D}${includedir}
+}
diff --git a/packages/binutils/binutils-cross-sdk_2.14.90.0.6.bb b/packages/binutils/binutils-cross-sdk_2.14.90.0.6.bb
index 33e0a24a53..f50956680d 100644
--- a/packages/binutils/binutils-cross-sdk_2.14.90.0.6.bb
+++ b/packages/binutils/binutils-cross-sdk_2.14.90.0.6.bb
@@ -1,11 +1,2 @@
-SECTION = "devel"
 require binutils_${PV}.bb
-inherit sdk
-DEPENDS += "flex-native bison-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
-EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
-		--program-prefix=${TARGET_PREFIX}"
-
-do_stage() {
-	:
-}
+require binutils-cross-sdk.inc
diff --git a/packages/binutils/binutils-cross-sdk_2.14.90.0.7.bb b/packages/binutils/binutils-cross-sdk_2.14.90.0.7.bb
index 33e0a24a53..f50956680d 100644
--- a/packages/binutils/binutils-cross-sdk_2.14.90.0.7.bb
+++ b/packages/binutils/binutils-cross-sdk_2.14.90.0.7.bb
@@ -1,11 +1,2 @@
-SECTION = "devel"
 require binutils_${PV}.bb
-inherit sdk
-DEPENDS += "flex-native bison-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
-EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
-		--program-prefix=${TARGET_PREFIX}"
-
-do_stage() {
-	:
-}
+require binutils-cross-sdk.inc
diff --git a/packages/binutils/binutils-cross-sdk_2.15.94.0.1.bb b/packages/binutils/binutils-cross-sdk_2.15.94.0.1.bb
index 33e0a24a53..76dff5449f 100644
--- a/packages/binutils/binutils-cross-sdk_2.15.94.0.1.bb
+++ b/packages/binutils/binutils-cross-sdk_2.15.94.0.1.bb
@@ -1,11 +1,3 @@
-SECTION = "devel"
 require binutils_${PV}.bb
-inherit sdk
-DEPENDS += "flex-native bison-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
-EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
-		--program-prefix=${TARGET_PREFIX}"
-
-do_stage() {
-	:
-}
+require binutils-cross-sdk.inc
+PR = "r0"
diff --git a/packages/binutils/binutils-cross-sdk_2.16.91.0.6.bb b/packages/binutils/binutils-cross-sdk_2.16.91.0.6.bb
index 7d3bb6c09c..f50956680d 100644
--- a/packages/binutils/binutils-cross-sdk_2.16.91.0.6.bb
+++ b/packages/binutils/binutils-cross-sdk_2.16.91.0.6.bb
@@ -1,20 +1,2 @@
-SECTION = "devel"
 require binutils_${PV}.bb
-inherit sdk
-DEPENDS += "flex-native bison-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
-EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
-		--program-prefix=${TARGET_PREFIX}"
-
-do_stage() {
-	:
-}
-
-do_install () {
-        autotools_do_install
-
-        # Install the libiberty header
-        install -d ${D}${includedir}
-        install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
-        install -m 644 ${S}/include/libiberty.h ${D}${includedir}
-}
+require binutils-cross-sdk.inc
diff --git a/packages/binutils/binutils-cross-sdk_2.16.91.0.7.bb b/packages/binutils/binutils-cross-sdk_2.16.91.0.7.bb
index 7d3bb6c09c..4695c61cd5 100644
--- a/packages/binutils/binutils-cross-sdk_2.16.91.0.7.bb
+++ b/packages/binutils/binutils-cross-sdk_2.16.91.0.7.bb
@@ -1,20 +1,3 @@
-SECTION = "devel"
 require binutils_${PV}.bb
-inherit sdk
-DEPENDS += "flex-native bison-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
-EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
-		--program-prefix=${TARGET_PREFIX}"
-
-do_stage() {
-	:
-}
-
-do_install () {
-        autotools_do_install
-
-        # Install the libiberty header
-        install -d ${D}${includedir}
-        install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
-        install -m 644 ${S}/include/libiberty.h ${D}${includedir}
-}
+require binutils-cross-sdk.inc
+PR = "r3"
diff --git a/packages/binutils/binutils-cross-sdk_2.17.50.0.12.bb b/packages/binutils/binutils-cross-sdk_2.17.50.0.12.bb
index a045d9bc9c..4695c61cd5 100644
--- a/packages/binutils/binutils-cross-sdk_2.17.50.0.12.bb
+++ b/packages/binutils/binutils-cross-sdk_2.17.50.0.12.bb
@@ -1,21 +1,3 @@
-SECTION = "devel"
 require binutils_${PV}.bb
-inherit sdk
-DEPENDS += "flex-native bison-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
-EXTRA_OECONF = "--with-sysroot=${prefix}/${TARGET_SYS} \
-		--program-prefix=${TARGET_PREFIX}"
-PR = "r2"
-
-do_stage() {
-	:
-}
-
-do_install () {
-        autotools_do_install
-
-        # Install the libiberty header
-        install -d ${D}${includedir}
-        install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
-        install -m 644 ${S}/include/libiberty.h ${D}${includedir}
-}
+require binutils-cross-sdk.inc
+PR = "r3"
diff --git a/packages/binutils/binutils-cross-sdk_2.18.bb b/packages/binutils/binutils-cross-sdk_2.18.bb
index 81c84229b0..4695c61cd5 100644
--- a/packages/binutils/binutils-cross-sdk_2.18.bb
+++ b/packages/binutils/binutils-cross-sdk_2.18.bb
@@ -1,23 +1,3 @@
-SECTION = "devel"
 require binutils_${PV}.bb
-inherit sdk
-DEPENDS += "flex-native bison-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
-EXTRA_OECONF = "--with-sysroot=${prefix}/${TARGET_SYS} \
-		--program-prefix=${TARGET_PREFIX}"
+require binutils-cross-sdk.inc
 PR = "r3"
-
-FILES_${PN}-dbg += "${prefix}/${TARGET_SYS}/bin/.debug"
-
-do_stage() {
-	:
-}
-
-do_install () {
-        autotools_do_install
-
-        # Install the libiberty header
-        install -d ${D}${includedir}
-        install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
-        install -m 644 ${S}/include/libiberty.h ${D}${includedir}
-}
diff --git a/packages/binutils/binutils-cross-sdk_cvs.bb b/packages/binutils/binutils-cross-sdk_cvs.bb
index 1a9093ff15..ae5691cf93 100644
--- a/packages/binutils/binutils-cross-sdk_cvs.bb
+++ b/packages/binutils/binutils-cross-sdk_cvs.bb
@@ -1,11 +1,3 @@
-SECTION = "devel"
 require binutils_cvs.bb
-inherit sdk
-DEPENDS += "flex-native bison-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
-EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
-		--program-prefix=${TARGET_PREFIX}"
-
-do_stage() {
-	:
-}
+require binutils-cross-sdk.inc
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
\ No newline at end of file