Commit Graph

14 Commits

Author SHA1 Message Date
Armin Kuster d1d0b2a6d7 recipes: Update SRC_URI branch and protocols
This patch updates SRC_URIs using git to include branch=master if no branch is set
and also to use protocol=https for github urls as generated by the conversion script
in OE-Core.

Signed-off-by: Armin Kuster <akuster808@gmail.com>
2021-12-03 14:15:07 -08:00
Armin Kuster adcd7c4371 scap-security-guide: Inherit python3targetconfig
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2021-02-23 20:34:51 -08:00
Jate Sujjavanich 16ee7308c9 scap-security-guide: Fix openembedded platform tests and build
Add patches to fix openembedded nodistro tests and openembedded build within
ssg metadata.

Signed-Off-By: Jate Sujjavanich <jatedev@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2021-02-14 16:31:00 -08:00
Yi Zhao 080778ca97 scap-security-guide: fix build with Python 3.9
The getchildren and getiterator functions are deprecated in Python 3.9.
Backport 3 patches to fix the build issue.

Fixes:
File
"/build/tmp/work/cortexa8hf-neon-poky-linux-gnueabi/scap-security-guide/0.1.44+gitAUTOINC+5fdfdcb2e9-r0/git/ssg/build_stig.py",
line 41, in add_references
    index = rule.getchildren().index(ref)
AttributeError: 'xml.etree.ElementTree.Element' object has no attribute 'getchildren'

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2020-11-15 11:03:39 -08:00
Mingli Yu 4c2f7ffd49 scap-security-guide: add expat-native to DEPENDS
Add expat-native to DEPENDS to fix the below do_configure error:
| CMake Error at CMakeLists.txt:165 (message):
|  xmlwf is required!

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2020-10-15 21:15:03 -07:00
Yi Zhao b23e7eac2d scap-security-guide: pass the correct schema file path to openscap-native
There is a build error when using openscap-native sstate cache.
Steps to reproduce:
Create a new build project in build-1 directory.
$ bitbake openscap-native
Then remove the whole build directory only keep the sstate-cache
directory as a sstate mirror.

Create another new build project in build-2 directory.
Set SSTATE_MIRRORS
$ bitbake scap-security-guide

Error message:
OpenSCAP Error: Schema file 'xccdf/1.1/xccdf-schema.xsd' not found in path
'/buildarea/build-1/tmp/work-shared/openscap/oscap-build-artifacts/usr/share/openscap/schemas' when trying to validate
'/buildarea/build-2/tmp/work/core2-64-poky-linux/scap-security-guide/0.1.44+gitAUTOINC+5fdfdcb2e9-r0/git/build/jre/xccdf-unlinked-resolved.xml'
[/buildarea/build-1/tmp/work/x86_64-linux/openscap-native/1.3.1+gitAUTOINC+4bbdb46ff6-r0/git/src/source/validate.c:104]

The oscap command from openscap-native tries to find the schema files in
build-1 directory since these paths are hardcoded when building
openscap-native.

We need to pass the correct schema/xslt/cpe paths to oscap to make sure
it can find the files in right location.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2020-03-05 07:20:07 -08:00
Yi Zhao ace43479e7 scap-security-guide: fix xml parsing error when build remediation files
Backport 2 patches to fix the build error:

Processing fix.text for: java_jre_configure_crypto_policy rule
Unable to extract part of the fix.text after inclusion of remediation functions. Aborting..
jre/CMakeFiles/generate-internal-jre-bash-fixes.xml.dir/build.make:60:
recipe for target 'jre/bash-fixes.xml' failed
make[2]: *** [jre/bash-fixes.xml] Error 1
make[2]: *** Deleting file 'jre/bash-fixes.xml'

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2020-02-09 09:33:22 -08:00
Armin Kuster 303800de96 scap-security-guide: add depends on openscap-native do_install
This ensures openscap-native does install the needed patches
security guilde needs to build

Minor recipe cleanup too

Signed-off-by: Armin Kuster <akuster808@gmail.com>
2019-09-07 08:34:22 -07:00
Yi Zhao 531f6c1a4d scap-security-guide: fix typo
Fix typo: RDEPNEDS_${PN} -> RDEPENDS_${PN}

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2019-08-07 07:09:50 -07:00
Yi Zhao 0a73a14fbb 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 <yi.zhao@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2019-08-04 12:17:25 -07:00
Armin Kuster a64348d0df scap-security-guide: update to 0.1.44
create a PV version to track upstream
git version includes OE changes

Signed-off-by: Armin Kuster <akuster808@gmail.com>
2019-07-17 16:56:39 -07:00
Mark Asselstine eabb07f6d2 openscap/scap-security-guide: use _git instead of versioned filenames
In order to facilate the reuse of the recipe code via layer or distro
specific bbappends rename the recipe files to use _git instead of
versined filenames. Specifically this allows for minimal bbappends in
additional layers which may use the upstream, non-forked, repos that
can be version skewed when compared to what is present in this repo.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2019-07-07 19:18:41 -07:00
Yi Zhao b081fdc807 scap-security-guide: use makefile generator instead of ninja for cmake
Fixes build error:
  | make: *** No rule to make target 'openembedded'.  Stop.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2019-03-08 14:51:55 -08:00
Armin Kuster 692864f6e8 openscap: add scap-security-guide
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2017-09-30 11:47:20 -07:00