openscap-daemon: This is now obsolete
PATCH 1/7 openscap-daemon: This is now obsolete
drop pkg
Signed-off-by Armin Kuster <[email protected]>
--- ...le-and-variables-to-get-rid-of-async.patch | 130 ------------------ .../openscap-daemon/openscap-daemon_0.1.10.bb | 23 ---- 2 files changed, 153 deletions(-) delete mode 100644 meta-security-compliance/recipes-openscap/openscap-daemon/files/0001-Renamed-module-and-variables-to-get-rid-of-async.patch delete mode 100644 meta-security-compliance/recipes-openscap/openscap-daemon/openscap-daemon_0.1.10.bb
meta-security-compliance/recipes-openscap/openscap-daemon/files/0001-Renamed-module-and-variables-to-get-rid-of-async.patch deleted +0 -130
@@ -1,130 +0,0 @@ -From c34349720a57997d30946286756e2ba9dbab6ace Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= <[email protected]> -Date: Mon, 2 Jul 2018 11:21:19 +0200 -Subject: [PATCH] Renamed module and variables to get rid of async. - -async is a reserved word in Python 3.7. - -Upstream-Status: Backport -[https://github.com/OpenSCAP/openscap-daemon/commit/c34349720a57997d30946286756e2ba9dbab6ace] - -Signed-off-by: Yi Zhao <[email protected]> ---- - openscap_daemon/{async.py => async_tools.py} | 0 - openscap_daemon/dbus_daemon.py | 2 +- - openscap_daemon/system.py | 16 ++++++++-------- - tests/unit/test_basic_update.py | 3 ++- - 4 files changed, 11 insertions(+), 10 deletions(-) - rename openscap_daemon/{async.py => async_tools.py} (100%) - -diff --git a/openscap_daemon/async.py b/openscap_daemon/async_tools.py -similarity index 100% -rename from openscap_daemon/async.py -rename to openscap_daemon/async_tools.py -diff --git a/openscap_daemon/dbus_daemon.py b/openscap_daemon/dbus_daemon.py -index e6eadf9..cb6a8b6 100644 ---- a/openscap_daemon/dbus_daemon.py -+++ b/openscap_daemon/dbus_daemon.py -@@ -81,7 +81,7 @@ class OpenSCAPDaemonDbus(dbus.service.Object): - @dbus.service.method(dbus_interface=dbus_utils.DBUS_INTERFACE, - in_signature="", out_signature="a(xsi)") - def GetAsyncActionsStatus(self): -- return self.system.async.get_status() -+ return self.system.async_manager.get_status() - - @dbus.service.method(dbus_interface=dbus_utils.DBUS_INTERFACE, - in_signature="s", out_signature="(sssn)") -diff --git a/openscap_daemon/system.py b/openscap_daemon/system.py -index 2012f6e..85c2680 100644 ---- a/openscap_daemon/system.py -+++ b/openscap_daemon/system.py -@@ -26,7 +26,7 @@ import logging - from openscap_daemon.task import Task - from openscap_daemon.config import Configuration - from openscap_daemon import oscap_helpers --from openscap_daemon import async -+from openscap_daemon import async_tools - - - class ResultsNotAvailable(Exception): -@@ -40,7 +40,7 @@ TASK_ACTION_PRIORITY = 10 - - class System(object): - def __init__(self, config_file): -- self.async = async.AsyncManager() -+ self.async_manager = async_tools.AsyncManager() - - logging.info("Loading configuration from '%s'.", config_file) - self.config = Configuration() -@@ -90,7 +90,7 @@ class System(object): - input_file, tailoring_file, None - ) - -- class AsyncEvaluateSpecAction(async.AsyncAction): -+ class AsyncEvaluateSpecAction(async_tools.AsyncAction): - def __init__(self, system, spec): - super(System.AsyncEvaluateSpecAction, self).__init__() - -@@ -113,7 +113,7 @@ class System(object): - return "Evaluate Spec '%s'" % (self.spec) - - def evaluate_spec_async(self, spec): -- return self.async.enqueue( -+ return self.async_manager.enqueue( - System.AsyncEvaluateSpecAction( - self, - spec -@@ -488,7 +488,7 @@ class System(object): - - return ret - -- class AsyncUpdateTaskAction(async.AsyncAction): -+ class AsyncUpdateTaskAction(async_tools.AsyncAction): - def __init__(self, system, task_id, reference_datetime): - super(System.AsyncUpdateTaskAction, self).__init__() - -@@ -536,7 +536,7 @@ class System(object): - - if task.should_be_updated(reference_datetime): - self.tasks_scheduled.add(task.id_) -- self.async.enqueue( -+ self.async_manager.enqueue( - System.AsyncUpdateTaskAction( - self, - task.id_, -@@ -662,7 +662,7 @@ class System(object): - fix_type - ) - -- class AsyncEvaluateCVEScannerWorkerAction(async.AsyncAction): -+ class AsyncEvaluateCVEScannerWorkerAction(async_tools.AsyncAction): - def __init__(self, system, worker): - super(System.AsyncEvaluateCVEScannerWorkerAction, self).__init__() - -@@ -680,7 +680,7 @@ class System(object): - return "Evaluate CVE Scanner Worker '%s'" % (self.worker) - - def evaluate_cve_scanner_worker_async(self, worker): -- return self.async.enqueue( -+ return self.async_manager.enqueue( - System.AsyncEvaluateCVEScannerWorkerAction( - self, - worker -diff --git a/tests/unit/test_basic_update.py b/tests/unit/test_basic_update.py -index 6f683e6..7f953f7 100755 ---- a/tests/unit/test_basic_update.py -+++ b/tests/unit/test_basic_update.py -@@ -37,8 +37,9 @@ class BasicUpdateTest(unit_test_harness.APITest): - print(self.system.tasks) - self.system.schedule_tasks() - -- while len(self.system.async.actions) > 0: -+ while len(self.system.async_manager.actions) > 0: - time.sleep(1) - -+ - if __name__ == "__main__": - BasicUpdateTest.run() --- -2.7.4 -
meta-security-compliance/recipes-openscap/openscap-daemon/openscap-daemon_0.1.10.bb deleted +0 -23
@@ -1,23 +0,0 @@ -# Copyright (C) 2017 Armin Kuster <[email protected]> -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMARRY = "The OpenSCAP Daemon is a service that runs in the background." -HOME_URL = "https://www.open-scap.org/tools/openscap-daemon/" -LIC_FILES_CHKSUM = "file://LICENSE;md5=40d2542b8c43a3ec2b7f5da31a697b88" -LICENSE = "LGPL-2.1-only" - -DEPENDS = "python3-dbus" - -SRCREV = "f25b16afb6ac761fea13132ff406fba4cdfd2b76" -SRC_URI = "git://github.com/OpenSCAP/openscap-daemon.git;branch=master;protocol=https \ - file://0001-Renamed-module-and-variables-to-get-rid-of-async.patch \ - " - -inherit python_setuptools_build_meta - -S = "${WORKDIR}/git" - -RDEPENDS:${PN} = "openscap scap-security-guide \ - python3-core python3-dbus \ - python3-pygobject \ - "
Signature · 1 line
2.34.1
PATCH 2/7 oe-scap: Not maintained nor upstreamed
drop
Signed-off-by Armin Kuster <[email protected]>
--- .../files/OpenEmbedded_nodistro_0.xccdf.xml | 14 ---- .../oe-scap/files/OpenEmbedded_nodistro_0.xml | 83 ------------------- .../oe-scap/files/oval-to-xccdf.xslt | 72 ---------------- .../recipes-openscap/oe-scap/files/run_cve.sh | 7 -- .../oe-scap/files/run_test.sh | 5 -- .../recipes-openscap/oe-scap/oe-scap_1.0.bb | 33 -------- 6 files changed, 214 deletions(-) delete mode 100644 meta-security-compliance/recipes-openscap/oe-scap/files/OpenEmbedded_nodistro_0.xccdf.xml delete mode 100644 meta-security-compliance/recipes-openscap/oe-scap/files/OpenEmbedded_nodistro_0.xml delete mode 100644 meta-security-compliance/recipes-openscap/oe-scap/files/oval-to-xccdf.xslt delete mode 100644 meta-security-compliance/recipes-openscap/oe-scap/files/run_cve.sh delete mode 100644 meta-security-compliance/recipes-openscap/oe-scap/files/run_test.sh delete mode 100644 meta-security-compliance/recipes-openscap/oe-scap/oe-scap_1.0.bb
meta-security-compliance/recipes-openscap/oe-scap/files/OpenEmbedded_nodistro_0.xccdf.xml deleted +0 -14
@@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xccdf:Benchmark xmlns:xccdf="http://checklists.nist.gov/xccdf/1.1" xmlns:oval="http://oval.mitre.org/XMLSchema/oval-common-5" xmlns:oval-def="http://oval.mitre.org/XMLSchema/oval-definitions-5" id="generated-xccdf" resolved="1"> - <xccdf:status>incomplete</xccdf:status> - <xccdf:title>Automatically generated XCCDF from OVAL file: OpenEmbedded_nodistro_0.xml</xccdf:title> - <xccdf:description>This file has been generated automatically from oval definitions file.</xccdf:description> - <xccdf:version time="2017-06-07T04:05:05">None, generated from OVAL file.</xccdf:version> - <xccdf:Rule selected="true" id="oval-com.redhat.rhsa-def-20171365"> - <xccdf:title>CPE-2017:1365: nss security and bug fix update (Important)</xccdf:title> - <xccdf:ident system="http://cve.mitre.org">CVE-2017-7502</xccdf:ident> - <xccdf:check system="http://oval.mitre.org/XMLSchema/oval-definitions-5"> - <xccdf:check-content-ref href="OpenEmbedded_nodistro_0.xml" name="oval:com.redhat.rhsa:def:20171365"/> - </xccdf:check> - </xccdf:Rule> -</xccdf:Benchmark>
meta-security-compliance/recipes-openscap/oe-scap/files/OpenEmbedded_nodistro_0.xml deleted +0 -83
83 lines not on this page · raw message
meta-security-compliance/recipes-openscap/oe-scap/files/oval-to-xccdf.xslt deleted +0 -72
72 lines not on this page · raw message
meta-security-compliance/recipes-openscap/oe-scap/files/run_cve.sh deleted +0 -7
@@ -1,7 +0,0 @@ -#!/bin/sh - -oscap oval eval \ ---report oval.html \ ---verbose-log-file filedevel.log \ ---verbose DEVEL \ -/usr/share/xml/scap/ssg/content/ssg-openembedded-ds.xml
meta-security-compliance/recipes-openscap/oe-scap/files/run_test.sh deleted +0 -5
@@ -1,5 +0,0 @@ -#!/bin/sh - -#oscap oval eval --result-file ./myresults.xml ./OpenEmbedded_nodistro_0.xml - -oscap xccdf eval --results results.xml --report report.html OpenEmbedded_nodistro_0.xccdf.xml
meta-security-compliance/recipes-openscap/oe-scap/oe-scap_1.0.bb deleted +0 -33
@@ -1,33 +0,0 @@ -# Copyright (C) 2017 Armin Kuster <[email protected]> -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMARRY = "OE SCAP files" -LIC_FILES_CHKSUM = "file://README.md;md5=46dec9f167b6e05986cb4023df6d92f4" -LICENSE = "MIT" - -SRCREV = "7147871d7f37d408c0dd7720ef0fd3ec1b54ad98" -SRC_URI = "git://github.com/akuster/oe-scap.git;branch=master;protocol=https" -SRC_URI += " \ - file://run_cve.sh \ - file://run_test.sh \ - file://OpenEmbedded_nodistro_0.xml \ - file://OpenEmbedded_nodistro_0.xccdf.xml \ - " - -S = "${WORKDIR}/git" - -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -do_install () { - install -d ${D}/${datadir}/oe-scap - install ${WORKDIR}/run_cve.sh ${D}/${datadir}/oe-scap/. - install ${WORKDIR}/run_test.sh ${D}/${datadir}/oe-scap/. - install ${WORKDIR}/OpenEmbedded_nodistro_0.xml ${D}/${datadir}/oe-scap/. - install ${WORKDIR}/OpenEmbedded_nodistro_0.xccdf.xml ${D}/${datadir}/oe-scap/. - cp ${S}/* ${D}/${datadir}/oe-scap/. -} - -FILES:${PN} += "${datadir}/oe-scap" - -RDEPENDS:${PN} = "openscap bash"
Signature · 1 line
2.34.1
PATCH 3/7 openscap: Fix native build missing depends
In reply to Armin KusterInclude .inc for pending change
New host OS required an addition to the depends file
Signed-off-by Armin Kuster <[email protected]>
--- .../openscap/openscap_1.3.7.bb | 60 +++++++++++++++++-- 1 file changed, 54 insertions(+), 6 deletions(-)
meta-security-compliance/recipes-openscap/openscap/openscap_1.3.7.bb +54 -6
@@ -1,19 +1,67 @@ -SUMARRY = "NIST Certified SCAP 1.2 toolkit" +# Copyright (C) 2017 - 2023 Armin Kuster <[email protected]> +# Released under the MIT license (see COPYING.MIT for the terms) -DEPENDS:append = " xmlsec1" +SUMARRY = "NIST Certified SCAP 1.2 toolkit" +HOME_URL = "https://www.open-scap.org/tools/openscap-base/" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +LICENSE = "LGPL-2.1-only" -require openscap.inc +DEPENDS = "dbus acl bzip2 pkgconfig gconf procps curl libxml2 libxslt libcap swig libpcre xmlsec1" +DEPENDS:class-native = "pkgconfig-native swig-native curl-native libxml2-native libxslt-native libcap-native libpcre-native xmlsec1-native" -inherit systemd SRCREV = "55efbfda0f617e05862ab6ed4862e10dbee52b03" SRC_URI = "git://github.com/OpenSCAP/openscap.git;branch=maint-1.3;protocol=https" -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE:${PN} = "oscap-remediate.service" +S = "${WORKDIR}/git" + +inherit cmake pkgconfig python3native python3targetconfig perlnative systemd + +PACKAGECONFIG ?= "python3 rpm perl gcrypt ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" +PACKAGECONFIG[python3] = "-DENABLE_PYTHON3=ON, ,python3, python3" +PACKAGECONFIG[perl] = "-DENABLE_PERL=ON, ,perl, perl" +PACKAGECONFIG[rpm] = "-DENABLE_OSCAP_UTIL_AS_RPM=ON, ,rpm, rpm" +PACKAGECONFIG[gcrypt] = "-DWITH_CRYPTO=gcrypt, ,libgcrypt" +PACKAGECONFIG[nss3] = "-DWITH_CRYPTO=nss3, ,nss" +PACKAGECONFIG[selinux] = ", ,libselinux" + +EXTRA_OECMAKE += "-DENABLE_PROBES_LINUX=ON -DENABLE_PROBES_UNIX=ON \ + -DENABLE_PROBES_SOLARIS=OFF -DENABLE_PROBES_INDEPENDENT=ON \ + -DENABLE_OSCAP_UTIL=ON -DENABLE_OSCAP_UTIL_SSH=ON \ + -DENABLE_OSCAP_UTIL_DOCKER=OFF -DENABLE_OSCAP_UTIL_CHROOT=OFF \ + -DENABLE_OSCAP_UTIL_PODMAN=OFF -DENABLE_OSCAP_UTIL_VM=OFF \ + -DENABLE_PROBES_WINDOWS=OFF -DENABLE_VALGRIND=OFF \ + -DENABLE_SCE=ON -DENABLE_MITRE=OFF -DENABLE_TESTS=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=ON -DCMAKE_SKIP_RPATH=ON \ + " + +STAGING_OSCAP_DIR = "${TMPDIR}/work-shared/${MACHINE}/oscap-source" +STAGING_OSCAP_BUILDDIR = "${TMPDIR}/work-shared/openscap/oscap-build-artifacts" + +do_configure:append:class-native () { + sed -i 's:OSCAP_DEFAULT_CPE_PATH.*$:OSCAP_DEFAULT_CPE_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/cpe":' ${B}/config.h + sed -i 's:OSCAP_DEFAULT_SCHEMA_PATH.*$:OSCAP_DEFAULT_SCHEMA_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/schemas":' ${B}/config.h + sed -i 's:OSCAP_DEFAULT_XSLT_PATH.*$:OSCAP_DEFAULT_XSLT_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/xsl":' ${B}/config.h +} do_install:append () { if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -D -m 0644 ${B}/oscap-remediate.service ${D}${systemd_system_unitdir}/oscap-remediate.service fi } + +do_install:class-native[cleandirs] += " ${STAGING_OSCAP_BUILDDIR}" +do_install:append:class-native () { + oscapdir=${STAGING_OSCAP_BUILDDIR}/${datadir_native} + install -d $oscapdir + cp -a ${D}/${STAGING_DATADIR_NATIVE}/openscap $oscapdir +} + + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "oscap-remediate.service" + +FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}" + +RDEPENDS:${PN} += "libxml2 python3-core libgcc bash" +BBCLASSEXTEND = "native"
Signature · 1 line
2.34.1
PATCH 4/7 openscap: Drop OE specific recipe
In reply to Armin KusterSigned-off-by Armin Kuster <[email protected]>
--- .../recipes-openscap/openscap/openscap.inc | 55 ------------------- .../recipes-openscap/openscap/openscap_git.bb | 14 ----- 2 files changed, 69 deletions(-) delete mode 100644 meta-security-compliance/recipes-openscap/openscap/openscap.inc delete mode 100644 meta-security-compliance/recipes-openscap/openscap/openscap_git.bb
meta-security-compliance/recipes-openscap/openscap/openscap.inc deleted +0 -55
@@ -1,55 +0,0 @@ -# Copyright (C) 2017 Armin Kuster <[email protected]> -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMARRY = "NIST Certified SCAP 1.2 toolkit" -HOME_URL = "https://www.open-scap.org/tools/openscap-base/" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" -LICENSE = "LGPL-2.1-only" - -DEPENDS = "dbus acl bzip2 pkgconfig gconf procps curl libxml2 libxslt libcap swig libpcre" -DEPENDS:class-native = "pkgconfig-native swig-native curl-native libxml2-native libxslt-native libcap-native libpcre-native" - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig python3native python3targetconfig perlnative - -PACKAGECONFIG ?= "python3 rpm perl gcrypt ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" -PACKAGECONFIG[python3] = "-DENABLE_PYTHON3=ON, ,python3, python3" -PACKAGECONFIG[perl] = "-DENABLE_PERL=ON, ,perl, perl" -PACKAGECONFIG[rpm] = "-DENABLE_OSCAP_UTIL_AS_RPM=ON, ,rpm, rpm" -PACKAGECONFIG[gcrypt] = "-DWITH_CRYPTO=gcrypt, ,libgcrypt" -PACKAGECONFIG[nss3] = "-DWITH_CRYPTO=nss3, ,nss" -PACKAGECONFIG[selinux] = ", ,libselinux" - -EXTRA_OECMAKE += "-DENABLE_PROBES_LINUX=ON -DENABLE_PROBES_UNIX=ON \ - -DENABLE_PROBES_SOLARIS=OFF -DENABLE_PROBES_INDEPENDENT=ON \ - -DENABLE_OSCAP_UTIL=ON -DENABLE_OSCAP_UTIL_SSH=ON \ - -DENABLE_OSCAP_UTIL_DOCKER=OFF -DENABLE_OSCAP_UTIL_CHROOT=OFF \ - -DENABLE_OSCAP_UTIL_PODMAN=OFF -DENABLE_OSCAP_UTIL_VM=OFF \ - -DENABLE_PROBES_WINDOWS=OFF -DENABLE_VALGRIND=OFF \ - -DENABLE_SCE=ON -DENABLE_MITRE=OFF -DENABLE_TESTS=OFF \ - -DCMAKE_SKIP_INSTALL_RPATH=ON -DCMAKE_SKIP_RPATH=ON \ - " - -STAGING_OSCAP_DIR = "${TMPDIR}/work-shared/${MACHINE}/oscap-source" -STAGING_OSCAP_BUILDDIR = "${TMPDIR}/work-shared/openscap/oscap-build-artifacts" - -do_configure:append:class-native () { - sed -i 's:OSCAP_DEFAULT_CPE_PATH.*$:OSCAP_DEFAULT_CPE_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/cpe":' ${B}/config.h - sed -i 's:OSCAP_DEFAULT_SCHEMA_PATH.*$:OSCAP_DEFAULT_SCHEMA_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/schemas":' ${B}/config.h - sed -i 's:OSCAP_DEFAULT_XSLT_PATH.*$:OSCAP_DEFAULT_XSLT_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/xsl":' ${B}/config.h -} - -do_install:class-native[cleandirs] += " ${STAGING_OSCAP_BUILDDIR}" -do_install:append:class-native () { - oscapdir=${STAGING_OSCAP_BUILDDIR}/${datadir_native} - install -d $oscapdir - cp -a ${D}/${STAGING_DATADIR_NATIVE}/openscap $oscapdir -} - - -FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}" - -RDEPENDS:${PN} += "libxml2 python3-core libgcc bash" - -BBCLASSEXTEND = "native"
meta-security-compliance/recipes-openscap/openscap/openscap_git.bb deleted +0 -14
@@ -1,14 +0,0 @@ -# Copyright (C) 2017 Armin Kuster <[email protected]> -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMARRY = "NIST Certified SCAP 1.2 toolkit with OE changes" - -include openscap.inc - -SRCREV = "a85943eee400fdbe59234d1c4a02d8cf710c4625" -SRC_URI = "git://github.com/akuster/openscap.git;branch=oe-1.3;protocol=https \ -" - -PV = "1.3.3+git${SRCPV}" - -DEFAULT_PREFERENCE = "-1"
Signature · 1 line
2.34.1
PATCH 5/7 lynis: move to main meta-security layer
In reply to Armin KusterSigned-off-by Armin Kuster <[email protected]>
---
.../lynis/files/0001-osdetection-add-OpenEmbedded-and-Poky.patch | 0
.../recipes-auditors => recipes-compliance}/lynis/lynis_3.0.8.bb | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename {meta-security-compliance/recipes-auditors => recipes-compliance}/lynis/files/0001-osdetection-add-OpenEmbedded-and-Poky.patch (100%)
rename {meta-security-compliance/recipes-auditors => recipes-compliance}/lynis/lynis_3.0.8.bb (100%)recipes-compliance/lynis/files/0001-osdetection-add-OpenEmbedded-and-Poky.patch renamed from meta-security-compliance/recipes-auditors/lynis/files/0001-osdetection-add-OpenEmbedded-and-Poky.patch +0 -0
recipes-compliance/lynis/lynis_3.0.8.bb renamed from meta-security-compliance/recipes-auditors/lynis/lynis_3.0.8.bb +0 -0
Signature · 1 line
2.34.1
PATCH 6/7 openscap: move to main meta-security layer
In reply to Armin KusterSigned-off-by Armin Kuster <[email protected]>
---
.../openscap/openscap_1.3.7.bb | 0
.../scap-security-guide/scap-security-guide_0.1.67.bb | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename {meta-security-compliance/recipes-openscap => recipes-compliance}/openscap/openscap_1.3.7.bb (100%)
rename {meta-security-compliance/recipes-openscap => recipes-compliance}/scap-security-guide/scap-security-guide_0.1.67.bb (100%)recipes-compliance/openscap/openscap_1.3.7.bb renamed from meta-security-compliance/recipes-openscap/openscap/openscap_1.3.7.bb +0 -0
recipes-compliance/scap-security-guide/scap-security-guide_0.1.67.bb renamed from meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_0.1.67.bb +0 -0
Signature · 1 line
2.34.1
PATCH 7/7 meta-security-compliance: remove layer
In reply to Armin Kustersimplify structure.
Signed-off-by Armin Kuster <[email protected]>
--- meta-security-compliance/README | 41 ------------------------ meta-security-compliance/conf/layer.conf | 15 --------- 2 files changed, 56 deletions(-) delete mode 100644 meta-security-compliance/README delete mode 100644 meta-security-compliance/conf/layer.conf
meta-security-compliance/README deleted +0 -41
@@ -1,41 +0,0 @@ -# Meta-security-compliance - -This layer is meant to contain programs to help in security compliance and auditing - - -Dependencies -============ - -This layer depends on: - - URI: git://git.openembedded.org/bitbake - branch: master - - URI: git://git.openembedded.org/openembedded-core - layers: meta - branch: master - -or - - URI: git://git.yoctoproject.org/poky - branch: master - - - -Maintenance ------------ - -Send pull requests, patches, comments or questions to [email protected] - -When sending single patches, please using something like: -'git send-email -1 --to [email protected] --subject-prefix=meta-security-compliance][PATCH' - -Layer Maintainer: Armin Kuster <[email protected]> - - -License -======= - -All metadata is MIT licensed unless otherwise stated. Source code included -in tree for individual recipes is under the LICENSE stated in each recipe -(.bb file) unless otherwise stated.
meta-security-compliance/conf/layer.conf deleted +0 -15
@@ -1,15 +0,0 @@ -# We have a conf and classes directory, add to BBPATH -BBPATH .= ":${LAYERDIR}" - -# We have a recipes directory, add to BBFILES -BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend" - -BBFILE_COLLECTIONS += "scanners-layer" -BBFILE_PATTERN_scanners-layer = "^${LAYERDIR}/" -BBFILE_PRIORITY_scanners-layer = "6" - -LAYERSERIES_COMPAT_scanners-layer = "mickledore" - -LAYERDEPENDS_scanners-layer = "core openembedded-layer meta-python" - -BBLAYERS_LAYERINDEX_NAME_scanners-layer = "meta-security-compliance"
Signature · 1 line
2.34.1