openscap: update recipe
PATCH 1/2 openscap: update recipe
* Add PACKAGECONFIG for gcrypt, nss3 and selinux
* Use EXTRA_OECMAKE rather than EXTRA_OECONF
* Set CMAKE_SKIP_RPATH and CMAKE_SKIP_INSTALL_RPATH instead of chrpath
* Remove ptest since there are many host contamination issues on target. We will add it back when these issues are solved.
* Drop the unused patch
* Add PV
Signed-off-by Yi Zhao <[email protected]>
--- .../openscap/files/probe_dir_fixup.patch | 17 ----- .../recipes-openscap/openscap/files/run-ptest | 3 - .../recipes-openscap/openscap/openscap.inc | 77 ++++++++-------------- .../recipes-openscap/openscap/openscap_1.3.1.bb | 1 - .../recipes-openscap/openscap/openscap_git.bb | 3 +- 5 files changed, 30 insertions(+), 71 deletions(-) delete mode 100644 meta-security-compliance/recipes-openscap/openscap/files/probe_dir_fixup.patch delete mode 100644 meta-security-compliance/recipes-openscap/openscap/files/run-ptest
meta-security-compliance/recipes-openscap/openscap/files/probe_dir_fixup.patch deleted +0 -17
@@ -1,17 +0,0 @@ -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac -+++ git/configure.ac -@@ -1109,11 +1109,7 @@ AC_ARG_WITH([crypto], - [], - [crypto=gcrypt]) - --if test "x${libexecdir}" = xNONE; then -- probe_dir="/usr/local/libexec/openscap" --else -- EXPAND_DIR(probe_dir,"${libexecdir}/openscap") --fi -+probe_dir="/usr/local/libexec/openscap" - - AC_SUBST(probe_dir) -
meta-security-compliance/recipes-openscap/openscap/files/run-ptest deleted +0 -3
@@ -1,3 +0,0 @@ -#!/bin/sh -cd tests -make -k check
meta-security-compliance/recipes-openscap/openscap/openscap.inc +28 -49
99 lines not on this page · raw message
meta-security-compliance/recipes-openscap/openscap/openscap_1.3.1.bb +0 -1
@@ -4,7 +4,6 @@ require openscap.inc SRCREV = "3a4c635691380fa990a226acc8558db35d7ebabc" SRC_URI = "git://github.com/OpenSCAP/openscap.git;branch=maint-1.3 \ - file://run-ptest \ " DEFAULT_PREFERENCE = "-1"
meta-security-compliance/recipes-openscap/openscap/openscap_git.bb +2 -1
@@ -7,5 +7,6 @@ include openscap.inc SRCREV = "4bbdb46ff651f809d5b38ca08d769790c4bfff90" SRC_URI = "git://github.com/akuster/openscap.git;branch=oe-1.3 \ - file://run-ptest \ " + +PV = "1.3.1+git${SRCPV}"
Signature · 1 line
2.7.4
PATCH 2/2 scap-security-guide: update recipe
* 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 <[email protected]>
--- .../scap-security-guide/scap-security-guide.inc | 28 +++++----------------- .../scap-security-guide/scap-security-guide_git.bb | 6 +---- 2 files changed, 7 insertions(+), 27 deletions(-)
meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc +6 -22
@@ -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" +RDEPNEDS_${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"
meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_git.bb +1 -5
@@ -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"
Signature · 1 line
2.7.4