From e797a8ac6bf8730d3a25a089f70ae0766ac1bb65 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 21 Mar 2014 16:16:32 +0100 Subject: [PATCH] sysmobts-firmware: Make the firmware conflict with older bts software We had an upgrade issue where using newer firmware with older osmo-bts binaries didn't work. Make sure that the shiny new 0.4.0 binaries are used with firmware starting from 3.2. Addresses: #158 --- recipes-sysmobts/firmware/sysmobts-firmware_3.2.bb | 3 ++- recipes-sysmobts/firmware/sysmobts-firmware_3.3.bb | 3 ++- recipes-sysmobts/firmware/sysmobts-firmware_3.4.bb | 3 ++- recipes-sysmobts/firmware/sysmobts-firmware_3.6.bb | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/recipes-sysmobts/firmware/sysmobts-firmware_3.2.bb b/recipes-sysmobts/firmware/sysmobts-firmware_3.2.bb index c011570..ada376a 100644 --- a/recipes-sysmobts/firmware/sysmobts-firmware_3.2.bb +++ b/recipes-sysmobts/firmware/sysmobts-firmware_3.2.bb @@ -1,6 +1,7 @@ COMPATIBLE_MACHINE = "sysmobts-v2" FIRMWARE-VERSION = "superfemto_v${PV}" -PR = "r7.${INC_PR}" +PR = "r8.${INC_PR}" +RRCONFLICTS_${PN} = "osmo-bts (< 0.4.0)" require ${PN}.inc diff --git a/recipes-sysmobts/firmware/sysmobts-firmware_3.3.bb b/recipes-sysmobts/firmware/sysmobts-firmware_3.3.bb index 71cbb67..02441d9 100644 --- a/recipes-sysmobts/firmware/sysmobts-firmware_3.3.bb +++ b/recipes-sysmobts/firmware/sysmobts-firmware_3.3.bb @@ -1,7 +1,8 @@ COMPATIBLE_MACHINE = "(sysmobts-v2|sysmobts-2050)" PACKAGE_ARCH = "sysmobts-v2" FIRMWARE-VERSION = "superfemto_v${PV}" -PR = "r8.${INC_PR}" +PR = "r9.${INC_PR}" +RRCONFLICTS_${PN} = "osmo-bts (< 0.4.0)" require ${PN}.inc diff --git a/recipes-sysmobts/firmware/sysmobts-firmware_3.4.bb b/recipes-sysmobts/firmware/sysmobts-firmware_3.4.bb index 71cbb67..02441d9 100644 --- a/recipes-sysmobts/firmware/sysmobts-firmware_3.4.bb +++ b/recipes-sysmobts/firmware/sysmobts-firmware_3.4.bb @@ -1,7 +1,8 @@ COMPATIBLE_MACHINE = "(sysmobts-v2|sysmobts-2050)" PACKAGE_ARCH = "sysmobts-v2" FIRMWARE-VERSION = "superfemto_v${PV}" -PR = "r8.${INC_PR}" +PR = "r9.${INC_PR}" +RRCONFLICTS_${PN} = "osmo-bts (< 0.4.0)" require ${PN}.inc diff --git a/recipes-sysmobts/firmware/sysmobts-firmware_3.6.bb b/recipes-sysmobts/firmware/sysmobts-firmware_3.6.bb index 71cbb67..02441d9 100644 --- a/recipes-sysmobts/firmware/sysmobts-firmware_3.6.bb +++ b/recipes-sysmobts/firmware/sysmobts-firmware_3.6.bb @@ -1,7 +1,8 @@ COMPATIBLE_MACHINE = "(sysmobts-v2|sysmobts-2050)" PACKAGE_ARCH = "sysmobts-v2" FIRMWARE-VERSION = "superfemto_v${PV}" -PR = "r8.${INC_PR}" +PR = "r9.${INC_PR}" +RRCONFLICTS_${PN} = "osmo-bts (< 0.4.0)" require ${PN}.inc