From 05ca55921548e949c7c95f9a85c568a673d4ad40 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Wed, 17 Dec 2014 17:23:14 +1000 Subject: gdb: Port gdb 7.7.1 recipes from oe-core * Port the gdb 7.7.1 recipes from oe-core, this is due to issues with re-producing a functional gdb for 7.8.1+ * Default MicroBlaze machines to use gdb 7.7.1 Signed-off-by: Nathan Rossi --- conf/machine/include/tune-microblaze.inc | 6 +++++ recipes-devtools/gdb/gdb-7.7.1.inc | 11 ++++++++ .../gdb/gdb-cross-canadian_7.7%.bbappend | 1 - recipes-devtools/gdb/gdb-cross-canadian_7.7.1.bb | 4 +++ recipes-devtools/gdb/gdb-cross_7.7%.bbappend | 1 - recipes-devtools/gdb/gdb-cross_7.7.1.bb | 3 +++ recipes-devtools/gdb/gdb_7.7%.bbappend | 1 - recipes-devtools/gdb/gdb_7.7.1.bb | 29 ++++++++++++++++++++++ 8 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 recipes-devtools/gdb/gdb-7.7.1.inc delete mode 100644 recipes-devtools/gdb/gdb-cross-canadian_7.7%.bbappend create mode 100644 recipes-devtools/gdb/gdb-cross-canadian_7.7.1.bb delete mode 100644 recipes-devtools/gdb/gdb-cross_7.7%.bbappend create mode 100644 recipes-devtools/gdb/gdb-cross_7.7.1.bb delete mode 100644 recipes-devtools/gdb/gdb_7.7%.bbappend create mode 100644 recipes-devtools/gdb/gdb_7.7.1.bb diff --git a/conf/machine/include/tune-microblaze.inc b/conf/machine/include/tune-microblaze.inc index 851379b8..5b20522c 100644 --- a/conf/machine/include/tune-microblaze.inc +++ b/conf/machine/include/tune-microblaze.inc @@ -18,3 +18,9 @@ UBOOT_MACHINE ?= "microblaze-generic" # linux-yocto KMACHINE KMACHINE ?= "microblaze" + +# default to use the gdb 7.7.1 +PREFERRED_VERSION_gdb ?= "7.7.1" +PREFERRED_VERSION_gdb-cross ?= "7.7.1" +PREFERRED_VERSION_gdb-cross-canadian ?= "7.7.1" + diff --git a/recipes-devtools/gdb/gdb-7.7.1.inc b/recipes-devtools/gdb/gdb-7.7.1.inc new file mode 100644 index 00000000..04488e9e --- /dev/null +++ b/recipes-devtools/gdb/gdb-7.7.1.inc @@ -0,0 +1,11 @@ +LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" + +S = "${WORKDIR}/${BPN}-${PV}" + +SRC_URI[md5sum] = "45b07b53d81832d32ccd4829465d4886" +SRC_URI[sha256sum] = "eefadb9831e3695d1eaef34e98b8f1fb441df6fe5071317ea49c6bd6ba213eff" + diff --git a/recipes-devtools/gdb/gdb-cross-canadian_7.7%.bbappend b/recipes-devtools/gdb/gdb-cross-canadian_7.7%.bbappend deleted file mode 100644 index 2d7cc4fe..00000000 --- a/recipes-devtools/gdb/gdb-cross-canadian_7.7%.bbappend +++ /dev/null @@ -1 +0,0 @@ -require gdb-microblaze-7.7.inc diff --git a/recipes-devtools/gdb/gdb-cross-canadian_7.7.1.bb b/recipes-devtools/gdb/gdb-cross-canadian_7.7.1.bb new file mode 100644 index 00000000..c349ebbb --- /dev/null +++ b/recipes-devtools/gdb/gdb-cross-canadian_7.7.1.bb @@ -0,0 +1,4 @@ +require recipes-devtools/gdb/gdb-common.inc +require recipes-devtools/gdb/gdb-cross-canadian.inc +require gdb-${PV}.inc +require gdb-microblaze-7.7.inc diff --git a/recipes-devtools/gdb/gdb-cross_7.7%.bbappend b/recipes-devtools/gdb/gdb-cross_7.7%.bbappend deleted file mode 100644 index 2d7cc4fe..00000000 --- a/recipes-devtools/gdb/gdb-cross_7.7%.bbappend +++ /dev/null @@ -1 +0,0 @@ -require gdb-microblaze-7.7.inc diff --git a/recipes-devtools/gdb/gdb-cross_7.7.1.bb b/recipes-devtools/gdb/gdb-cross_7.7.1.bb new file mode 100644 index 00000000..98b3359c --- /dev/null +++ b/recipes-devtools/gdb/gdb-cross_7.7.1.bb @@ -0,0 +1,3 @@ +require recipes-devtools/gdb/gdb-cross.inc +require gdb-${PV}.inc +require gdb-microblaze-7.7.inc diff --git a/recipes-devtools/gdb/gdb_7.7%.bbappend b/recipes-devtools/gdb/gdb_7.7%.bbappend deleted file mode 100644 index 2d7cc4fe..00000000 --- a/recipes-devtools/gdb/gdb_7.7%.bbappend +++ /dev/null @@ -1 +0,0 @@ -require gdb-microblaze-7.7.inc diff --git a/recipes-devtools/gdb/gdb_7.7.1.bb b/recipes-devtools/gdb/gdb_7.7.1.bb new file mode 100644 index 00000000..80b589a1 --- /dev/null +++ b/recipes-devtools/gdb/gdb_7.7.1.bb @@ -0,0 +1,29 @@ +require recipes-devtools/gdb/gdb-common.inc +require gdb-${PV}.inc +require gdb-microblaze-7.7.inc + +inherit gettext +inherit python-dir + +PACKAGECONFIG ??= "" +PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python" +PACKAGECONFIG[babeltrace] = "--with-babeltrace,--without-babeltrace,babeltrace" + +do_configure_prepend() { + if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" ]; then + cat > ${WORKDIR}/python << EOF +#!/bin/sh +case "\$2" in + --includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}/" ;; + --ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;; + --exec-prefix) echo "${exec_prefix}" ;; + *) exit 1 ;; +esac +exit 0 +EOF + chmod +x ${WORKDIR}/python + fi +} + +PACKAGES =+ "gdbserver" +FILES_gdbserver = "${bindir}/gdbserver" -- cgit v1.2.3-54-g00ecf