From bef17822a767b74449baf7cf69e7cb09e7f0ebd1 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 14 Nov 2014 14:11:35 +0100 Subject: misc: Modernize and call it packagegroup- The notion of task- has been deprecated a long time ago. Call it packagegroup now and for "packagegroup-osmocom" provide the compability. This has not been compile tested. The edison build will require a bbappend to provide packagegroup now but I will do this once I need to build for Edison again. --- recipes-osmocom/meta/meta-toolchain-osmo.bb | 3 +-- ...packagegroup-core-standalone-osmo-sdk-target.bb | 23 ++++++++++++++++++++++ .../packagegroup/packagegroup-osmocom.bb | 16 +++++++++++++++ .../packagegroup/packagegroup-sdk-osmo.inc | 15 ++++++++++++++ .../tasks/task-core-standalone-osmo-sdk-target.bb | 23 ---------------------- recipes-osmocom/tasks/task-osmocom.bb | 11 ----------- recipes-osmocom/tasks/task-sdk-osmo.inc | 15 -------------- recipes-telephony/tasks/task-telephony-all.bb | 4 ++-- 8 files changed, 57 insertions(+), 53 deletions(-) create mode 100644 recipes-osmocom/packagegroup/packagegroup-core-standalone-osmo-sdk-target.bb create mode 100644 recipes-osmocom/packagegroup/packagegroup-osmocom.bb create mode 100644 recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc delete mode 100644 recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb delete mode 100644 recipes-osmocom/tasks/task-osmocom.bb delete mode 100644 recipes-osmocom/tasks/task-sdk-osmo.inc diff --git a/recipes-osmocom/meta/meta-toolchain-osmo.bb b/recipes-osmocom/meta/meta-toolchain-osmo.bb index 566ec26..6755fb6 100644 --- a/recipes-osmocom/meta/meta-toolchain-osmo.bb +++ b/recipes-osmocom/meta/meta-toolchain-osmo.bb @@ -1,5 +1,4 @@ -#TOOLCHAIN_TARGET_OSMOTASK ?= "task-core-standalone-osmo-sdk-target task-core-standalone-osmo-sdk-target-dbg" -TOOLCHAIN_TARGET_OSMOTASK ?= "task-core-standalone-osmo-sdk-target" +TOOLCHAIN_TARGET_OSMOTASK ?= "packagegroup-core-standalone-osmo-sdk-target" TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_OSMOTASK}" TOOLCHAIN_OUTPUT_BASENAME = "${SDK_NAME}-toolchain-osmo-${DISTRO_VERSION}" TOOLCHAIN_OUTPUTNAME = "${TOOLCHAIN_OUTPUT_BASENAME}-${DATETIME}" diff --git a/recipes-osmocom/packagegroup/packagegroup-core-standalone-osmo-sdk-target.bb b/recipes-osmocom/packagegroup/packagegroup-core-standalone-osmo-sdk-target.bb new file mode 100644 index 0000000..dd5072b --- /dev/null +++ b/recipes-osmocom/packagegroup/packagegroup-core-standalone-osmo-sdk-target.bb @@ -0,0 +1,23 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +DESCRIPTION = "Software Development Kit for Osmocom devices" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PR = "r5" + +ALLOW_EMPTY_${PN} = "1" + +# TODO: We need to rename this task to packagegroup but for now we +# will need to skip this test. +INSANE_SKIP_${PN} += "dev-deps" + +require packagegroup-sdk-osmo.inc + +PACKAGES = "${PN} ${PN}-dbg" + +RDEPENDS_${PN} = "\ + packagegroup-core-standalone-sdk-target \ + ${SDK-OSMO} \ + ${SDK-EXTRAS}" diff --git a/recipes-osmocom/packagegroup/packagegroup-osmocom.bb b/recipes-osmocom/packagegroup/packagegroup-osmocom.bb new file mode 100644 index 0000000..d95d76f --- /dev/null +++ b/recipes-osmocom/packagegroup/packagegroup-osmocom.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Task for Osmocom tools and header files" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +DEPENDS = "virtual/kernel" +ALLOW_EMPTY_${PN} = "1" +PR = "r2" + +# For backwards compatibility after rename +RPROVIDES_${PN} = "task-osmocom" +RREPLACES_${PN} = "task-osmocom" +RCONFLICTS_${PN} = "task-osmocom" + +RDEPENDS_${PN} = "\ + libosmocore \ + " + diff --git a/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc b/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc new file mode 100644 index 0000000..29f3ad9 --- /dev/null +++ b/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc @@ -0,0 +1,15 @@ +SDK-OSMO = " \ + libosmocore-dev \ + libosmo-sccp-staticdev \ + libosmo-abis-dev \ + libgtp-dev \ + libdbi-dev \ + libsmpp34-dev \ + gpsd-dev \ + " + +SDK-EXTRAS ?= "" +#SDK-EXTRAS_qemux86 ?= " valgrind lttng-ust-dev" +#SDK-EXTRAS_qemux86-64 ?= " lttng-ust-dev" +#SDK-EXTRAS_qemuppc ?= " lttng-ust-dev" +#SDK-EXTRAS_qemuarm ?= " lttng-ust-dev" diff --git a/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb b/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb deleted file mode 100644 index 41a95b1..0000000 --- a/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -DESCRIPTION = "Software Development Kit for Osmocom devices" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r5" - -ALLOW_EMPTY_${PN} = "1" - -# TODO: We need to rename this task to packagegroup but for now we -# will need to skip this test. -INSANE_SKIP_${PN} += "dev-deps" - -require task-sdk-osmo.inc - -PACKAGES = "${PN} ${PN}-dbg" - -RDEPENDS_${PN} = "\ - task-core-standalone-sdk-target \ - ${SDK-OSMO} \ - ${SDK-EXTRAS}" diff --git a/recipes-osmocom/tasks/task-osmocom.bb b/recipes-osmocom/tasks/task-osmocom.bb deleted file mode 100644 index 1cec91f..0000000 --- a/recipes-osmocom/tasks/task-osmocom.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Task for Osmocom tools and header files" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -DEPENDS = "virtual/kernel" -ALLOW_EMPTY_${PN} = "1" -PR = "r2" - -RDEPENDS_task-osmocom = "\ - libosmocore \ - " - diff --git a/recipes-osmocom/tasks/task-sdk-osmo.inc b/recipes-osmocom/tasks/task-sdk-osmo.inc deleted file mode 100644 index 29f3ad9..0000000 --- a/recipes-osmocom/tasks/task-sdk-osmo.inc +++ /dev/null @@ -1,15 +0,0 @@ -SDK-OSMO = " \ - libosmocore-dev \ - libosmo-sccp-staticdev \ - libosmo-abis-dev \ - libgtp-dev \ - libdbi-dev \ - libsmpp34-dev \ - gpsd-dev \ - " - -SDK-EXTRAS ?= "" -#SDK-EXTRAS_qemux86 ?= " valgrind lttng-ust-dev" -#SDK-EXTRAS_qemux86-64 ?= " lttng-ust-dev" -#SDK-EXTRAS_qemuppc ?= " lttng-ust-dev" -#SDK-EXTRAS_qemuarm ?= " lttng-ust-dev" diff --git a/recipes-telephony/tasks/task-telephony-all.bb b/recipes-telephony/tasks/task-telephony-all.bb index 284d669..cc1ca0b 100644 --- a/recipes-telephony/tasks/task-telephony-all.bb +++ b/recipes-telephony/tasks/task-telephony-all.bb @@ -3,14 +3,14 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" ALLOW_EMPTY_${PN} = "1" -PR = "r3" +PR = "r4" DEPENDS = "\ libosmo-abis \ libosmo-sccp \ libosmocore \ openbsc \ - task-osmocom \ + packagegroup-osmocom \ openggsn \ misdn-utils \ dahdi-linux \ -- cgit v1.2.3