* Set B="${S}/build" to fix the build failure for out of source
directory
* Remove do_complile and do_install. Use the default functions from
cmake.bbclass.
* Install the artifacts to /usr/share rather than /usr/local/share
Signed-off-by: Yi Zhao <yi.z...@windriver.com>
---
.../scap-security-guide/scap-security-guide.inc | 28 +++++-----------------
.../scap-security-guide/scap-security-guide_git.bb | 6 +----
2 files changed, 7 insertions(+), 27 deletions(-)
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 ed70c18..341721a 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
@@ -7,6 +7,7 @@ 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"
@@ -20,28 +21,11 @@ OECMAKE_GENERATOR = "Unix Makefiles"
EXTRA_OECMAKE += "-DENABLE_PYTHON_COVERAGE=OFF"
-do_configure_prepend () {
- sed -i -e 's:NAMES\ sed:NAMES\ ${HOSTTOOLS_DIR}/sed:g'
${S}/CMakeLists.txt
- sed -i
's:/usr/share/openscap/:${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/:g'
${S}/cmake/SSGCommon.cmake
-}
-
-do_compile () {
- cd ${S}/build
- cmake ../
- # oddly rhel7 needs to build first
- make rhel7
-}
+B = "${S}/build"
-do_install () {
- cd ${S}/build
- make DESTDIR=${D} 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
}
-localdatadir = "${prefix}/local/share"
-localmandir = "${localdatadir}/man"
-localdocdir = "${localdatadir}/doc"
-localxmldir = "${localdatadir}/xml"
-
-FILES_${PN} += "${localdatadir} ${localxmldir}"
-FILES_${PN}-doc += "${localmandir} ${localdocdir}"
-RDEPNEDS_${PN} = "openscap"
+FILES_${PN} += "${datadir}/xml"
diff --git
a/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_git.bb
b/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_git.bb
index cb21fed..d9238c0 100644
---
a/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_git.bb
+++
b/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_git.bb
@@ -2,12 +2,8 @@ SUMARRY = "SCAP content for various platforms, OE changes"
SRCREV = "5fdfdcb2e95afbd86ace555beca5d20cbf1043ed"
SRC_URI = "git://github.com/akuster/scap-security-guide.git;branch=oe-0.1.44;"
-PV = "v0.1.44+git${SRCPV}"
+PV = "0.1.44+git${SRCPV}"
require scap-security-guide.inc
-do_compile_append () {
- make openembedded
-}
-
EXTRA_OECMAKE += "-DSSG_PRODUCT_OPENEMBEDDED=ON"
--
2.7.4
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
