Skip to contentSkip to conversation

openscap_git: update to 1.3.0

PATCH In review Armin Kuster 2 participants 7 messages Jul 6, 2019 – Jul 23, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 openscap_git: update to 1.3.0

removed unneeded patch
convert over to cmake

refactor files

---
 .../openscap/files/crypto_pkgconfig.patch     | 36 --------
 .../recipes-openscap/openscap/openscap.inc    | 75 +++++++++++++++++
 .../recipes-openscap/openscap/openscap_git.bb | 83 +------------------
 3 files changed, 78 insertions(+), 116 deletions(-)
 delete mode 100644 meta-security-compliance/recipes-openscap/openscap/files/crypto_pkgconfig.patch
meta-security-compliance/recipes-openscap/openscap/files/crypto_pkgconfig.patch deleted +0 -36
deleted file mode 100644
index 2d70855..0000000
@@ -1,36 +0,0 @@
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac
-+++ git/configure.ac
-@@ -360,25 +360,13 @@ case "${with_crypto}" in
-         AC_DEFINE([HAVE_NSS3], [1], [Define to 1 if you have 'NSS' library.])
-         ;;
-     gcrypt)
--	SAVE_LIBS=$LIBS
--        AC_CHECK_LIB([gcrypt], [gcry_check_version],
--                     [crapi_CFLAGS=`libgcrypt-config --cflags`;
--                      crapi_LIBS=`libgcrypt-config --libs`;
--                      crapi_libname="GCrypt";],
--                     [AC_MSG_ERROR([library 'gcrypt' is required for GCrypt.])],
--                     [])
--        AC_DEFINE([HAVE_GCRYPT], [1], [Define to 1 if you have 'gcrypt' library.])
--	AC_CACHE_CHECK([for GCRYCTL_SET_ENFORCED_FIPS_FLAG],
--                    [ac_cv_gcryctl_set_enforced_fips_flag],
--                    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include<gcrypt.h>],
--                                                        [return GCRYCTL_SET_ENFORCED_FIPS_FLAG;])],
--                                       [ac_cv_gcryctl_set_enforced_fips_flag=yes],
--                                       [ac_cv_gcryctl_set_enforced_fips_flag=no])])
-+	PKG_CHECK_MODULES([libgcrypt], [libgcrypt >= 1.7.9],[],
-+			  AC_MSG_FAILURE([libgcrypt devel support is missing]))
- 
--	if test "${ac_cv_gcryctl_set_enforced_fips_flag}" == "yes"; then
--	   AC_DEFINE([HAVE_GCRYCTL_SET_ENFORCED_FIPS_FLAG], [1], [Define to 1 if you have 'gcrypt' library with GCRYCTL_SET_ENFORCED_FIPS_FLAG.])
--	fi
--	LIBS=$SAVE_LIBS
-+	crapi_libname="libgcrypt"
-+	crapi_CFLAGS=$libgcrypt_CFLAGS
-+	crapi_LIBS=$libgcrypt_LIBS
-+        AC_DEFINE([HAVE_GCRYPT], [1], [Define to 1 if you have 'libgcrypt' library.])
-         ;;
-          *)
-           AC_MSG_ERROR([unknown crypto backend])
meta-security-compliance/recipes-openscap/openscap/openscap.inc +75 -0

77 lines not on this page · raw message

meta-security-compliance/recipes-openscap/openscap/openscap_git.bb +3 -80

91 lines not on this page · raw message

Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/4 openscap: add 1.3.1 recipes for upstream source

---
 .../recipes-openscap/openscap/openscap.inc            | 11 +++++------
 .../recipes-openscap/openscap/openscap_1.3.1.bb       | 10 ++++++++++
 .../recipes-openscap/openscap/openscap_git.bb         |  4 ++--
 3 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 meta-security-compliance/recipes-openscap/openscap/openscap_1.3.1.bb
meta-security-compliance/recipes-openscap/openscap/openscap.inc +5 -6
index 4c1f206..e5daaf8 100644
@@ -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"
 
-inherit cmake pkgconfig python3native perlnative ptest
-
 S = "${WORKDIR}/git"
 
+inherit cmake pkgconfig python3native perlnative ptest
+
 PACKAGECONFIG ?= "python3 rpm perl"
 PACKAGECONFIG[python3] = "-DENABLE_PYTHON3=True, , python3, python3"
 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 \
                 "
 
-EXTRA_OECONF_class-native += "-DENABLE_PROBES=True"
 
 STAGING_OSCAP_DIR = "${TMPDIR}/work-shared/${MACHINE}/oscap-source"
 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"
 
 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_SCHEMA_PATH.*$:OSCAP_DEFAULT_SCHEMA_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/schemas":' ${S}/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_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":' ${B}/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}"
