Skip to content

Commit 888e53a

Browse files
authored
Cleanup iotedge-daemon recipe (Azure#8)
* Update priority * Use static uid and gid * Fix openssl directories
1 parent f82265d commit 888e53a

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

conf/layer.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
77

88
BBFILE_COLLECTIONS += "meta-iotedge"
99
BBFILE_PATTERN_meta-iotedge = "^${LAYERDIR}/"
10-
BBFILE_PRIORITY_meta-iotedge = "6"
10+
BBFILE_PRIORITY_meta-iotedge = "10"
1111

1212
LAYERDEPENDS_meta-iotedge = "core rust-layer virtualization-layer"
1313
LAYERSERIES_COMPAT_meta-iotedge = "sumo"

recipes-core/iotedge-daemon/iotedge-daemon.inc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ DEPENDS += "openssl10 docker"
22
RDEPENDS_${PN} += "virtual/libiothsm docker"
33
INSANE_SKIP_${PN} += "dev-deps"
44

5-
export SYSROOT = "${STAGING_DIR_TARGET}"
6-
export OpenSSLDir = "${STAGING_DIR_TARGET}/usr"
7-
export OPENSSL_DIR = "${STAGING_DIR_TARGET}/usr"
8-
export OPENSSL_INCLUDE_DIR = "${STAGING_DIR_TARGET}/usr/include"
5+
export SYSROOT = "${STAGING_DIR_HOST}"
6+
export OpenSSLDir = "${STAGING_EXECPREFIXDIR}"
7+
export OPENSSL_DIR = "${STAGING_EXECPREFIXDIR}"
8+
export OPENSSL_INCLUDE_DIR = "${STAGING_INCDIR}"
99
export OPENSSL_LIB_DIR = "${STAGING_LIBDIR}"
1010
export BUILD_SOURCEVERSION="${SRCREV}"
1111

@@ -44,8 +44,8 @@ do_install () {
4444

4545
inherit useradd
4646
USERADD_PACKAGES = "${PN}"
47-
USERADD_PARAM_${PN} = "-r -g iotedge -G docker -s /bin/false -d ${localstatedir}/lib/iotedge iotedge"
48-
GROUPADD_PARAM_${PN} = "-r iotedge"
47+
USERADD_PARAM_${PN} = "-r -u 15580 -g iotedge -G docker -s /bin/false -d ${localstatedir}/lib/iotedge iotedge"
48+
GROUPADD_PARAM_${PN} = "-r -g 15580 iotedge"
4949

5050
FILES_${PN} += " \
5151
${systemd_unitdir}/system/* \

0 commit comments

Comments
 (0)