From e1bcfeb0f59317c94130393c6e75d25721da2d87 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 14 Jul 2017 11:35:28 +0200 Subject: [PATCH] Add lc15-sysdev-remap to sysmobts2100 rootfs --- recipes-apps/tasks/task-sysmocom-bts.bb | 2 +- .../files/lc15-sysdev-remap.service | 14 ++++++++++++++ .../lc15-sysdev-remap/lc15-sysdev-remap_1.0.bb | 6 +++++- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 recipes-support/lc15-sysdev-remap/files/lc15-sysdev-remap.service diff --git a/recipes-apps/tasks/task-sysmocom-bts.bb b/recipes-apps/tasks/task-sysmocom-bts.bb index ee9b936..4480bf6 100644 --- a/recipes-apps/tasks/task-sysmocom-bts.bb +++ b/recipes-apps/tasks/task-sysmocom-bts.bb @@ -11,7 +11,7 @@ CALIB_sysmobts-v2 = "sysmobts-calib sysmobts-util" UTIL = "" UTIL_sysmobts-v2 = "sbts2050-util gpsd gps-utils" -UTIL_sysmobts2100 = "gpsd gps-utils" +UTIL_sysmobts2100 = "gpsd gps-utils lc15-sysdev-remap" # TODO: re-add femtobts-calib after it went through the API migration RDEPENDS_${PN} = "\ diff --git a/recipes-support/lc15-sysdev-remap/files/lc15-sysdev-remap.service b/recipes-support/lc15-sysdev-remap/files/lc15-sysdev-remap.service new file mode 100644 index 0000000..206494c --- /dev/null +++ b/recipes-support/lc15-sysdev-remap/files/lc15-sysdev-remap.service @@ -0,0 +1,14 @@ +[Unit] +Description=Symlink some /sys/devices/.. into /var/lc15/.. to match lc15bts-mgr hardcoded paths +After=local-fs.target +Before=osmo-bts-lc15.service + +[Service] +Type=oneshot +RuntimeDirectory=lc15 +ExecStartPre=/bin/ln -f -s /run/lc15 /var/lc15 +ExecStart=/usr/bin/lc15-sysdev-remap +RemainAfterExit=true + +[Install] +WantedBy=multi-user.target diff --git a/recipes-support/lc15-sysdev-remap/lc15-sysdev-remap_1.0.bb b/recipes-support/lc15-sysdev-remap/lc15-sysdev-remap_1.0.bb index b7b2bf6..00a9118 100644 --- a/recipes-support/lc15-sysdev-remap/lc15-sysdev-remap_1.0.bb +++ b/recipes-support/lc15-sysdev-remap/lc15-sysdev-remap_1.0.bb @@ -3,7 +3,7 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD;md5=3775480a712fc46a69647678acb234cb" SRC_URI = "file://lc15-sysdev-remap \ - file://lc15-sysdev-remap.init" + file://lc15-sysdev-remap.service" S = "${WORKDIR}" @@ -19,10 +19,14 @@ PR := "${PR}.${REPOGITFN}" do_install() { install -d ${D}${bindir} + install -d ${D}${systemd_unitdir}/system/multi-user.target.wants/ install -m 0755 ${S}/lc15-sysdev-remap ${D}${bindir}/lc15-sysdev-remap + install -m 0644 ${S}/lc15-sysdev-remap.service ${D}${systemd_unitdir}/system/ + ln -sf ../lc15-sysdev-remap.service ${D}${systemd_unitdir}/system/multi-user.target.wants/ } FILES_${PN} += "${bindir} \ + ${systemd_unitdir} \ ${sysconfdir}" INSANE_SKIP_${PN} = "arch"