diff options
| -rw-r--r-- | recipes-osmocom/meta/meta-toolchain-osmo.bb | 3 | ||||
| -rw-r--r-- | recipes-osmocom/packagegroup/packagegroup-core-standalone-osmo-sdk-target.bb (renamed from recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb) | 4 | ||||
| -rw-r--r-- | recipes-osmocom/packagegroup/packagegroup-osmocom.bb (renamed from recipes-osmocom/tasks/task-osmocom.bb) | 7 | ||||
| -rw-r--r-- | recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc (renamed from recipes-osmocom/tasks/task-sdk-osmo.inc) | 0 | ||||
| -rw-r--r-- | recipes-telephony/tasks/task-telephony-all.bb | 4 |
5 files changed, 11 insertions, 7 deletions
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/tasks/task-core-standalone-osmo-sdk-target.bb b/recipes-osmocom/packagegroup/packagegroup-core-standalone-osmo-sdk-target.bb index 41a95b1..dd5072b 100644 --- a/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb +++ b/recipes-osmocom/packagegroup/packagegroup-core-standalone-osmo-sdk-target.bb @@ -13,11 +13,11 @@ ALLOW_EMPTY_${PN} = "1" # will need to skip this test. INSANE_SKIP_${PN} += "dev-deps" -require task-sdk-osmo.inc +require packagegroup-sdk-osmo.inc PACKAGES = "${PN} ${PN}-dbg" RDEPENDS_${PN} = "\ - task-core-standalone-sdk-target \ + packagegroup-core-standalone-sdk-target \ ${SDK-OSMO} \ ${SDK-EXTRAS}" diff --git a/recipes-osmocom/tasks/task-osmocom.bb b/recipes-osmocom/packagegroup/packagegroup-osmocom.bb index 1cec91f..d95d76f 100644 --- a/recipes-osmocom/tasks/task-osmocom.bb +++ b/recipes-osmocom/packagegroup/packagegroup-osmocom.bb @@ -5,7 +5,12 @@ DEPENDS = "virtual/kernel" ALLOW_EMPTY_${PN} = "1" PR = "r2" -RDEPENDS_task-osmocom = "\ +# 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/tasks/task-sdk-osmo.inc b/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc index 29f3ad9..29f3ad9 100644 --- a/recipes-osmocom/tasks/task-sdk-osmo.inc +++ b/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc 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 \ |