meta-security-compliance/recipes-openscap/openscap/openscap_1.3.1.bb new file +10 -0
new file mode 100644
index 0000000..c29fd42
@@ -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
index 3dfa99e..aded920 100644
@@ -3,9 +3,9 @@
 
 SUMARRY = "NIST Certified SCAP 1.2 toolkit with OE changes"
 
+include openscap.inc
+
 SRCREV = "4bbdb46ff651f809d5b38ca08d769790c4bfff90"
 SRC_URI = "git://github.com/akuster/openscap.git;branch=oe-1.3 \
            file://run-ptest \
 "
-
-include openscap.inc
Signature · 1 line
2.17.1
#2 lore raw

Re: [meta-security-compliance][PATCH 2/4] openscap: add 1.3.1 recipes for upstream source

Hi Armin,

I got the following error when build openscap:

ERROR: openscap-git-r0 do_compile_ptest_base: Function failed: do_compile_ptest_base (log file is located at /buildarea/build/tmp/work/core2-64-poky-linux/openscap/git-r0/temp/log.do_compile_ptest_base.329146)
ERROR: Logfile of failure stored in: /buildarea/build/tmp/work/core2-64-poky-linux/openscap/git-r0/temp/log.do_compile_ptest_base.329146
Log data follows:

| DEBUG: Executing shell function do_compile_ptest_base
| /buildarea/build/tmp/work/core2-64-poky-linux/openscap/git-r0/temp/run.do_compile_ptest_base.329146: line 108: oe-runcmake: command not found
| WARNING: /buildarea/build/tmp/work/core2-64-poky-linux/openscap/git-r0/temp/run.do_compile_ptest_base.329146:1 exit 127 from 'oe-runcmake tests'
| ERROR: Function failed: do_compile_ptest_base (log file is located at /buildarea/build/tmp/work/core2-64-poky-linux/openscap/git-r0/temp/log.do_compile_ptest_base.329146)

//Yi

Quoted 78 lines · Armin Kuster
---
  .../recipes-openscap/openscap/openscap.inc            | 11 +++++------
  .../recipes-openscap/openscap/openscap_1.3.1.bb       | 10 ++++++++++
  .../recipes-openscap/openscap/openscap_git.bb         |  4 ++--
  3 files changed, 17 insertions(+), 8 deletions(-)

create mode 100644 meta-security-compliance/recipes-openscap/openscap/openscap_1.3.1.bb

meta-security-compliance/recipes-openscap/openscap/openscap.inc +5 -6
index 4c1f206..e5daaf8 100644
@@ -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"
 
-inherit cmake pkgconfig python3native perlnative ptest
-
  S = "${WORKDIR}/git"
 
+inherit cmake pkgconfig python3native perlnative ptest
+
  PACKAGECONFIG ?= "python3 rpm perl"
  PACKAGECONFIG[python3] = "-DENABLE_PYTHON3=True, , python3, python3"
  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 \
                  "
 
-EXTRA_OECONF_class-native += "-DENABLE_PROBES=True"
 
  STAGING_OSCAP_DIR = "${TMPDIR}/work-shared/${MACHINE}/oscap-source"
  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"
 
  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_SCHEMA_PATH.*$:OSCAP_DEFAULT_SCHEMA_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/schemas":' ${S}/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_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":' ${B}/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}"
meta-security-compliance/recipes-openscap/openscap/openscap_1.3.1.bb new file +10 -0
new file mode 100644
index 0000000..c29fd42
@@ -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
index 3dfa99e..aded920 100644
@@ -3,9 +3,9 @@
 
  SUMARRY = "NIST Certified SCAP 1.2 toolkit with OE changes"
 
+include openscap.inc
+
  SRCREV = "4bbdb46ff651f809d5b38ca08d769790c4bfff90"
  SRC_URI = "git://github.com/akuster/openscap.git;branch=oe-1.3 \
             file://run-ptest \
  "
-
-include openscap.inc
author
#3 lore raw

Re: [meta-security-compliance][PATCH 2/4] openscap: add 1.3.1 recipes for upstream source

Quoted 9 lines · Yi Zhao

Hi Armin,

I got the following error when build openscap:

Quoted 7 lines

ERROR: openscap-git-r0 do_compile_ptest_base: Function failed: do_compile_ptest_base (log file is located at /buildarea/build/tmp/work/core2-64-poky-linux/openscap/git-r0/temp/log.do_compile_ptest_base.329146)
ERROR: Logfile of failure stored in: /buildarea/build/tmp/work/core2-64-poky-linux/openscap/git-r0/temp/log.do_compile_ptest_base.329146
Log data follows:

