From 34fc7b631bdb16216a6c3eba85f4fd17f6912201 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 28 Aug 2014 16:51:20 +0200 Subject: [PATCH] tasks-sysmocom-bts: Install packages for the sysmoBTS as well We want to have a single image that will do the right thing on the various BTS models we have. This means we will install the sbts2050 utilitiy (it clashes with sysmobts-mgr anyway) and the gpsd with a default config for it. The sysmobts-v2 config file was for a specific usecase and is obsolete for all intents and purposes. Make it the default Related: SYS#559 --- recipes-apps/tasks/task-sysmocom-bts.bb | 4 ++-- recipes-extra/gpsd/gpsd/sysmobts-2050/gpsd-default | 5 ----- recipes-extra/gpsd/gpsd/sysmobts-v2/gpsd-default | 4 ++-- 3 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 recipes-extra/gpsd/gpsd/sysmobts-2050/gpsd-default diff --git a/recipes-apps/tasks/task-sysmocom-bts.bb b/recipes-apps/tasks/task-sysmocom-bts.bb index 79093a8..b9acc81 100644 --- a/recipes-apps/tasks/task-sysmocom-bts.bb +++ b/recipes-apps/tasks/task-sysmocom-bts.bb @@ -4,13 +4,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" DEPENDS = "virtual/kernel" ALLOW_EMPTY_${PN} = "1" -PR = "r21" +PR = "r22" CALIB = "" CALIB_sysmobts-v2 = "sysmobts-calib sysmobts-util" UTIL = "" -UTIL_sysmobts-2050 = "sbts2050-util gpsd gps-utils" +UTIL_sysmobts-v2 = "sbts2050-util gpsd gps-utils" # TODO: re-add femtobts-calib after it went through the API migration RDEPENDS_${PN} = "\ diff --git a/recipes-extra/gpsd/gpsd/sysmobts-2050/gpsd-default b/recipes-extra/gpsd/gpsd/sysmobts-2050/gpsd-default deleted file mode 100644 index ad4d32a..0000000 --- a/recipes-extra/gpsd/gpsd/sysmobts-2050/gpsd-default +++ /dev/null @@ -1,5 +0,0 @@ -# If you must specify a non-NMEA driver, uncomment and modify the next line -GPSD_SOCKET="/var/run/gpsd.sock" -GPSD_OPTIONS="" -GPS_DEVICES="/dev/ttyS2" - diff --git a/recipes-extra/gpsd/gpsd/sysmobts-v2/gpsd-default b/recipes-extra/gpsd/gpsd/sysmobts-v2/gpsd-default index e37c3b5..ad4d32a 100644 --- a/recipes-extra/gpsd/gpsd/sysmobts-v2/gpsd-default +++ b/recipes-extra/gpsd/gpsd/sysmobts-v2/gpsd-default @@ -1,5 +1,5 @@ # If you must specify a non-NMEA driver, uncomment and modify the next line GPSD_SOCKET="/var/run/gpsd.sock" -GPSD_OPTIONS="" -GPS_DEVICES="udp://127.0.0.1:12345 udp://127.0.0.1:12346" +GPSD_OPTIONS="" +GPS_DEVICES="/dev/ttyS2"