mirrors/meta-security
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-security synced 2026-05-09 05:29:56 +00:00
Code Issues Projects Releases Wiki Activity

openscap: add 1.3.1 recipes for upstream source

Browse Source 
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2019-07-01 19:54:20 -07:00
parent 37040cfb76
commit 90ccc8b4f5
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-security-compliance/recipes-openscap/openscap/openscap.inc
+5 -6
View File
@@ -10,10 +10,10 @@ DEPENDS = "autoconf-archive dbus acl bzip2 pkgconfig gconf procps curl libxml2 l
DEPENDS_class-native = "autoconf-archive-native pkgconfig-native swig-native curl-native libxml2-native libxslt-native dpkg-native libgcrypt-native nss-native" DEPENDS_class-native = "autoconf-archive-native pkgconfig-native swig-native curl-native libxml2-native libxslt-native dpkg-native libgcrypt-native nss-native"
inherit cmake pkgconfig python3native perlnative ptest
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
inherit cmake pkgconfig python3native perlnative ptest
PACKAGECONFIG ?= "python3 rpm perl" PACKAGECONFIG ?= "python3 rpm perl"
PACKAGECONFIG[python3] = "-DENABLE_PYTHON3=True, , python3, python3" PACKAGECONFIG[python3] = "-DENABLE_PYTHON3=True, , python3, python3"
PACKAGECONFIG[perl] = "-DENABLE_PERL=True,, perl, perl" PACKAGECONFIG[perl] = "-DENABLE_PERL=True,, perl, perl"
@@ -25,7 +25,6 @@ EXTRA_OECONF += "-DENABLE_PROBES_INDEPENDENT=yes -DENABLE_PROBES_LINUX=yes -DWIT
-DENABLE_OSCAP_UTIL_DOCKER=no \ -DENABLE_OSCAP_UTIL_DOCKER=no \
" "
EXTRA_OECONF_class-native += "-DENABLE_PROBES=True"
STAGING_OSCAP_DIR = "${TMPDIR}/work-shared/${MACHINE}/oscap-source" STAGING_OSCAP_DIR = "${TMPDIR}/work-shared/${MACHINE}/oscap-source"
STAGING_OSCAP_BUILDDIR = "${TMPDIR}/work-shared/openscap/oscap-build-artifacts" STAGING_OSCAP_BUILDDIR = "${TMPDIR}/work-shared/openscap/oscap-build-artifacts"
@@ -33,9 +32,9 @@ STAGING_OSCAP_BUILDDIR = "${TMPDIR}/work-shared/openscap/oscap-build-artifacts"
EXTRANATIVEPATH += "chrpath-native" EXTRANATIVEPATH += "chrpath-native"
do_configure_append_class-native () { do_configure_append_class-native () {
sed -i 's:OSCAP_DEFAULT_CPE_PATH.*$:OSCAP_DEFAULT_CPE_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/cpe":' ${S}/config.h sed -i 's:OSCAP_DEFAULT_CPE_PATH.*$:OSCAP_DEFAULT_CPE_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/cpe":' ${B}/config.h
sed -i 's:OSCAP_DEFAULT_SCHEMA_PATH.*$:OSCAP_DEFAULT_SCHEMA_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/schemas":' ${S}/config.h sed -i 's:OSCAP_DEFAULT_SCHEMA_PATH.*$:OSCAP_DEFAULT_SCHEMA_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/schemas":' ${B}/config.h
sed -i 's:OSCAP_DEFAULT_XSLT_PATH.*$:OSCAP_DEFAULT_XSLT_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/xsl":' ${S}/config.h 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_clean[cleandirs] += " ${STAGING_OSCAP_BUILDDIR}"
meta-security-compliance/recipes-openscap/openscap/openscap_1.3.1.bb
+10
View File
@@ -0,0 +1,10 @@
SUMARRY = "NIST Certified SCAP 1.2 toolkit"
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 -2
View File
@@ -3,9 +3,9 @@
SUMARRY = "NIST Certified SCAP 1.2 toolkit with OE changes" SUMARRY = "NIST Certified SCAP 1.2 toolkit with OE changes"
include openscap.inc
SRCREV = "4bbdb46ff651f809d5b38ca08d769790c4bfff90" SRCREV = "4bbdb46ff651f809d5b38ca08d769790c4bfff90"
SRC_URI = "git://github.com/akuster/openscap.git;branch=oe-1.3 \ SRC_URI = "git://github.com/akuster/openscap.git;branch=oe-1.3 \
file://run-ptest \ file://run-ptest \
" "
include openscap.inc