diff --git a/.oelint.cfg b/.oelint.cfg index d98ccae..19d885d 100644 --- a/.oelint.cfg +++ b/.oelint.cfg @@ -1,12 +1,19 @@ # oelint-adv defaults for this layer. Auto-loaded when oelint-adv runs with this # directory as the working directory (see contrib/oelint/run-oelint.sh). # -# The only layer-wide suppression is oelint.var.bbclassextend: every recipe in -# this layer is target-only, so the "add BBCLASSEXTEND" suggestion never applies -# and would otherwise need a redundant inline comment on every single recipe. +# Layer-wide suppressions: +# * oelint.var.bbclassextend: every recipe in this layer is target-only, so the +# "add BBCLASSEXTEND" suggestion never applies and would otherwise need a +# redundant inline comment on every single recipe. +# * oelint.var.licenseremotefile: recipes whose only sources are files from +# this layer have no upstream license file to check, so they point +# LIC_FILES_CHKSUM at ${COMMON_LICENSE_DIR}, as OE-Core does for its own +# such recipes. Recipes that fetch a source must still checksum its license. # All other exceptions stay inline as '# nooelint: ' comments next to # the finding, so new recipes are always fully linted and each exception is # documented in place. [oelint] release = blacksail -suppress = oelint.var.bbclassextend +suppress = + oelint.var.bbclassextend + oelint.var.licenseremotefile diff --git a/contrib/oelint/run-oelint.sh b/contrib/oelint/run-oelint.sh index facd2a9..2d66f37 100755 --- a/contrib/oelint/run-oelint.sh +++ b/contrib/oelint/run-oelint.sh @@ -4,16 +4,17 @@ # All linter configuration is declarative and lives at the layer root, so this # script only has to enumerate the files (oelint-adv does not recurse into # directories): -# * .oelint.cfg - sets '--release' and the single layer-wide -# suppression (oelint.var.bbclassextend); auto-loaded -# from the working directory +# * .oelint.cfg - sets '--release' and the layer-wide suppressions +# (oelint.var.bbclassextend, +# oelint.var.licenseremotefile); auto-loaded from the +# working directory # * oelint.constants.json - the layer constant-DB additions, auto-loaded by # oelint-adv from the layer root (no --constantmods) # -# Aside from oelint.var.bbclassextend (which never applies to a target-only -# layer), exceptions stay inline as '# nooelint: ' comments next to the -# finding, so new recipes are always fully linted and each exception is -# documented in place (and flagged by oelint.file.inlinesuppress_na once stale). +# Aside from the layer-wide suppressions in .oelint.cfg, exceptions stay inline +# as '# nooelint: ' comments next to the finding, so new recipes are +# always fully linted and each exception is documented in place (and flagged by +# oelint.file.inlinesuppress_na once stale). set -eu # Neutralise CDPATH so 'cd' below can't print or jump to an unexpected dir. diff --git a/recipes-core/easysplash/easysplash-animation-default_2.0.0.bb b/recipes-core/easysplash/easysplash-animation-default_2.0.0.bb index 2b2bbc0..9f9ce04 100644 --- a/recipes-core/easysplash/easysplash-animation-default_2.0.0.bb +++ b/recipes-core/easysplash/easysplash-animation-default_2.0.0.bb @@ -4,7 +4,11 @@ HOMEPAGE = "https://github.com/OSSystems/EasySplash" BUGTRACKER = "https://github.com/OSSystems/EasySplash/issues" SECTION = "graphics" CVE_PRODUCT = "easysplash" -LICENSE = "CLOSED" +LICENSE = "Apache-2.0 OR MIT" +LIC_FILES_CHKSUM = "\ + file://LICENSE-APACHE-2.0;md5=1836efb2eb779966696f473ee8540542 \ + file://LICENSE-MIT;md5=b377b220f43d747efdec40d69fcaa69d \ +" LICENSE_FLAGS = "commercial" LICENSE_FLAGS_DETAILS[commercial] = "Requires gstreamer1.0-libav, which is license-flagged commercial." diff --git a/recipes-core/easysplash/easysplash-animation-ossystems_2.0.0.bb b/recipes-core/easysplash/easysplash-animation-ossystems_2.0.0.bb index 2a442cc..c9ff724 100644 --- a/recipes-core/easysplash/easysplash-animation-ossystems_2.0.0.bb +++ b/recipes-core/easysplash/easysplash-animation-ossystems_2.0.0.bb @@ -4,7 +4,11 @@ HOMEPAGE = "https://github.com/OSSystems/EasySplash" BUGTRACKER = "https://github.com/OSSystems/EasySplash/issues" SECTION = "graphics" CVE_PRODUCT = "easysplash" -LICENSE = "CLOSED" +LICENSE = "Apache-2.0 OR MIT" +LIC_FILES_CHKSUM = "\ + file://LICENSE-APACHE-2.0;md5=1836efb2eb779966696f473ee8540542 \ + file://LICENSE-MIT;md5=b377b220f43d747efdec40d69fcaa69d \ +" LICENSE_FLAGS = "commercial" LICENSE_FLAGS_DETAILS[commercial] = "Requires gstreamer1.0-libav, which is license-flagged commercial." diff --git a/recipes-core/easysplash/easysplash-config_2.0.0.bb b/recipes-core/easysplash/easysplash-config_2.0.0.bb index 35c7340..4930dd8 100644 --- a/recipes-core/easysplash/easysplash-config_2.0.0.bb +++ b/recipes-core/easysplash/easysplash-config_2.0.0.bb @@ -4,7 +4,8 @@ HOMEPAGE = "https://github.com/OSSystems/EasySplash" BUGTRACKER = "https://github.com/OSSystems/EasySplash/issues" SECTION = "graphics" CVE_PRODUCT = "easysplash" -LICENSE = "CLOSED" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRC_URI += "file://easysplash.default" diff --git a/recipes-core/easysplash/easysplash_2.0.0.bb b/recipes-core/easysplash/easysplash_2.0.0.bb index b891dc8..b634c08 100644 --- a/recipes-core/easysplash/easysplash_2.0.0.bb +++ b/recipes-core/easysplash/easysplash_2.0.0.bb @@ -9,7 +9,7 @@ HOMEPAGE = "https://github.com/OSSystems/EasySplash" BUGTRACKER = "https://github.com/OSSystems/EasySplash/issues" SECTION = "graphics" CVE_PRODUCT = "easysplash" -LICENSE = "Apache-2.0 | MIT" +LICENSE = "Apache-2.0 OR MIT" LIC_FILES_CHKSUM = "\ file://LICENSE-APACHE-2.0;md5=1836efb2eb779966696f473ee8540542 \ file://LICENSE-MIT;md5=b377b220f43d747efdec40d69fcaa69d \ 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 9f02ac1..4a8f00f 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 @@ -4,7 +4,8 @@ HOMEPAGE = "https://github.com/OSSystemsEmbeddedLinux/meta-ossystems-base" BUGTRACKER = "https://github.com/OSSystemsEmbeddedLinux/meta-ossystems-base/issues" SECTION = "graphics" CVE_PRODUCT = "weston-touch-calibrator-service" -LICENSE = "CLOSED" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRC_URI = "\ file://weston-touch-calibrator.default \ @@ -13,6 +14,8 @@ SRC_URI = "\ file://touchscreen.rules \ " +S = "${UNPACKDIR}" + inherit systemd features_check REQUIRED_DISTRO_FEATURES += "wayland pam"