sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

Merge commit 'bef17822a767b74449baf7cf69e7cb09e7f0ebd1' into dora

This commit is contained in:
Holger Hans Peter Freyther 2014-11-18 09:42:54 +01:00
parent b747310508 bef17822a7
commit c0a4618671
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meta-telephony/recipes-osmocom/meta/meta-toolchain-osmo.bb
View File

@ -1,5 +1,4 @@
#TOOLCHAIN_TARGET_OSMOTASK ?= "task-core-standalone-osmo-sdk-target task-core-standalone-osmo-sdk-target-dbg" TOOLCHAIN_TARGET_OSMOTASK ?= "packagegroup-core-standalone-osmo-sdk-target"
TOOLCHAIN_TARGET_OSMOTASK ?= "task-core-standalone-osmo-sdk-target"
TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_OSMOTASK}" TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_OSMOTASK}"
TOOLCHAIN_OUTPUT_BASENAME = "${SDK_NAME}-toolchain-osmo-${DISTRO_VERSION}" TOOLCHAIN_OUTPUT_BASENAME = "${SDK_NAME}-toolchain-osmo-${DISTRO_VERSION}"
TOOLCHAIN_OUTPUTNAME = "${TOOLCHAIN_OUTPUT_BASENAME}-${DATETIME}" TOOLCHAIN_OUTPUTNAME = "${TOOLCHAIN_OUTPUT_BASENAME}-${DATETIME}"

4
meta-telephony/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb → meta-telephony/recipes-osmocom/packagegroup/packagegroup-core-standalone-osmo-sdk-target.bb
View File

@ -13,11 +13,11 @@ ALLOW_EMPTY_${PN} = "1"
# will need to skip this test. # will need to skip this test.
INSANE_SKIP_${PN} += "dev-deps" INSANE_SKIP_${PN} += "dev-deps"
require task-sdk-osmo.inc require packagegroup-sdk-osmo.inc
PACKAGES = "${PN} ${PN}-dbg" PACKAGES = "${PN} ${PN}-dbg"
RDEPENDS_${PN} = "\ RDEPENDS_${PN} = "\
task-core-standalone-sdk-target \ packagegroup-core-standalone-sdk-target \
${SDK-OSMO} \ ${SDK-OSMO} \
${SDK-EXTRAS}" ${SDK-EXTRAS}"

7
meta-telephony/recipes-osmocom/tasks/task-osmocom.bb → meta-telephony/recipes-osmocom/packagegroup/packagegroup-osmocom.bb
View File

@ -5,7 +5,12 @@ DEPENDS = "virtual/kernel"
ALLOW_EMPTY_${PN} = "1" ALLOW_EMPTY_${PN} = "1"
PR = "r2" 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 \ libosmocore \
" "

0
meta-telephony/recipes-osmocom/tasks/task-sdk-osmo.inc → meta-telephony/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc
View File

4
meta-telephony/recipes-telephony/tasks/task-telephony-all.bb
View File

@ -3,14 +3,14 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
ALLOW_EMPTY_${PN} = "1" ALLOW_EMPTY_${PN} = "1"
PR = "r3" PR = "r4"
DEPENDS = "\ DEPENDS = "\
libosmo-abis \ libosmo-abis \
libosmo-sccp \ libosmo-sccp \
libosmocore \ libosmocore \
openbsc \ openbsc \
task-osmocom \ packagegroup-osmocom \
openggsn \ openggsn \
misdn-utils \ misdn-utils \
dahdi-linux \ dahdi-linux \