mirrors/meta-security
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-security synced 2026-01-12 03:10:13 +00:00
Code Issues Projects Releases Wiki Activity

meta-security-compliance: Convert to new override syntax

Browse Source 
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2021-07-29 16:33:30 -07:00
parent 90fe17c347
commit d11b2079f3
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
meta-security-compliance/recipes-auditors/lynis/lynis_3.0.0.bb
View File

@@ -34,7 +34,7 @@ do_install () {
cp ${S}/*.prf ${D}/${sysconfdir}/lynis
}
FILES_${PN} += "${sysconfdir}/developer.prf ${sysconfdir}/default.prf"
FILES_${PN}-doc += "lynis.8 FAQ README CHANGELOG.md CONTRIBUTIONS.md CONTRIBUTORS.md"
FILES:${PN} += "${sysconfdir}/developer.prf ${sysconfdir}/default.prf"
FILES:${PN}-doc += "lynis.8 FAQ README CHANGELOG.md CONTRIBUTIONS.md CONTRIBUTORS.md"
RDEPENDS_${PN} += "procps findutils"
RDEPENDS:${PN} += "procps findutils"

4
meta-security-compliance/recipes-openscap/oe-scap/oe-scap_1.0.bb
View File

@@ -28,6 +28,6 @@ do_install () {
cp ${S}/* ${D}/${datadir}/oe-scap/.
}
FILES_${PN} += "${datadir}/oe-scap"
FILES:${PN} += "${datadir}/oe-scap"
RDEPENDS_${PN} = "openscap bash"
RDEPENDS:${PN} = "openscap bash"

2
meta-security-compliance/recipes-openscap/openscap-daemon/openscap-daemon_0.1.10.bb
View File

@@ -17,7 +17,7 @@ inherit setuptools3
S = "${WORKDIR}/git"
RDEPENDS_${PN} = "openscap scap-security-guide \
RDEPENDS:${PN} = "openscap scap-security-guide \
python3-core python3-dbus \
python3-pygobject \
"

12
meta-security-compliance/recipes-openscap/openscap/openscap.inc
View File

@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
LICENSE = "LGPL-2.1"
DEPENDS = "dbus acl bzip2 pkgconfig gconf procps curl libxml2 libxslt libcap swig"
DEPENDS_class-native = "pkgconfig-native swig-native curl-native libxml2-native libxslt-native libcap-native"
DEPENDS:class-native = "pkgconfig-native swig-native curl-native libxml2-native libxslt-native libcap-native"
S = "${WORKDIR}/git"
@@ -34,22 +34,22 @@ EXTRA_OECMAKE += "-DENABLE_PROBES_LINUX=ON -DENABLE_PROBES_UNIX=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 () {
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 () {
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}"
FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}"
RDEPENDS_${PN} += "libxml2 python3-core libgcc bash"
RDEPENDS:${PN} += "libxml2 python3-core libgcc bash"
BBCLASSEXTEND = "native"

6
meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc
View File

@@ -25,11 +25,11 @@ B = "${S}/build"
do_configure[depends] += "openscap-native:do_install"
do_configure_prepend () {
do_configure:prepend () {
sed -i -e 's:NAMES\ sed:NAMES\ ${HOSTTOOLS_DIR}/sed:g' ${S}/CMakeLists.txt
sed -i -e 's:NAMES\ grep:NAMES\ ${HOSTTOOLS_DIR}/grep:g' ${S}/CMakeLists.txt
}
FILES_${PN} += "${datadir}/xml"
FILES:${PN} += "${datadir}/xml"
RDEPENDS_${PN} = "openscap"
RDEPENDS:${PN} = "openscap"