From 4dc2b5202769e86631780c2469779d3237161905 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Tue, 20 Jun 2023 18:39:07 -0400 Subject: openscap: Update to tip to get OE/Poky support Drop changes now in upstream. Signed-off-by: Armin Kuster --- .../files/0001-openscap-Add-openembedded.patch | 128 --------------------- .../files/0002-openembedded-add-Poky-distro.patch | 80 ------------- recipes-compliance/openscap/openscap_1.3.7.bb | 6 +- 3 files changed, 2 insertions(+), 212 deletions(-) delete mode 100644 recipes-compliance/openscap/files/0001-openscap-Add-openembedded.patch delete mode 100644 recipes-compliance/openscap/files/0002-openembedded-add-Poky-distro.patch (limited to 'recipes-compliance/openscap') diff --git a/recipes-compliance/openscap/files/0001-openscap-Add-openembedded.patch b/recipes-compliance/openscap/files/0001-openscap-Add-openembedded.patch deleted file mode 100644 index 1af72bb..0000000 --- a/recipes-compliance/openscap/files/0001-openscap-Add-openembedded.patch +++ /dev/null @@ -1,128 +0,0 @@ -From 8f8b580a882e9584e2b3726dab2c3f8e01cb885f Mon Sep 17 00:00:00 2001 -From: Armin Kuster -Date: Sun, 4 Jun 2023 20:16:12 -0400 -Subject: [PATCH 1/2] openscap: Add openembedded - -Signed-off-by: Armin Kuster - -Upstream-Status: Pending -Signed-off-by: Armin Kuster - ---- - cpe/openscap-cpe-dict.xml | 5 +++ - cpe/openscap-cpe-oval.xml | 45 +++++++++++++++++++++------ - src/OVAL/probes/unix/runlevel_probe.c | 8 ++++- - 3 files changed, 47 insertions(+), 11 deletions(-) - -diff --git a/cpe/openscap-cpe-dict.xml b/cpe/openscap-cpe-dict.xml -index 02d536189..3338a9e55 100644 ---- a/cpe/openscap-cpe-dict.xml -+++ b/cpe/openscap-cpe-dict.xml -@@ -53,4 +53,9 @@ - Fedora 35 - oval:org.open-scap.cpe.fedora:def:35 - -+ -+ OpenEmbedded all versions -+ oval:org.open-scap.cpe.openembedded:def:1 -+ -+ - -diff --git a/cpe/openscap-cpe-oval.xml b/cpe/openscap-cpe-oval.xml -index 64099400b..2f3e25419 100644 ---- a/cpe/openscap-cpe-oval.xml -+++ b/cpe/openscap-cpe-oval.xml -@@ -821,6 +821,20 @@ - - - -+ -+ -+ OpenEmbedded Org -+ -+ OpenEmbedded Nodistro -+ -+ -+ OpenEmbedded No Distro is installed -+ -+ -+ -+ -+ -+ - - - SOFTWARE\Microsoft\Windows NT\CurrentVersion - ProductName - -- -- /etc/os-release -- ^ID="(\w+)"$ -- 1 -- -- -- /etc/os-release -- ^VERSION_ID="(\d)"$ -- 1 -- -+ -+ /etc/os-release -+ -+ -+ /etc -+ os-release -+ ^VERSION=.(\d*.\d*) -+ 1 - - - -@@ -1455,5 +1472,13 @@ - - ^.*2016.*$ - -+ -+ 4.2 -+ - - -diff --git a/src/OVAL/probes/unix/runlevel_probe.c b/src/OVAL/probes/unix/runlevel_probe.c -index 7a94b23fc..00a5b85f6 100644 ---- a/src/OVAL/probes/unix/runlevel_probe.c -+++ b/src/OVAL/probes/unix/runlevel_probe.c -@@ -403,6 +403,11 @@ static int is_wrlinux(void) - return parse_os_release("cpe:/o:windriver:wrlinux"); - } - -+static int is_openembedded(void) -+{ -+ return parse_os_release("cpe:/o:openembedded:nodistro"); -+} -+ - static int is_common (void) - { - return (1); -@@ -424,7 +429,8 @@ const distro_tbl_t distro_tbl[] = { - { &is_suse, &get_runlevel_suse }, - { &is_solaris, &get_runlevel_redhat }, - { &is_wrlinux, &get_runlevel_wrlinux }, -- { &is_common, &get_runlevel_common } -+ { &is_common, &get_runlevel_common }, -+ { &is_openembedded, &get_runlevel_common } - }; - - #define DISTRO_TBL_SIZE ((sizeof distro_tbl)/sizeof (distro_tbl_t)) --- -2.25.1 - diff --git a/recipes-compliance/openscap/files/0002-openembedded-add-Poky-distro.patch b/recipes-compliance/openscap/files/0002-openembedded-add-Poky-distro.patch deleted file mode 100644 index 182d9ec..0000000 --- a/recipes-compliance/openscap/files/0002-openembedded-add-Poky-distro.patch +++ /dev/null @@ -1,80 +0,0 @@ -From eb3865f2603fff2cc5d39d2379ba9f3857affca9 Mon Sep 17 00:00:00 2001 -From: Armin Kuster -Date: Sun, 4 Jun 2023 20:51:50 -0400 -Subject: [PATCH 2/2] openembedded: add Poky distro - -Signed-off-by: Armin Kuster ---- - cpe/openscap-cpe-dict.xml | 4 ++++ - cpe/openscap-cpe-oval.xml | 14 ++++++++++++++ - src/OVAL/probes/unix/runlevel_probe.c | 8 +++++++- - 3 files changed, 25 insertions(+), 1 deletion(-) - -diff --git a/cpe/openscap-cpe-dict.xml b/cpe/openscap-cpe-dict.xml -index 3338a9e55..f86b55864 100644 ---- a/cpe/openscap-cpe-dict.xml -+++ b/cpe/openscap-cpe-dict.xml -@@ -57,5 +57,9 @@ - OpenEmbedded all versions - oval:org.open-scap.cpe.openembedded:def:1 - -+ -+ Poky all versions -+ oval:org.open-scap.cpe.poky:def:1 -+ - - -diff --git a/cpe/openscap-cpe-oval.xml b/cpe/openscap-cpe-oval.xml -index 2f3e25419..03d192333 100644 ---- a/cpe/openscap-cpe-oval.xml -+++ b/cpe/openscap-cpe-oval.xml -@@ -835,6 +835,20 @@ - - - -+ -+ -+ Yocto Project Reference Distro -+ -+ Poky Distro -+ -+ -+ Yocto Project Reference Distro is installed -+ -+ -+ -+ -+ -+ - - -