| DEBUG: Executing shell function do_compile_ptest_base
| /buildarea/build/tmp/work/core2-64-poky-linux/openscap/git-r0/temp/run.do_compile_ptest_base.329146: line 108: oe-runcmake: command not found
| WARNING: /buildarea/build/tmp/work/core2-64-poky-linux/openscap/git-r0/temp/run.do_compile_ptest_base.329146:1 exit 127 from 'oe-runcmake tests'
| ERROR: Function failed: do_compile_ptest_base (log file is located at /buildarea/build/tmp/work/core2-64-poky-linux/openscap/git-r0/temp/log.do_compile_ptest_base.329146)

Thats not good. Thought I had run though this code path.

I am traveling the next 2 weeks so i am not sure how quickly I can address this issue.

Armin

Quoted 75 lines

//Yi

Quoted 70 lines · Armin Kuster
---
 .../recipes-openscap/openscap/openscap.inc            | 11 +++++------
 .../recipes-openscap/openscap/openscap_1.3.1.bb       | 10 ++++++++++
 .../recipes-openscap/openscap/openscap_git.bb         |  4 ++--
 3 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 meta-security-compliance/recipes-openscap/openscap/openscap_1.3.1.bb
meta-security-compliance/recipes-openscap/openscap/openscap.inc +4 -4
index 4c1f206..e5daaf8 100644
@@ -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"
 -inherit cmake pkgconfig python3native perlnative ptest
-
 S = "${WORKDIR}/git"
 +inherit cmake pkgconfig python3native perlnative ptest
+
 PACKAGECONFIG ?= "python3 rpm perl"
 PACKAGECONFIG[python3] = "-DENABLE_PYTHON3=True, , python3, python3"
 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 \
                 "
 -EXTRA_OECONF_class-native += "-DENABLE_PROBES=True"
   STAGING_OSCAP_DIR = "${TMPDIR}/work-shared/${MACHINE}/oscap-source"
 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"
   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_SCHEMA_PATH.*$:OSCAP_DEFAULT_SCHEMA_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/schemas":' ${S}/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_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":' ${B}/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}"
meta-security-compliance/recipes-openscap/openscap/openscap_1.3.1.bb new file +10 -0
new file mode 100644
index 0000000..c29fd42
@@ -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 +1 -2
index 3dfa99e..aded920 100644
@@ -3,9 +3,9 @@
   SUMARRY = "NIST Certified SCAP 1.2 toolkit with OE changes"
 +include openscap.inc
+
 SRCREV = "4bbdb46ff651f809d5b38ca08d769790c4bfff90"
 SRC_URI = "git://github.com/akuster/openscap.git;branch=oe-1.3 \
            file://run-ptest \
 "
-
-include openscap.inc
#4 lore raw

Re: [meta-security-compliance][PATCH 2/4] openscap: add 1.3.1 recipes for upstream source

Quoted 15 lines · On 7/23/19 2:38 PM, Akuster808 wrote:
Quoted 8 lines · Yi Zhao

Hi Armin,

I got the following error when build openscap:

Quoted 7 lines

ERROR: openscap-git-r0 do_compile_ptest_base: Function failed: do_compile_ptest_base (log file is located at /buildarea/build/tmp/work/core2-64-poky-linux/openscap/git-r0/temp/log.do_compile_ptest_base.329146)
ERROR: Logfile of failure stored in: /buildarea/build/tmp/work/core2-64-poky-linux/openscap/git-r0/temp/log.do_compile_ptest_base.329146
Log data follows:

| DEBUG: Executing shell function do_compile_ptest_base
| /buildarea/build/tmp/work/core2-64-poky-linux/openscap/git-r0/temp/run.do_compile_ptest_base.329146: line 108: oe-runcmake: command not found
| WARNING: /buildarea/build/tmp/work/core2-64-poky-linux/openscap/git-r0/temp/run.do_compile_ptest_base.329146:1 exit 127 from 'oe-runcmake tests'
| ERROR: Function failed: do_compile_ptest_base (log file is located at /buildarea/build/tmp/work/core2-64-poky-linux/openscap/git-r0/temp/log.do_compile_ptest_base.329146)
Quoted 3 lines

Thats not good. Thought I had run though this code path.

I am traveling the next 2 weeks so i am not sure how quickly I can address this issue.

That's OK. Thanks.

//Yi

Quoted 76 lines

Armin

Quoted 74 lines

//Yi

