| commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f | [log] [tgz] |
|---|---|---|
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | Fri Apr 05 15:28:33 2019 -0400 |
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | Fri Apr 05 19:31:28 2019 +0000 |
| tree | e12769d7c76d8b0517d6de3d3c72189753d253ed | |
| parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b [diff] [blame] |
reset upstream subtrees to HEAD Reset the following subtrees on HEAD: poky: 8217b477a1(master) meta-xilinx: 64aa3d35ae(master) meta-openembedded: 0435c9e193(master) meta-raspberrypi: 490a4441ac(master) meta-security: cb6d1c85ee(master) Squashed patches: meta-phosphor: drop systemd 239 patches meta-phosphor: mrw-api: use correct install path Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_0.1.33.bb b/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_0.1.33.bb index 7fa417d..27d3d86 100644 --- a/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_0.1.33.bb +++ b/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_0.1.33.bb
@@ -19,6 +19,8 @@ STAGING_OSCAP_BUILDDIR = "${TMPDIR}/work-shared/openscap/oscap-build-artifacts" +OECMAKE_GENERATOR = "Unix Makefiles" + EXTRA_OECMAKE += "-DSSG_PRODUCT_CHROMIUM:BOOL=OFF" EXTRA_OECMAKE += "-DSSG_PRODUCT_DEBIAN8:BOOL=OFF" EXTRA_OECMAKE += "-DSSG_PRODUCT_FEDORA:BOOL=OFF"