diff options
author | Armin Kuster <akuster808@gmail.com> | 2019-09-04 00:20:34 +0000 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2019-09-07 08:34:15 -0700 |
commit | a6a431f6adc33f91f4df5bfde024f69399fea7f5 (patch) | |
tree | 615b98059842e58c64d00bd8f2555f5f5442e3bc /meta-security-compliance | |
parent | 6c42c018ff95ec573b43ec6638f3fa9e003e712c (diff) | |
download | meta-security-a6a431f6adc33f91f4df5bfde024f69399fea7f5.tar.gz |
openscap: Drop nostamp
add cleandir depends to do_install task
This nostamp is causing issues with the yocto-check-layer when checking
hash changes.
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-security-compliance')
-rw-r--r-- | meta-security-compliance/recipes-openscap/openscap/openscap.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meta-security-compliance/recipes-openscap/openscap/openscap.inc b/meta-security-compliance/recipes-openscap/openscap/openscap.inc index ed8d8ff..afa576a 100644 --- a/meta-security-compliance/recipes-openscap/openscap/openscap.inc +++ b/meta-security-compliance/recipes-openscap/openscap/openscap.inc | |||
@@ -40,15 +40,14 @@ do_configure_append_class-native () { | |||
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_clean[cleandirs] += "${STAGING_OSCAP_BUILDDIR}" | 43 | do_install_class-native[cleandirs] += " ${STAGING_OSCAP_BUILDDIR}" |
44 | do_install[nostamp] = "1" | ||
45 | |||
46 | do_install_append_class-native () { | 44 | do_install_append_class-native () { |
47 | oscapdir=${STAGING_OSCAP_BUILDDIR}/${datadir_native} | 45 | oscapdir=${STAGING_OSCAP_BUILDDIR}/${datadir_native} |
48 | install -d $oscapdir | 46 | install -d $oscapdir |
49 | cp -a ${D}/${STAGING_DATADIR_NATIVE}/openscap $oscapdir | 47 | cp -a ${D}/${STAGING_DATADIR_NATIVE}/openscap $oscapdir |
50 | } | 48 | } |
51 | 49 | ||
50 | |||
52 | FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}" | 51 | FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}" |
53 | 52 | ||
54 | RDEPENDS_${PN} += "libxml2 python3-core libgcc bash" | 53 | RDEPENDS_${PN} += "libxml2 python3-core libgcc bash" |