Quoted 70 lines · Armin Kuster
---
  .../recipes-openscap/openscap/openscap.inc            | 11 +++++------
  .../recipes-openscap/openscap/openscap_1.3.1.bb       | 10 ++++++++++
  .../recipes-openscap/openscap/openscap_git.bb         |  4 ++--
  3 files changed, 17 insertions(+), 8 deletions(-)

create mode 100644 meta-security-compliance/recipes-openscap/openscap/openscap_1.3.1.bb

meta-security-compliance/recipes-openscap/openscap/openscap.inc +4 -4
index 4c1f206..e5daaf8 100644
@@ -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"
  -inherit cmake pkgconfig python3native perlnative ptest
-
  S = "${WORKDIR}/git"
  +inherit cmake pkgconfig python3native perlnative ptest
+
  PACKAGECONFIG ?= "python3 rpm perl"
  PACKAGECONFIG[python3] = "-DENABLE_PYTHON3=True, , python3, python3"
  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 \
                  "
  -EXTRA_OECONF_class-native += "-DENABLE_PROBES=True"
    STAGING_OSCAP_DIR = "${TMPDIR}/work-shared/${MACHINE}/oscap-source"
  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"
    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_SCHEMA_PATH.*$:OSCAP_DEFAULT_SCHEMA_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/schemas":' ${S}/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_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":' ${B}/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}"
meta-security-compliance/recipes-openscap/openscap/openscap_1.3.1.bb new file +10 -0
new file mode 100644
index 0000000..c29fd42
@@ -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 +1 -2
index 3dfa99e..aded920 100644
@@ -3,9 +3,9 @@
    SUMARRY = "NIST Certified SCAP 1.2 toolkit with OE changes"
  +include openscap.inc
+
  SRCREV = "4bbdb46ff651f809d5b38ca08d769790c4bfff90"
  SRC_URI = "git://github.com/akuster/openscap.git;branch=oe-1.3 \
             file://run-ptest \
  "
-
-include openscap.inc
#5 lore raw

PATCH 3/4 scap-security-guide: update to 0.1.44

In reply to Armin Kuster

create a PV version to track upstream
git version includes OE changes

---
 .../scap-security-guide.inc                   | 47 ++++++++++++++
 .../scap-security-guide_0.1.44.bb             |  8 +++
 .../scap-security-guide_git.bb                | 63 +++----------------
 3 files changed, 63 insertions(+), 55 deletions(-)
 create mode 100644 meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc
 create mode 100644 meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_0.1.44.bb
meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc new file +47 -0
new file mode 100644
index 0000000..ed70c18
@@ -0,0 +1,47 @@
+# Copyright (C) 2017 Armin Kuster  <[email protected]>
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+SUMARRY = "SCAP content for various platforms"
+HOME_URL = "https://www.open-scap.org/security-policies/scap-security-guide/"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=97662e4486d9a1d09f358851d9f41a1a"
+LICENSE = "LGPL-2.1"
+
+DEPENDS = "openscap-native python3 python3-pyyaml-native python3-jinja2-native libxml2-native"
+
+S = "${WORKDIR}/git"
+
+inherit cmake pkgconfig python3native
+
+#PARALLEL_MAKE = ""
+
+STAGING_OSCAP_BUILDDIR = "${TMPDIR}/work-shared/openscap/oscap-build-artifacts"
+
+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
+}
+
+do_install () {
+	cd ${S}/build
+	make DESTDIR=${D} install
+}
+
+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"
meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_0.1.44.bb new file +8 -0
new file mode 100644
index 0000000..d80ecd7
@@ -0,0 +1,8 @@
+SUMARRY = "SCAP content for various platforms, upstream version"
+
+SRCREV = "8cb2d0f351faff5440742258782281164953b0a6"
+SRC_URI = "git://github.com/ComplianceAsCode/content.git"
+
+DEFAULT_PREFERENCE = "-1"
+
+require scap-security-guide.inc
meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_git.bb +8 -55

68 lines not on this page · raw message

Signature · 1 line
2.17.1
#6 lore raw

PATCH 4/4 meta-security-compliance: add meta-python

In reply to Armin Kuster

with some for the recipe updates, more pyton support is needed

---
 meta-security-compliance/conf/layer.conf | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
meta-security-compliance/conf/layer.conf +1 -3
index b245a16..9ccadab 100644
@@ -10,6 +10,4 @@ BBFILE_PRIORITY_scanners-layer = "10"
 
 LAYERSERIES_COMPAT_scanners-layer = "warrior"
 
-LAYERDEPENDS_scanners-layer = " \
-    core \
-"
+LAYERDEPENDS_scanners-layer = "core openembedded-layer meta-python"
Signature · 1 line
2.17.1