feat: create tedge-service as standalone recipe in tedge-common for r…

…ust and precompiled version

Signed-off-by: Krzysztof Piotrowski <[email protected]>

meta-tedge-bin/recipes-tedge/tedge-bin/tedge.inc

@@ -85,22 +85,7 @@ def get_tedge_pkg(d):
         raise bb.parse.SkipPackage("Target architecture '%s' is not supported by the meta-tedge-bin layer" % target)
     return tedgePkg
 
-# Automatically setup service system based on init manager
-def get_tedge_service(d):
-    initManager = d.getVar('INIT_MANAGER', True)
-    if "sysvinit" in initManager or "none" in initManager: 
-        tedgeService = "tedge-sysvinit"
-    elif "openrc" in initManager:
-        tedgeService = "tedge-openrc"
-    elif "systemd" in initManager:
-        tedgeService = "tedge-systemd"
-    else:
-        bb.warn("Init manager '%s' is not supported by the meta-tedge-bin layer" % initManager)
-        raise bb.parse.SkipPackage("Init manager '%s' is not supported by the meta-tedge-bin layer" % initManager)
-    return tedgeService
-
 TEDGE_PKG = "${@get_tedge_pkg(d)}"
-TEDGE_SERVICE = "${@get_tedge_service(d)}"
 
 FILES:${PN} += "\ 
     ${bindir}/* \ 
@@ -112,5 +97,4 @@ FILES:${PN} += "\
     ${TEDGE_CONFIG_DIR}/sm-plugins/apt \
 "
 
-require architectures/${TEDGE_PKG}.inc
-require init-managers/${TEDGE_SERVICE}.inc
+require architectures/${TEDGE_PKG}.inc

meta-tedge-bin/recipes-tedge/tedge-bin/tedge_1.0.0.bb

@@ -6,11 +6,4 @@ SRC_URI[armv6.md5sum] = "bc7d9da45afe4d3bf4368f4a7874d208"
 SRC_URI[armv7.md5sum] = "15e8527ee551f48cb54bec3e988d9438"
 SRC_URI[x86_64.md5sum] = "f35f3374650cd084c326fd271e7f478e"
 
-# Init manager variables
-INIT_REPO_CHANNEL = "community"
-INIT_VERSION = "0.3.0"
-SRC_URI[openrc.md5sum] = "b47d51788d5cf0d83a7f138fb2cf037c"
-SRC_URI[systemd.md5sum] = "c815f7666216ef5cb3d78be50eddc073"
-SRC_URI[sysvinit.md5sum] = "7286a80f0d6b42cf5a0681f951f0e318"
-
 require tedge.inc

meta-tedge-bin/recipes-tedge/tedge-bin/tedge_1.0.1.bb

@@ -6,11 +6,4 @@ SRC_URI[armv6.md5sum] = "a1ef90a58c36064e92a398db70ecd3b8"
 SRC_URI[armv7.md5sum] = "cd63debbc9bfb8e3e48fbcb53e4b8060"
 SRC_URI[x86_64.md5sum] = "96826d16bcddf0e483f9650a72ffa0a3"
 
-# Init manager variables
-INIT_REPO_CHANNEL = "community"
-INIT_VERSION = "0.3.0"
-SRC_URI[openrc.md5sum] = "b47d51788d5cf0d83a7f138fb2cf037c"
-SRC_URI[systemd.md5sum] = "c815f7666216ef5cb3d78be50eddc073"
-SRC_URI[sysvinit.md5sum] = "7286a80f0d6b42cf5a0681f951f0e318"
-
 require tedge.inc

meta-tedge-bin/recipes-tedge/tedge-bin/tedge_1.1.0.bb

@@ -6,11 +6,4 @@ SRC_URI[armv6.md5sum] = "e673ec9de42b59cfe2cdba2aa7492012"
 SRC_URI[armv7.md5sum] = "d67d2e98da8f627bfa321655022cd769"
 SRC_URI[x86_64.md5sum] = "fc86e95c1d75a9a715d768ceb649e070"
 
-# Init manager variables
-INIT_REPO_CHANNEL = "community"
-INIT_VERSION = "0.4.1"
-SRC_URI[openrc.md5sum] = "1852d7742cb8ffcf0eb765b43895912d"
-SRC_URI[systemd.md5sum] = "67e02f3c03145eada06525f8df39813f"
-SRC_URI[sysvinit.md5sum] = "bed2e55a38a560b3ac4c0baa796b33ee"
-
 require tedge.inc

meta-tedge-bin/recipes-tedge/tedge-bin/tedge_1.1.1.bb

@@ -6,11 +6,4 @@ SRC_URI[armv6.md5sum] = "fa368894f6c0c18affc932eb7bfe4460"
 SRC_URI[armv7.md5sum] = "ccf738b4a27505903c179263c8d77458"
 SRC_URI[x86_64.md5sum] = "64f5e3a865ce0cdb6aea4c2083049205"
 
-# Init manager variables
-INIT_REPO_CHANNEL = "community"
-INIT_VERSION = "0.4.1"
-SRC_URI[openrc.md5sum] = "1852d7742cb8ffcf0eb765b43895912d"
-SRC_URI[systemd.md5sum] = "67e02f3c03145eada06525f8df39813f"
-SRC_URI[sysvinit.md5sum] = "bed2e55a38a560b3ac4c0baa796b33ee"
-
 require tedge.inc

meta-tedge-bin/recipes-tedge/tedge-bin/tedge_1.2.0.bb

@@ -6,11 +6,4 @@ SRC_URI[armv6.md5sum] = "7f3027bb743a2e8663219d7b8912bb5a"
 SRC_URI[armv7.md5sum] = "e3005e98131783f11729ef3f08dec141"
 SRC_URI[x86_64.md5sum] = "dcf8c5d463a900f445079c12a0df3f0e"
 
-# Init manager variables
-INIT_REPO_CHANNEL = "community"
-INIT_VERSION = "0.4.1"
-SRC_URI[openrc.md5sum] = "1852d7742cb8ffcf0eb765b43895912d"
-SRC_URI[systemd.md5sum] = "67e02f3c03145eada06525f8df39813f"
-SRC_URI[sysvinit.md5sum] = "bed2e55a38a560b3ac4c0baa796b33ee"
-
 require tedge.inc

meta-tedge-bin/recipes-tedge/tedge-bin/tedge_1.3.0.bb

@@ -6,11 +6,4 @@ SRC_URI[armv6.md5sum] = "b32502f0eb5610cff1b4b0909ece160c"
 SRC_URI[armv7.md5sum] = "5d6cd3ac04ef1c16ecb6322d119ba03b"
 SRC_URI[x86_64.md5sum] = "a2ac0ce96b11af2faa1276e3a1945f4e"
 
-# Init manager variables
-INIT_REPO_CHANNEL = "community"
-INIT_VERSION = "0.5.0"
-SRC_URI[openrc.md5sum] = "ca866b351b70befdf11882f0cb278e8d"
-SRC_URI[systemd.md5sum] = "b0bbcbefdd85ae31e09e6ff22ab8035f"
-SRC_URI[sysvinit.md5sum] = "28738a13f950a03aa5b388f57ff4a3af"
-
 require tedge.inc

meta-tedge-bin/recipes-tedge/tedge-bin/tedge_1.3.1.bb

@@ -7,11 +7,4 @@ SRC_URI[armv7.md5sum] = "8208b9e107805d4459a9b99ca195a766"
 SRC_URI[x86_64.md5sum] = "c8b256a1cdef070b7d6bd1a2102f7460"
 SRC_URI[riscv64.md5sum] = "d87b064d5054e43cad6a2476a2fbc871"
 
-# Init manager variables
-INIT_REPO_CHANNEL = "community"
-INIT_VERSION = "0.6.0"
-SRC_URI[openrc.md5sum] = "515bfcb3ff01cb6929dda6c6922eb7a7"
-SRC_URI[systemd.md5sum] = "579cf149b89256fb83c7eb44aa45ccb1"
-SRC_URI[sysvinit.md5sum] = "493f1a2e66fa3e154c558b138e5da6bf"
-
 require tedge.inc

meta-tedge-bin/recipes-tedge/tedge-bin/tedge_1.4.1.bb

@@ -7,11 +7,4 @@ SRC_URI[armv7.md5sum] = "d377623dd47ba6462e3d3234ec5b5b37"
 SRC_URI[x86_64.md5sum] = "7e38ce53e12cae228928025098101e36"
 SRC_URI[riscv64.md5sum] = "0c22cea1350ca78c6a4aaaa13fb5a105"
 
-# Init manager variables
-INIT_REPO_CHANNEL = "community"
-INIT_VERSION = "0.6.0"
-SRC_URI[openrc.md5sum] = "515bfcb3ff01cb6929dda6c6922eb7a7"
-SRC_URI[systemd.md5sum] = "579cf149b89256fb83c7eb44aa45ccb1"
-SRC_URI[sysvinit.md5sum] = "493f1a2e66fa3e154c558b138e5da6bf"
-
 require tedge.inc

meta-tedge-common/recipes-tedge/tedge-service/tedge-service_git.bb

@@ -0,0 +1,79 @@
+SRC_URI += "git://[email protected]/thin-edge/tedge-services.git;protocol=https;branch=main"
+SRCREV= "${AUTOREV}"
+S = "${WORKDIR}/git"
+
+PV = "0.1.0+git${SRCPV}"
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
+
+inherit allarch
+inherit ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}
+inherit ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'update-rc.d', '', d)}
+
+TEDGE_CONFIG_DIR ?= "/etc/tedge"
+
+do_install () {
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+		install -d ${D}${systemd_system_unitdir}
+        for service in ${S}/services/systemd/system/*; do
+            install -m 0644 $service ${D}${systemd_system_unitdir}
+        done 
+	elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
+        install -d ${D}${sysconfdir}/init.d
+        for service in ${S}/services/sysvinit-yocto/init.d/*; do
+            install -m 0755 $service ${D}${sysconfdir}/init.d
+        done 
+    fi
+
+    # Install for every init manager but systemd as it is natively supported by thin-edge
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'false', 'true', d)}; then
+        install -m 0644 ${S}/services/system.toml ${D}${TEDGE_CONFIG_DIR}
+
+        install -d ${D}${sysconfdir}/tedgectl
+        install -m 0644 ${S}/services/tedgectl_env ${D}${sysconfdir}/tedgectl/env
+
+        install -d ${D}${bindir}
+        install -m 0755 ${S}/services/tedgectl ${D}${bindir}
+    fi
+
+    # Remove c8y-firmware-plugin as this is deprecated
+    rm -f ${D}${systemd_system_unitdir}/c8y-firmware-plugin.service
+    rm -f ${D}${sysconfdir}/init.d/c8y-firmware-plugin
+}
+
+PACKAGES += "tedge-agent tedge-mapper-c8y tedge-mapper-aws tedge-mapper-az tedge-mapper-collectd"
+
+FILES:${PN} += "\
+    ${sysconfdir}/init.d/* \
+    ${TEDGE_CONFIG_DIR}/system.toml \
+    ${sysconfdir}/tedgectl/env \
+    ${bindir}/tedgectl \
+"
+
+FILES:tedge-agent += "\
+    ${systemd_system_unitdir}/tedge-agent.service \
+"
+FILES:tedge-mapper-c8y += "\
+    ${systemd_system_unitdir}/tedge-mapper-c8y.service \
+    ${systemd_system_unitdir}/[email protected] \
+    ${systemd_system_unitdir}/c8y-remote-access-plugin.socket \
+"
+FILES:tedge-mapper-aws += "\
+    ${systemd_system_unitdir}/tedge-mapper-aws.service \
+"
+FILES:tedge-mapper-az += "\
+    ${systemd_system_unitdir}/tedge-mapper-az.service \
+"
+FILES:tedge-mapper-collectd += "\
+    ${systemd_system_unitdir}/tedge-mapper-collectd.service \
+"
+
+SYSTEMD_PACKAGES = "tedge-agent tedge-mapper-c8y tedge-mapper-aws tedge-mapper-az tedge-mapper-collectd"
+SYSTEMD_SERVICE:tedge-agent = "tedge-agent.service"
+SYSTEMD_SERVICE:tedge-mapper-c8y = "tedge-mapper-c8y.service [email protected] c8y-remote-access-plugin.socket"
+SYSTEMD_SERVICE:tedge-mapper-aws = "tedge-mapper-aws.service"
+SYSTEMD_SERVICE:tedge-mapper-az = "tedge-mapper-az.service"
+SYSTEMD_SERVICE:tedge-mapper-collectd = "tedge-mapper-collectd.service"
+
+ALLOW_EMPTY:${PN} = "1"

meta-tedge/recipes-tedge/tedge/tedge.inc

@@ -1,4 +1,4 @@
-SRC_URI += "git://[email protected]/thin-edge/thin-edge.io.git;protocol=https;branch=main;name=tedge"
+SRC_URI += "git://[email protected]/thin-edge/thin-edge.io.git;protocol=https;branch=main"
 
 SRC_URI += " \
     file://operations/c8y/c8y_RemoteAccessConnect \ 
@@ -15,7 +15,7 @@ LICENSE = "Apache-2.0"
 
 inherit cargo-tedge useradd
 
-RDEPENDS:${PN} = "${PN}-agent ${PN}-mapper-c8y ${PN}-mapper-aws ${PN}-mapper-az ${PN}-mapper-collectd mosquitto ca-certificates libgcc glibc-utils libxcrypt sudo collectd"
+RDEPENDS:${PN} = "${PN}-agent ${PN}-mapper-c8y ${PN}-mapper-aws ${PN}-mapper-az ${PN}-mapper-collectd tedge-service mosquitto ca-certificates libgcc glibc-utils libxcrypt sudo collectd"
 
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM:${PN} = "--system --gid 950 tedge"
@@ -84,5 +84,3 @@ FILES:${PN} = "\
     ${TEDGE_CONFIG_DIR}/contrib/collectd \
     ${TEDGE_CONFIG_DIR}/sm-plugins/apt \
 "
-
-require tedge-services.inc

meta-tedge/recipes-tedge/tedge/tedge_1.0.0.bb

@@ -1,6 +1,4 @@
-SRCREV_tedge = "9cf69044581fc4046d52009f909b41af40124a95"
-SRCREV_tedge-services = "${AUTOREV}"
-SRCREV_FORMAT = "tedge"
+SRCREV = "9cf69044581fc4046d52009f909b41af40124a95"
 S = "${WORKDIR}/git"
 
 SRC_URI += "\

meta-tedge/recipes-tedge/tedge/tedge_1.0.1.bb

@@ -1,6 +1,4 @@
-SRCREV_tedge = "64def4e4c5ed8e600d3ab090725ad3af57f1579f"
-SRCREV_tedge-services = "${AUTOREV}"
-SRCREV_FORMAT = "tedge"
+SRCREV = "64def4e4c5ed8e600d3ab090725ad3af57f1579f"
 S = "${WORKDIR}/git"
 
 SRC_URI += "\

meta-tedge/recipes-tedge/tedge/tedge_1.1.0.bb

@@ -1,6 +1,4 @@
-SRCREV_tedge = "ea66825c0f83d48a1fe8c38acce8765fe172b22c"
-SRCREV_tedge-services = "${AUTOREV}"
-SRCREV_FORMAT = "tedge"
+SRCREV = "ea66825c0f83d48a1fe8c38acce8765fe172b22c"
 S = "${WORKDIR}/git"
 
 SRC_URI += "\

meta-tedge/recipes-tedge/tedge/tedge_1.1.1.bb

@@ -1,6 +1,4 @@
-SRCREV_tedge = "8bd6a3aba02560950b51901f5ff6ec855f53ee81"
-SRCREV_tedge-services = "${AUTOREV}"
-SRCREV_FORMAT = "tedge"
+SRCREV = "8bd6a3aba02560950b51901f5ff6ec855f53ee81"
 S = "${WORKDIR}/git"
 
 SRC_URI += "\

meta-tedge/recipes-tedge/tedge/tedge_1.2.0.bb

@@ -1,6 +1,4 @@
-SRCREV_tedge = "bbfef48d4beb6bb23a8828c6c953078f3272dfe1"
-SRCREV_tedge-services = "${AUTOREV}"
-SRCREV_FORMAT = "tedge"
+SRCREV = "bbfef48d4beb6bb23a8828c6c953078f3272dfe1"
 S = "${WORKDIR}/git"
 
 SRC_URI += "\

meta-tedge/recipes-tedge/tedge/tedge_1.3.0.bb

@@ -1,6 +1,4 @@
-SRCREV_tedge = "61fdb06b3407c4d744cd4a8cec94df2b7eab97de"
-SRCREV_tedge-services = "${AUTOREV}"
-SRCREV_FORMAT = "tedge"
+SRCREV = "61fdb06b3407c4d744cd4a8cec94df2b7eab97de"
 S = "${WORKDIR}/git"
 
 SRC_URI += "\

meta-tedge/recipes-tedge/tedge/tedge_1.3.1.bb

@@ -1,6 +1,4 @@
-SRCREV_tedge = "0866b9b9d7571f1479571d0600a42923a9b2980f"
-SRCREV_tedge-services = "${AUTOREV}"
-SRCREV_FORMAT = "tedge"
+SRCREV = "0866b9b9d7571f1479571d0600a42923a9b2980f"
 S = "${WORKDIR}/git"
 
 SRC_URI += "\

meta-tedge/recipes-tedge/tedge/tedge_1.4.1.bb

@@ -1,6 +1,4 @@
-SRCREV_tedge = "b48c19c148d9f71cda434b0f8b76c0a115fd5fb2"
-SRCREV_tedge-services = "${AUTOREV}"
-SRCREV_FORMAT = "tedge"
+SRCREV = "b48c19c148d9f71cda434b0f8b76c0a115fd5fb2"
 S = "${WORKDIR}/git"
 
 SRC_URI += "\