diff options
-rw-r--r-- | recipes-compliance/openscap/openscap_1.3.8.bb (renamed from recipes-compliance/openscap/openscap_1.3.7.bb) | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/recipes-compliance/openscap/openscap_1.3.7.bb b/recipes-compliance/openscap/openscap_1.3.8.bb index a8757f3..ecc347c 100644 --- a/recipes-compliance/openscap/openscap_1.3.7.bb +++ b/recipes-compliance/openscap/openscap_1.3.8.bb | |||
@@ -9,8 +9,8 @@ LICENSE = "LGPL-2.1-only" | |||
9 | DEPENDS = "dbus acl bzip2 pkgconfig gconf procps curl libxml2 libxslt libcap swig libpcre xmlsec1" | 9 | DEPENDS = "dbus acl bzip2 pkgconfig gconf procps curl libxml2 libxslt libcap swig libpcre xmlsec1" |
10 | DEPENDS:class-native = "pkgconfig-native swig-native curl-native libxml2-native libxslt-native libcap-native libpcre-native xmlsec1-native" | 10 | DEPENDS:class-native = "pkgconfig-native swig-native curl-native libxml2-native libxslt-native libcap-native libpcre-native xmlsec1-native" |
11 | 11 | ||
12 | #Jun 20th, 2023 | 12 | #Jun 22th, 2023 |
13 | SRCREV = "c99fc854ff566fac9d130622fe9fd434484eb13d" | 13 | SRCREV = "a81c66d9bc36612dd1ca83a8c959a59e172eb4b9" |
14 | SRC_URI = "git://github.com/OpenSCAP/openscap.git;branch=maint-1.3;protocol=https \ | 14 | SRC_URI = "git://github.com/OpenSCAP/openscap.git;branch=maint-1.3;protocol=https \ |
15 | " | 15 | " |
16 | 16 | ||
@@ -25,6 +25,7 @@ PACKAGECONFIG[rpm] = "-DENABLE_OSCAP_UTIL_AS_RPM=ON, ,rpm, rpm" | |||
25 | PACKAGECONFIG[gcrypt] = "-DWITH_CRYPTO=gcrypt, ,libgcrypt" | 25 | PACKAGECONFIG[gcrypt] = "-DWITH_CRYPTO=gcrypt, ,libgcrypt" |
26 | PACKAGECONFIG[nss3] = "-DWITH_CRYPTO=nss3, ,nss" | 26 | PACKAGECONFIG[nss3] = "-DWITH_CRYPTO=nss3, ,nss" |
27 | PACKAGECONFIG[selinux] = ", ,libselinux" | 27 | PACKAGECONFIG[selinux] = ", ,libselinux" |
28 | PACKAGECONFIG[remdediate_service] = "-DENABLE_OSCAP_REMEDIATE_SERVICE=ON,-DENABLE_OSCAP_REMEDIATE_SERVICE=NO," | ||
28 | 29 | ||
29 | EXTRA_OECMAKE += "-DENABLE_PROBES_LINUX=ON -DENABLE_PROBES_UNIX=ON \ | 30 | EXTRA_OECMAKE += "-DENABLE_PROBES_LINUX=ON -DENABLE_PROBES_UNIX=ON \ |
30 | -DENABLE_PROBES_SOLARIS=OFF -DENABLE_PROBES_INDEPENDENT=ON \ | 31 | -DENABLE_PROBES_SOLARIS=OFF -DENABLE_PROBES_INDEPENDENT=ON \ |
@@ -47,7 +48,9 @@ do_configure:append:class-native () { | |||
47 | 48 | ||
48 | do_install:append () { | 49 | do_install:append () { |
49 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 50 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
50 | install -D -m 0644 ${B}/oscap-remediate.service ${D}${systemd_system_unitdir}/oscap-remediate.service | 51 | if ${@bb.utils.contains('PACKAGECONFIG','remdediate_service','true','false',d)}; then |
52 | install -D -m 0644 ${B}/oscap-remediate.service ${D}${systemd_system_unitdir}/oscap-remediate.service | ||
53 | fi | ||
51 | fi | 54 | fi |
52 | } | 55 | } |
53 | 56 | ||
@@ -60,7 +63,9 @@ do_install:append:class-native () { | |||
60 | 63 | ||
61 | 64 | ||
62 | SYSTEMD_PACKAGES = "${PN}" | 65 | SYSTEMD_PACKAGES = "${PN}" |
63 | SYSTEMD_SERVICE:${PN} = "oscap-remediate.service" | 66 | SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG','remdediate_service', 'oscap-remediate.service', '',d)}" |
67 | SYSTEMD_AUTO_ENABLE = "disable" | ||
68 | |||
64 | 69 | ||
65 | FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}" | 70 | FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}" |
66 | 71 | ||