summaryrefslogtreecommitdiff
path: root/meta-unit-core
diff options
context:
space:
mode:
Diffstat (limited to 'meta-unit-core')
-rw-r--r--meta-unit-core/conf/layer.conf6
-rw-r--r--meta-unit-core/dynamic-layers/unit-graphics-layer/recipes-unit/images/core-image-unit.bbappend5
-rw-r--r--meta-unit-core/recipes-users/useradd/add-user-svc.bb2
-rw-r--r--meta-unit-core/recipes-users/useradd/add-user-unitexe.bb2
4 files changed, 12 insertions, 3 deletions
diff --git a/meta-unit-core/conf/layer.conf b/meta-unit-core/conf/layer.conf
index 64e7d24..7f6e371 100644
--- a/meta-unit-core/conf/layer.conf
+++ b/meta-unit-core/conf/layer.conf
@@ -4,7 +4,9 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
BBFILE_COLLECTIONS += "unit-core"
BBFILE_PATTERN_unit-core := "^${LAYERDIR}/"
-BBFILE_PRIORITY_unit-core = "13"
+BBFILE_PRIORITY_unit-core = "14"
+
+LAYERDEPENDS_unit-distro = "core yocto unit-users-layer"
LAYERSERIES_COMPAT_unit-core = "whinlatter"
@@ -17,6 +19,8 @@ BBFILES_DYNAMIC += " \
unit-profiling-layer:${LAYERDIR}/dynamic-layers/unit-profiling-layer/recipes-*/*/*.bbappend \
raspberrypi:${LAYERDIR}/dynamic-layers/raspberrypi/recipes-*/*/*.bb \
raspberrypi:${LAYERDIR}/dynamic-layers/raspberrypi/recipes-*/*/*.bbappend \
+ unit-graphics-layer:${LAYERDIR}/dynamic-layers/unit-graphics-layer/recipes-*/*/*.bb \
+ unit-graphics-layer:${LAYERDIR}/dynamic-layers/unit-graphics-layer/recipes-*/*/*.bbappend \
"
UNIT_CORE_LAYERDIR = "${LAYERDIR}"
diff --git a/meta-unit-core/dynamic-layers/unit-graphics-layer/recipes-unit/images/core-image-unit.bbappend b/meta-unit-core/dynamic-layers/unit-graphics-layer/recipes-unit/images/core-image-unit.bbappend
new file mode 100644
index 0000000..379ddca
--- /dev/null
+++ b/meta-unit-core/dynamic-layers/unit-graphics-layer/recipes-unit/images/core-image-unit.bbappend
@@ -0,0 +1,5 @@
+inherit fix-kiosk-home-dir-ownership
+
+IMAGE_FEATURES:append = " hwcodecs"
+
+IMAGE_INSTALL:append = " packagegroup-unit-kiosk"
diff --git a/meta-unit-core/recipes-users/useradd/add-user-svc.bb b/meta-unit-core/recipes-users/useradd/add-user-svc.bb
index ee534c5..a1d44fa 100644
--- a/meta-unit-core/recipes-users/useradd/add-user-svc.bb
+++ b/meta-unit-core/recipes-users/useradd/add-user-svc.bb
@@ -14,7 +14,7 @@ RDEPENDS:${PN}:append = " systemd"
USERADD_PACKAGES = "${PN}"
USER_TO_ADD_NAME ?= "svc"
-USER_TO_ADD_UID ?= "2000"
+USER_TO_ADD_UID ?= "50556"
USER_TO_ADD_PASSWORD_HASHED ?= "\$6\$1TQs7iLskyTyCjoL\$xhngcFWaPRsoaZCwLSsYXUrRcVdR19zV2vBEzrzSEVu8zbqDlfKu4HLwzsZfiqJCiWqiu9qirD4Ym12CMf7D7."
COMMA_SEPARATED_LIST_OF_GROUPS_TO_ADD_USER_TO ?= "systemd-journal"
diff --git a/meta-unit-core/recipes-users/useradd/add-user-unitexe.bb b/meta-unit-core/recipes-users/useradd/add-user-unitexe.bb
index 527af74..5af066d 100644
--- a/meta-unit-core/recipes-users/useradd/add-user-unitexe.bb
+++ b/meta-unit-core/recipes-users/useradd/add-user-unitexe.bb
@@ -16,7 +16,7 @@ RDEPENDS:${PN}:append = " systemd"
USERADD_PACKAGES = "${PN}"
USER_TO_ADD_NAME ?= "unitexe"
-USER_TO_ADD_UID ?= "1000"
+USER_TO_ADD_UID ?= "50555"
USER_TO_ADD_PASSWORD_HASHED ?= "\$6\$esHchcEKubkj/1v7\$woeV0ChUqcC8J8lOEWB563mX4XRAvYJldGcU/I0Pzg1Nw9bBGOQoLmIsn0wU1gUzpysZr6R18xps5Cjn470Nv/"
COMMA_SEPARATED_LIST_OF_GROUPS_TO_ADD_USER_TO ?= "systemd-journal"