Skip to contentSkip to conversation

openscap: Drop nostamp

PATCH New Armin Kuster 1 participant 2 messages Sep 4, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 openscap: Drop nostamp

add cleandir depends to do_install task

This nostamp is causing issues with the yocto-check-layer when checking hash changes.

---
 .../recipes-openscap/openscap/openscap.inc                   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
meta-security-compliance/recipes-openscap/openscap/openscap.inc +2 -3
index ed8d8ff..afa576a 100644
@@ -40,15 +40,14 @@ do_configure_append_class-native () {
     sed -i 's:OSCAP_DEFAULT_XSLT_PATH.*$:OSCAP_DEFAULT_XSLT_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/xsl":' ${B}/config.h
 }
 
-do_clean[cleandirs] += "${STAGING_OSCAP_BUILDDIR}"
-do_install[nostamp] = "1"
-
+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"
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 scap-security-guide: add depends on openscap-native do_install

This ensures openscap-native does install the needed patches security guilde needs to build

Minor recipe cleanup too

---
 .../scap-security-guide/scap-security-guide.inc            | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc +4 -3
index 341721a..3212310 100644
@@ -7,14 +7,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=97662e4486d9a1d09f358851d9f41a1a"
 LICENSE = "LGPL-2.1"
 
 DEPENDS = "openscap-native python3 python3-pyyaml-native python3-jinja2-native libxml2-native"
-RDEPENDS_${PN} = "openscap"
 
 S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig python3native
 
-#PARALLEL_MAKE = ""
-
 STAGING_OSCAP_BUILDDIR = "${TMPDIR}/work-shared/openscap/oscap-build-artifacts"
 
 OECMAKE_GENERATOR = "Unix Makefiles"
@@ -23,9 +20,13 @@ EXTRA_OECMAKE += "-DENABLE_PYTHON_COVERAGE=OFF"
 
 B = "${S}/build"
 
+do_configure[depends] += "openscap-native:do_install"
+
 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"
+
+RDEPENDS_${PN} = "openscap"
Signature · 1 line
2.17.1