diff --git a/conf/distro/include/oel.inc b/conf/distro/include/oel.inc index 5b4b389..e350e2f 100644 --- a/conf/distro/include/oel.inc +++ b/conf/distro/include/oel.inc @@ -66,6 +66,7 @@ SANITY_TESTED_DISTROS ?= " \ # Override these in oel based distros OEL_DEFAULT_DISTRO_FEATURES ??= "ipv4 ipv6" OEL_EXTRA_DISTRO_FEATURES ??= "" +OEL_EXTRA_DISTRO_FEATURES += " wayland" OEL_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot" DISTRO_FEATURES ?= "${OEL_DEFAULT_DISTRO_FEATURES} \ diff --git a/conf/layer.conf b/conf/layer.conf index c2d0ee0..ba5a1c5 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -24,4 +24,6 @@ BBFILES_DYNAMIC += " \ chromium-browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/*/*/*.bbappend \ qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bb \ qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bbappend \ + webkit:${LAYERDIR}/dynamic-layers/webkit/*/*/*.bb \ + webkit:${LAYERDIR}/dynamic-layers/webkit/*/*/*.bbappend \ " diff --git a/recipes-browser/cog/cog-init_1.0.bb b/dynamic-layers/webkit/recipes-browser/cog/cog/cog-init_1.0.bb similarity index 100% rename from recipes-browser/cog/cog-init_1.0.bb rename to dynamic-layers/webkit/recipes-browser/cog/cog/cog-init_1.0.bb diff --git a/recipes-browser/cog/files/COPYING.MIT b/dynamic-layers/webkit/recipes-browser/cog/cog/files/COPYING.MIT similarity index 100% rename from recipes-browser/cog/files/COPYING.MIT rename to dynamic-layers/webkit/recipes-browser/cog/cog/files/COPYING.MIT diff --git a/recipes-browser/cog/files/cog-init.default b/dynamic-layers/webkit/recipes-browser/cog/cog/files/cog-init.default similarity index 100% rename from recipes-browser/cog/files/cog-init.default rename to dynamic-layers/webkit/recipes-browser/cog/cog/files/cog-init.default diff --git a/recipes-browser/cog/files/cog-init.initd b/dynamic-layers/webkit/recipes-browser/cog/cog/files/cog-init.initd similarity index 100% rename from recipes-browser/cog/files/cog-init.initd rename to dynamic-layers/webkit/recipes-browser/cog/cog/files/cog-init.initd diff --git a/recipes-browser/cog/files/cog-init.service b/dynamic-layers/webkit/recipes-browser/cog/cog/files/cog-init.service similarity index 100% rename from recipes-browser/cog/files/cog-init.service rename to dynamic-layers/webkit/recipes-browser/cog/cog/files/cog-init.service diff --git a/recipes-devtools/telegraf/telegraf-go-mods.inc b/recipes-devtools/telegraf/telegraf-go-mods.inc index cfb3bd4..1ce8199 100644 --- a/recipes-devtools/telegraf/telegraf-go-mods.inc +++ b/recipes-devtools/telegraf/telegraf-go-mods.inc @@ -303,6 +303,7 @@ SRC_URI += "\ gomod://github.com/karrick/godirwalk;version=v1.16.2;sha256sum=4b03e8c1cd90d22a2c273a1efc9a2489ae4cffe91c9f399e60c2e145020b38d6 \ gomod://github.com/kballard/go-shellquote;version=v0.0.0-20180428030007-95032a82bc51;sha256sum=ae4cb7b097dc4eb0c248dff00ed3bbf0f36984c4162ad1d615266084e58bd6cc \ gomod://github.com/klauspost/compress;version=v1.18.6;sha256sum=61b417d2d3b6b7f5b5f4179f311fb156bd5bcea040353150c41111dc1777f11a \ + gomod://github.com/klauspost/cpuid/v2;version=v2.3.0;sha256sum=e6766f75ecfadf12fd045e4bdd9383f2a5bd3f9bd4c88a6db72861c84cf41486 \ gomod://github.com/klauspost/pgzip;version=v1.2.6;sha256sum=8ac508e93b22dca1a731a3a4c921b57c5ed1daea7b3629a2cf85c3b7530dda84 \ gomod://github.com/kolo/xmlrpc;version=v0.0.0-20220921171641-a4b6fa1dd06b;sha256sum=310742360a864798a1bfce6db8604263574c0be502670c8bfedeab8fcbe9d191 \ gomod://github.com/kr/fs;version=v0.1.0;sha256sum=d376bd98e81aea34585fc3b04bab76363e9e87cde69383964e57e9779f2af81e \ diff --git a/recipes-devtools/telegraf/telegraf-licenses.inc b/recipes-devtools/telegraf/telegraf-licenses.inc index 6927132..02b2bae 100644 --- a/recipes-devtools/telegraf/telegraf-licenses.inc +++ b/recipes-devtools/telegraf/telegraf-licenses.inc @@ -315,6 +315,7 @@ LIC_FILES_CHKSUM += "\ file://pkg/mod/github.com/klauspost/compress@v1.18.6/snappy/LICENSE;md5=b8b79c7d4cda128290b98c6a21f9aac6;spdx=BSD-3-Clause \ file://pkg/mod/github.com/klauspost/compress@v1.18.6/snappy/xerial/LICENSE;md5=49edd5648b6349a1af65ea5a69db2753;spdx=MIT \ file://pkg/mod/github.com/klauspost/compress@v1.18.6/zstd/internal/xxhash/LICENSE.txt;md5=802da049c92a99b4387d3f3d91b00fa9;spdx=MIT \ + file://pkg/mod/github.com/klauspost/cpuid/v2@v2.3.0/LICENSE;md5=00d6f962401947482d082858f7ba2ff3;spdx=MIT \ file://pkg/mod/github.com/klauspost/pgzip@v1.2.6/GO_LICENSE;md5=591778525c869cdde0ab5a1bf283cd81;spdx=BSD-3-Clause \ file://pkg/mod/github.com/kolo/xmlrpc@v0.0.0-20220921171641-a4b6fa1dd06b/LICENSE;md5=1f1c20df475af4e157a22828f3b9eb61;spdx=MIT \ file://pkg/mod/github.com/kr/fs@v0.1.0/LICENSE;md5=591778525c869cdde0ab5a1bf283cd81;spdx=BSD-3-Clause \ diff --git a/recipes-graphics/weston-touch-calibrator-service/weston-touch-calibrator-service_1.0.bb b/recipes-graphics/weston-touch-calibrator-service/weston-touch-calibrator-service_1.0.bb index 1c2d495..7e71aea 100644 --- a/recipes-graphics/weston-touch-calibrator-service/weston-touch-calibrator-service_1.0.bb +++ b/recipes-graphics/weston-touch-calibrator-service/weston-touch-calibrator-service_1.0.bb @@ -13,7 +13,9 @@ SRC_URI = "\ file://touchscreen.rules \ " -inherit systemd +inherit systemd features_check + +REQUIRED_DISTRO_FEATURES += "wayland" SYSTEMD_SERVICE:${PN} = "weston-touch-calibrator.service"