forked from Azure/meta-iotedge
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update Dunfell branch to IoT Edge version 1.2.6.
Create all the recipes needed to integrate the iotedge runtime version 1.2.6. It include the recipes for the daemon and the identity-service. This version has been tested with the following DPS methods: - Symmectric key - TPM It build the last official release : 'https://github.com/Azure/iotedge/releases/tag/1.2.6' Ref: Azure#63
- Loading branch information
1 parent
a10eaf6
commit 190bedd
Showing
37 changed files
with
2,769 additions
and
692 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export VERSION = "1.2.6" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
DEPENDS += "openssl " | ||
|
||
export OPENSSL_DIR = "${STAGING_EXECPREFIXDIR}" | ||
export LIBIOTHSM_NOBUILD="On" | ||
|
||
do_install () { | ||
# Binaries | ||
install -d "${D}${bindir}" | ||
install -m 755 "${WORKDIR}/build/target/${TARGET_SYS}/release/iotedge" ${D}${bindir}/iotedge | ||
} |
25 changes: 25 additions & 0 deletions
25
recipes-core/aziot-cli/aziot-cli/0001-Fix-edgelet-iotedge-code.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
From 8c40fae9f235c005fc241f09cec9ea982c183b2a Mon Sep 17 00:00:00 2001 | ||
From: Pierrick Curt <pierrick.curt@rtone.fr> | ||
Date: Mon, 26 Apr 2021 18:39:51 +0000 | ||
Subject: [PATCH] Fix edgelet/iotedge code | ||
|
||
--- | ||
edgelet/iotedge/src/check/mod.rs | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/edgelet/iotedge/src/check/mod.rs b/edgelet/iotedge/src/check/mod.rs | ||
index 44b5df5c2..041fdc6d5 100644 | ||
--- a/edgelet/iotedge/src/check/mod.rs | ||
+++ b/edgelet/iotedge/src/check/mod.rs | ||
@@ -237,7 +237,7 @@ impl Check { | ||
description: String, | ||
result: CheckResult, | ||
additional_info: serde_json::Value, | ||
- }; | ||
+ } | ||
|
||
let mut checks: BTreeMap<String, CheckOutputSerializable> = Default::default(); | ||
|
||
-- | ||
2.17.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
SRC_URI += "file://0001-Fix-edgelet-iotedge-code.patch" |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export VERSION = "1.2.6" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
DEPENDS += "openssl virtual/docker aziot-cli aziotd" | ||
RDEPENDS_${PN} += "docker aziot-cli aziotd" | ||
|
||
inherit systemd | ||
SYSTEMD_AUTO_ENABLE_${PN} = "enable" | ||
SYSTEMD_SERVICE_${PN} = "aziot-edged.service" | ||
|
||
SRC_URI += "file://aziot-edged.service \ | ||
" | ||
|
||
do_install () { | ||
# Binaries | ||
install -d "${D}${bindir}" | ||
|
||
install -m 755 "${WORKDIR}/build/target/${TARGET_SYS}/release/aziot-edged" ${D}${bindir}/aziot-edged | ||
|
||
# Config file | ||
install -d "${D}${sysconfdir}/aziot" | ||
install -d "${D}${sysconfdir}/aziot/edged" | ||
install -d "${D}${sysconfdir}/aziot/edged/config.d" | ||
|
||
# Data dir | ||
install -d -o iotedge -g iotedge "${D}${localstatedir}/lib/iotedge" | ||
|
||
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | ||
install -d ${D}${systemd_unitdir}/system | ||
install -m 644 ${WORKDIR}/aziot-edged.service ${D}${systemd_unitdir}/system | ||
install -m 644 ${WORKDIR}/git/edgelet/contrib/systemd/debian/aziot-edged.workload.socket ${D}${systemd_unitdir}/system | ||
install -m 644 ${WORKDIR}/git/edgelet/contrib/systemd/debian/aziot-edged.mgmt.socket ${D}${systemd_unitdir}/system | ||
else | ||
install -d ${D}${sysconfdir}/init.d | ||
install -m 755 ${WORKDIR}/git/edgelet/contrib/debian/iotedge.init ${D}${sysconfdir}/init.d/iotedge | ||
fi | ||
} | ||
|
||
inherit useradd | ||
USERADD_PACKAGES = "${PN}" | ||
USERADD_PARAM_${PN} = "-r -u 15580 -g iotedge -G docker -s /bin/false -d ${localstatedir}/lib/iotedge iotedge" | ||
GROUPADD_PARAM_${PN} = "-r -g 15580 iotedge" | ||
|
||
FILES_${PN} += " \ | ||
${systemd_unitdir}/system/* \ | ||
${localstatedir}/lib/iotedge \ | ||
${sysconfdir}/aziot/ \ | ||
" |
19 changes: 19 additions & 0 deletions
19
recipes-core/aziot-daemon/aziot-daemon/aziot-edged.service
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
[Unit] | ||
Description=Azure IoT Edge daemon | ||
After=docker.service aziot-edged.workload.socket aziot-edged.mgmt.socket | ||
Requires=aziot-edged.workload.socket aziot-edged.mgmt.socket | ||
Wants=docker.service | ||
Documentation=man:aziot-edged(8) | ||
|
||
[Service] | ||
ExecStart=/usr/bin/aziot-edged | ||
KillMode=process | ||
TimeoutStartSec=600 | ||
TimeoutStopSec=40 | ||
Restart=on-failure | ||
RestartPreventExitStatus=153 | ||
RestartSec=5 | ||
|
||
[Install] | ||
WantedBy=multi-user.target | ||
Also=aziot-edged.workload.socket aziot-edged.mgmt.socket |
Oops, something went wrong.