From 53c6324c5f2fef67ce5ee6e0d850d693885bf28f Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Thu, 22 Jun 2023 06:51:02 -0400 Subject: scap-security-guide: Add Poky Signed-off-by: Armin Kuster --- ...0001-scap-security-guide-add-Poky-support.patch | 91 ++++++++++++++++++++++ .../scap-security-guide_0.1.67.bb | 1 + 2 files changed, 92 insertions(+) create mode 100644 recipes-compliance/scap-security-guide/files/0001-scap-security-guide-add-Poky-support.patch (limited to 'recipes-compliance') diff --git a/recipes-compliance/scap-security-guide/files/0001-scap-security-guide-add-Poky-support.patch b/recipes-compliance/scap-security-guide/files/0001-scap-security-guide-add-Poky-support.patch new file mode 100644 index 0000000..355f954 --- /dev/null +++ b/recipes-compliance/scap-security-guide/files/0001-scap-security-guide-add-Poky-support.patch @@ -0,0 +1,91 @@ +From 23a224203a73688567f500380644e5cf30c8ed99 Mon Sep 17 00:00:00 2001 +From: Armin Kuster +Date: Thu, 22 Jun 2023 06:19:26 -0400 +Subject: [PATCH] scap-security-guide: add Poky support + +Signed-off-by: Armin Kuster + +Upstream-Status: Pending +Signed-off-by: Armin Kuster + +--- + products/openembedded/product.yml | 7 +++- + .../openembedded/transforms/constants.xslt | 4 +-- + shared/checks/oval/installed_OS_is_poky.xml | 33 +++++++++++++++++++ + 3 files changed, 41 insertions(+), 3 deletions(-) + create mode 100644 shared/checks/oval/installed_OS_is_poky.xml + +diff --git a/products/openembedded/product.yml b/products/openembedded/product.yml +index 9f2f12d737..a495e197c0 100644 +--- a/products/openembedded/product.yml ++++ b/products/openembedded/product.yml +@@ -14,6 +14,11 @@ init_system: "systemd" + cpes_root: "../../shared/applicability" + cpes: + - openembedded: +- name: "cpe:/o:openembedded" ++ name: "cpe:/o:openembedded:nodistro:" + title: "OpenEmbedded nodistro" + check_id: installed_OS_is_openembedded ++ ++ - poky: ++ name: "cpe:/o:openembedded:poky:" ++ title: "OpenEmbedded Poky reference distribution" ++ check_id: installed_OS_is_poky +diff --git a/products/openembedded/transforms/constants.xslt b/products/openembedded/transforms/constants.xslt +index 85e812a7c1..8901def2f9 100644 +--- a/products/openembedded/transforms/constants.xslt ++++ b/products/openembedded/transforms/constants.xslt +@@ -2,8 +2,8 @@ + + + +-OpenEmbedded nodistro +-OE nodistro ++OpenEmbedded based distribution ++OE distros + empty + openembedded + +diff --git a/shared/checks/oval/installed_OS_is_poky.xml b/shared/checks/oval/installed_OS_is_poky.xml +new file mode 100644 +index 0000000000..9c41acd786 +--- /dev/null ++++ b/shared/checks/oval/installed_OS_is_poky.xml +@@ -0,0 +1,33 @@ ++ ++ ++ ++ Poky ++ ++ multi_platform_all ++ ++ The operating system installed is a Poky referenece based System ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ /etc/os-release ++ ++ ++ ++ ++ ++ ++ /etc/os-release ++ ^ID=poky$ ++ 1 ++ ++ ++ +-- +2.34.1 + diff --git a/recipes-compliance/scap-security-guide/scap-security-guide_0.1.67.bb b/recipes-compliance/scap-security-guide/scap-security-guide_0.1.67.bb index a9023ec..3802b1a 100644 --- a/recipes-compliance/scap-security-guide/scap-security-guide_0.1.67.bb +++ b/recipes-compliance/scap-security-guide/scap-security-guide_0.1.67.bb @@ -10,6 +10,7 @@ SRCREV = "dad85502ce8da722a6afc391346c41cee61e90a9" SRC_URI = "git://github.com/ComplianceAsCode/content.git;branch=master;protocol=https \ file://0001-scap-security-guide-add-openembedded.patch \ file://0001-standard.profile-expand-checks.patch \ + file://0001-scap-security-guide-add-Poky-support.patch \ file://run_eval.sh \ " -- cgit v1.2.3-54-g00ecf