diff options
author | Armin Kuster <akuster808@gmail.com> | 2021-07-29 16:33:30 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2021-08-01 08:47:08 -0700 |
commit | d11b2079f3c62d532df250616cca27eaecf5c4a0 (patch) | |
tree | a70b9f909a3a7e858a1865184b745483e5723599 /meta-security-compliance/recipes-openscap | |
parent | 90fe17c34781b4c91c76c075a7fd69e78f370419 (diff) | |
download | meta-security-d11b2079f3c62d532df250616cca27eaecf5c4a0.tar.gz |
meta-security-compliance: Convert to new override syntax
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-security-compliance/recipes-openscap')
4 files changed, 12 insertions, 12 deletions
diff --git a/meta-security-compliance/recipes-openscap/oe-scap/oe-scap_1.0.bb b/meta-security-compliance/recipes-openscap/oe-scap/oe-scap_1.0.bb index fd53fcb..0fef233 100644 --- a/meta-security-compliance/recipes-openscap/oe-scap/oe-scap_1.0.bb +++ b/meta-security-compliance/recipes-openscap/oe-scap/oe-scap_1.0.bb | |||
@@ -28,6 +28,6 @@ do_install () { | |||
28 | cp ${S}/* ${D}/${datadir}/oe-scap/. | 28 | cp ${S}/* ${D}/${datadir}/oe-scap/. |
29 | } | 29 | } |
30 | 30 | ||
31 | FILES_${PN} += "${datadir}/oe-scap" | 31 | FILES:${PN} += "${datadir}/oe-scap" |
32 | 32 | ||
33 | RDEPENDS_${PN} = "openscap bash" | 33 | RDEPENDS:${PN} = "openscap bash" |
diff --git a/meta-security-compliance/recipes-openscap/openscap-daemon/openscap-daemon_0.1.10.bb b/meta-security-compliance/recipes-openscap/openscap-daemon/openscap-daemon_0.1.10.bb index a775021..f109566 100644 --- a/meta-security-compliance/recipes-openscap/openscap-daemon/openscap-daemon_0.1.10.bb +++ b/meta-security-compliance/recipes-openscap/openscap-daemon/openscap-daemon_0.1.10.bb | |||
@@ -17,7 +17,7 @@ inherit setuptools3 | |||
17 | 17 | ||
18 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
19 | 19 | ||
20 | RDEPENDS_${PN} = "openscap scap-security-guide \ | 20 | RDEPENDS:${PN} = "openscap scap-security-guide \ |
21 | python3-core python3-dbus \ | 21 | python3-core python3-dbus \ |
22 | python3-pygobject \ | 22 | python3-pygobject \ |
23 | " | 23 | " |
diff --git a/meta-security-compliance/recipes-openscap/openscap/openscap.inc b/meta-security-compliance/recipes-openscap/openscap/openscap.inc index 812ea9f..c236641 100644 --- a/meta-security-compliance/recipes-openscap/openscap/openscap.inc +++ b/meta-security-compliance/recipes-openscap/openscap/openscap.inc | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" | |||
7 | LICENSE = "LGPL-2.1" | 7 | LICENSE = "LGPL-2.1" |
8 | 8 | ||
9 | DEPENDS = "dbus acl bzip2 pkgconfig gconf procps curl libxml2 libxslt libcap swig" | 9 | DEPENDS = "dbus acl bzip2 pkgconfig gconf procps curl libxml2 libxslt libcap swig" |
10 | DEPENDS_class-native = "pkgconfig-native swig-native curl-native libxml2-native libxslt-native libcap-native" | 10 | DEPENDS:class-native = "pkgconfig-native swig-native curl-native libxml2-native libxslt-native libcap-native" |
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
@@ -34,22 +34,22 @@ EXTRA_OECMAKE += "-DENABLE_PROBES_LINUX=ON -DENABLE_PROBES_UNIX=ON \ | |||
34 | STAGING_OSCAP_DIR = "${TMPDIR}/work-shared/${MACHINE}/oscap-source" | 34 | STAGING_OSCAP_DIR = "${TMPDIR}/work-shared/${MACHINE}/oscap-source" |
35 | STAGING_OSCAP_BUILDDIR = "${TMPDIR}/work-shared/openscap/oscap-build-artifacts" | 35 | STAGING_OSCAP_BUILDDIR = "${TMPDIR}/work-shared/openscap/oscap-build-artifacts" |
36 | 36 | ||
37 | do_configure_append_class-native () { | 37 | do_configure:append:class-native () { |
38 | sed -i 's:OSCAP_DEFAULT_CPE_PATH.*$:OSCAP_DEFAULT_CPE_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/cpe":' ${B}/config.h | 38 | sed -i 's:OSCAP_DEFAULT_CPE_PATH.*$:OSCAP_DEFAULT_CPE_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/cpe":' ${B}/config.h |
39 | sed -i 's:OSCAP_DEFAULT_SCHEMA_PATH.*$:OSCAP_DEFAULT_SCHEMA_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/schemas":' ${B}/config.h | 39 | sed -i 's:OSCAP_DEFAULT_SCHEMA_PATH.*$:OSCAP_DEFAULT_SCHEMA_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/schemas":' ${B}/config.h |
40 | sed -i 's:OSCAP_DEFAULT_XSLT_PATH.*$:OSCAP_DEFAULT_XSLT_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/xsl":' ${B}/config.h | 40 | sed -i 's:OSCAP_DEFAULT_XSLT_PATH.*$:OSCAP_DEFAULT_XSLT_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/xsl":' ${B}/config.h |
41 | } | 41 | } |
42 | 42 | ||
43 | do_install_class-native[cleandirs] += " ${STAGING_OSCAP_BUILDDIR}" | 43 | do_install:class-native[cleandirs] += " ${STAGING_OSCAP_BUILDDIR}" |
44 | do_install_append_class-native () { | 44 | do_install:append:class-native () { |
45 | oscapdir=${STAGING_OSCAP_BUILDDIR}/${datadir_native} | 45 | oscapdir=${STAGING_OSCAP_BUILDDIR}/${datadir_native} |
46 | install -d $oscapdir | 46 | install -d $oscapdir |
47 | cp -a ${D}/${STAGING_DATADIR_NATIVE}/openscap $oscapdir | 47 | cp -a ${D}/${STAGING_DATADIR_NATIVE}/openscap $oscapdir |
48 | } | 48 | } |
49 | 49 | ||
50 | 50 | ||
51 | FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}" | 51 | FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}" |
52 | 52 | ||
53 | RDEPENDS_${PN} += "libxml2 python3-core libgcc bash" | 53 | RDEPENDS:${PN} += "libxml2 python3-core libgcc bash" |
54 | 54 | ||
55 | BBCLASSEXTEND = "native" | 55 | BBCLASSEXTEND = "native" |
diff --git a/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc b/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc index d1a9511..0c651f1 100644 --- a/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc +++ b/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc | |||
@@ -25,11 +25,11 @@ B = "${S}/build" | |||
25 | 25 | ||
26 | do_configure[depends] += "openscap-native:do_install" | 26 | do_configure[depends] += "openscap-native:do_install" |
27 | 27 | ||
28 | do_configure_prepend () { | 28 | do_configure:prepend () { |
29 | sed -i -e 's:NAMES\ sed:NAMES\ ${HOSTTOOLS_DIR}/sed:g' ${S}/CMakeLists.txt | 29 | sed -i -e 's:NAMES\ sed:NAMES\ ${HOSTTOOLS_DIR}/sed:g' ${S}/CMakeLists.txt |
30 | sed -i -e 's:NAMES\ grep:NAMES\ ${HOSTTOOLS_DIR}/grep:g' ${S}/CMakeLists.txt | 30 | sed -i -e 's:NAMES\ grep:NAMES\ ${HOSTTOOLS_DIR}/grep:g' ${S}/CMakeLists.txt |
31 | } | 31 | } |
32 | 32 | ||
33 | FILES_${PN} += "${datadir}/xml" | 33 | FILES:${PN} += "${datadir}/xml" |
34 | 34 | ||
35 | RDEPENDS_${PN} = "openscap" | 35 | RDEPENDS:${PN} = "openscap" |