From 18f43e645c892871a935bec2dfb56bd0840f348d Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 11 Jun 2017 19:13:57 +0200 Subject: [PATCH] osmo-bts: Remove legacy SysV init script support --- recipes-sysmobts/osmo-bts/osmo-bts_git.bb | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb index 9368d69..e4fa72b 100644 --- a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb +++ b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb @@ -9,7 +9,7 @@ SRC_URI_append_sysmobts2100 = " file://osmo-bts-lc15.service" SRCREV_osmobts = "a4bd813081e788012c72f34d31150cdf02db307f" SRCREV_openbsc = "57ee78078905c7499bd4e6857f8981d22badfcac" PV = "0.4.3+git${SRCPV}" -PR = "r19.${META_TELEPHONY_OSMO_INC}" +PR = "r20.${META_TELEPHONY_OSMO_INC}" S = "${WORKDIR}/git" SRCREV_FORMAT = "openbsc-rosmobts" @@ -28,7 +28,7 @@ RDEPENDS_${PN}_append_sysmobts2100 = " lc15-firmware" EXTRA_OECONF_sysmobts-v2 += "--enable-sysmocom-bts" EXTRA_OECONF_sysmobts2100 += "--enable-litecell15" -inherit autotools update-rc.d pkgconfig +inherit autotools pkgconfig # Select the API version @@ -59,13 +59,6 @@ do_install_append_sysmobts-v2() { install -m 0660 ${S}/doc/examples/sysmo/osmo-bts.cfg ${D}${sysconfdir}/osmocom - # old sysv init - install -m 0755 ${S}/contrib/respawn.sh ${D}${sysconfdir}/osmocom/ - install -m 0755 ${S}/contrib/respawn-only.sh ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/contrib/screenrc-sysmobts ${D}${sysconfdir}/osmocom/ - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${S}/contrib/sysmobts.init ${D}${sysconfdir}/init.d/sysmobts - # Install systemd and enable on sysinit install -d ${D}${systemd_unitdir}/system/multi-user.target.wants/ install -m 0644 ${S}/contrib/sysmobts.service ${D}${systemd_unitdir}/system/ @@ -88,9 +81,6 @@ do_install_append_sysmobts2100() { CONFFILES_${PN} = "${sysconfdir}/osmocom/osmo-bts.cfg" CONFFILES_${PN}_append_sysmobts-v2 = " ${sysconfdir}/osmocom/sysmobts-mgr.cfg" -INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN}_sysmobts-2 = "sysmobts" -INITSCRIPT_PARAMS_${PN}_sysmobts-v2 = "defaults 30 30" # somehow it seems not posible to use _append constructs on PACKAGES #PACKAGES_append_sysmobts-v2 = " osmo-bts-remote sysmobts-calib sysmobts-util"