diff --git a/recipes-sysmobts/femtobts-api/femtobts-api_git.bb b/recipes-sysmobts/femtobts-api/femtobts-api_git.bb index c3fba57..0ba4bfc 100644 --- a/recipes-sysmobts/femtobts-api/femtobts-api_git.bb +++ b/recipes-sysmobts/femtobts-api/femtobts-api_git.bb @@ -3,8 +3,8 @@ SECTION = "kernel" LICENSE = "CLOSED" SRC_URI = "git://git.sysmocom.de/sysmo-bts/layer1-api.git;protocol=git;branch=master" -SRCREV = "bbf213491fdee73af793e73ec2e3cd0f5b57fb7b" -SRCREV_sysmobts-v2 = "bbf213491fdee73af793e73ec2e3cd0f5b57fb7b" +SRCREV = "73a3a2f9cfbf597d8c6ed92c5fc2eb6f142e30d8" +SRCREV_sysmobts-v2 = "73a3a2f9cfbf597d8c6ed92c5fc2eb6f142e30d8" SRCREV_sysmobts-v1 = "4dde9443e2aa11868e46a67529cb5ac45462699c" PV = "${SRCREV}+git${SRCPV}" PR = "r4" diff --git a/recipes-sysmobts/firmware/sysmobts-firmware_3.10.bb b/recipes-sysmobts/firmware/sysmobts-firmware_3.10.bb new file mode 100644 index 0000000..85fb375 --- /dev/null +++ b/recipes-sysmobts/firmware/sysmobts-firmware_3.10.bb @@ -0,0 +1,16 @@ +COMPATIBLE_MACHINE = "(sysmobts-v2|sysmobts-2050)" +PACKAGE_ARCH = "sysmobts-v2" +FIRMWARE-VERSION = "superfemto_v${PV}" +PR = "r9.${INC_PR}" +RRCONFLICTS_${PN} = "osmo-bts (< 0.4.2)" + +require ${PN}.inc + +do_install() { + install -d ${D}/lib/firmware/ + + install -m 0666 ${S}/Image/Dsp/superfemto.out ${D}/lib/firmware/sysmobts-v2.out + install -m 0666 ${S}/Image/Fpga/superfemto.bit ${D}/lib/firmware/sysmobts-v2.bit +} + +FILES_${PN} = "/lib/firmware/sysmobts-v2*" diff --git a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb index 988a581..02ef541 100644 --- a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb +++ b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb @@ -6,13 +6,14 @@ SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=sysmocom/featu git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc" SRCREV_osmobts = "a7f9b58e44fa7119e7113269765302a0b8a619d5" SRCREV_openbsc = "421365eeaa104a9781214f9e12c55023c1099bf8" -PV = "0.4.1+git${SRCPV}" -PR = "r8.${META_TELEPHONY_OSMO_INC}" +PV = "0.4.2+git${SRCPV}" +PR = "r9.${META_TELEPHONY_OSMO_INC}" S = "${WORKDIR}/git" SRCREV_FORMAT = "openbsc-rosmobts" DEPENDS = "libosmocore libosmo-abis femtobts-api" -RDEPENDS_${PN} += "coreutils" +RDEPENDS_${PN} += "coreutils sysmobts-firmware (>= 3.10)" +RCONFLICTS_${PN} = "sysmobts-firmware (< 3.10)" EXTRA_OECONF += "--enable-sysmocom-bts"