diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-security/meta-security-compliance | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-security/meta-security-compliance')
-rw-r--r-- | meta-security/meta-security-compliance/conf/layer.conf | 4 | ||||
-rw-r--r-- | meta-security/meta-security-compliance/recipes-auditors/lynis/lynis_2.6.8.bb (renamed from meta-security/meta-security-compliance/recipes-auditors/lynis/lynis_2.5.1.bb) | 9 | ||||
-rw-r--r-- | meta-security/meta-security-compliance/recipes-core/os-release/os-release.bbappend | 3 | ||||
-rw-r--r-- | meta-security/meta-security-compliance/recipes-openscap/openscap-daemon/openscap-daemon_0.1.10.bb (renamed from meta-security/meta-security-compliance/recipes-openscap/openscap-daemon/openscap-daemon_0.1.6.bb) | 4 | ||||
-rw-r--r-- | meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.2.17.bb (renamed from meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.2.15.bb) | 3 |
5 files changed, 11 insertions, 12 deletions
diff --git a/meta-security/meta-security-compliance/conf/layer.conf b/meta-security/meta-security-compliance/conf/layer.conf index 31716d6e7..fcc5cd6ca 100644 --- a/meta-security/meta-security-compliance/conf/layer.conf +++ b/meta-security/meta-security-compliance/conf/layer.conf @@ -6,9 +6,9 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend" BBFILE_COLLECTIONS += "scanners-layer" BBFILE_PATTERN_scanners-layer = "^${LAYERDIR}/" -BBFILE_PRIORITY_scanners-layer = "6" +BBFILE_PRIORITY_scanners-layer = "10" -LAYERSERIES_COMPAT_scanners-layer = "sumo" +LAYERSERIES_COMPAT_scanners-layer = "thud" LAYERDEPENDS_scanners-layer = " \ core \ diff --git a/meta-security/meta-security-compliance/recipes-auditors/lynis/lynis_2.5.1.bb b/meta-security/meta-security-compliance/recipes-auditors/lynis/lynis_2.6.8.bb index 884999c08..28a44691c 100644 --- a/meta-security/meta-security-compliance/recipes-auditors/lynis/lynis_2.5.1.bb +++ b/meta-security/meta-security-compliance/recipes-auditors/lynis/lynis_2.6.8.bb @@ -6,9 +6,12 @@ HOMEDIR = "https://cisofy.com/" LICENSE = "GPL-3.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3edd6782854304fd11da4975ab9799c1" -SRCREV= "1be5154b35ce144db4f386856debe8a06b403899" -SRC_URI = "git://github.com/CISOfy/Lynis.git" -S = "${WORKDIR}/git" +SRC_URI = "https://cisofy.com/files/${BPN}-${PV}.tar.gz" + +SRC_URI[md5sum] = "91a538055bfb682733ef8e4fe7eb0902" +SRC_URI[sha256sum] = "2e4c5157a4f2d9bb37d3f0f1f5bea03f92233a2a7d4df6eddf231a784087dfac" + +S = "${WORKDIR}/${BPN}" inherit autotools-brokensep diff --git a/meta-security/meta-security-compliance/recipes-core/os-release/os-release.bbappend b/meta-security/meta-security-compliance/recipes-core/os-release/os-release.bbappend index e9fd44ade..604bacb1a 100644 --- a/meta-security/meta-security-compliance/recipes-core/os-release/os-release.bbappend +++ b/meta-security/meta-security-compliance/recipes-core/os-release/os-release.bbappend @@ -1,4 +1 @@ -OS_RELEASE_FIELDS += "CPE_NAME" - CPE_NAME="cpe:/o:openembedded:nodistro:0" - diff --git a/meta-security/meta-security-compliance/recipes-openscap/openscap-daemon/openscap-daemon_0.1.6.bb b/meta-security/meta-security-compliance/recipes-openscap/openscap-daemon/openscap-daemon_0.1.10.bb index fb01a1134..a6a9373ea 100644 --- a/meta-security/meta-security-compliance/recipes-openscap/openscap-daemon/openscap-daemon_0.1.6.bb +++ b/meta-security/meta-security-compliance/recipes-openscap/openscap-daemon/openscap-daemon_0.1.10.bb @@ -8,11 +8,9 @@ LICENSE = "LGPL-2.1" DEPENDS = "python3-dbus" -SRCREV = "3fd5c75a08223de35a865d026d2a6980ec9c1d74" +SRCREV = "f25b16afb6ac761fea13132ff406fba4cdfd2b76" SRC_URI = "git://github.com/OpenSCAP/openscap-daemon.git" -PV = "0.1.6+git${SRCPV}" - inherit setuptools3 S = "${WORKDIR}/git" diff --git a/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.2.15.bb b/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.2.17.bb index 7cbb1e2ec..e2a4fa2e6 100644 --- a/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.2.15.bb +++ b/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.2.17.bb @@ -11,7 +11,7 @@ DEPENDS = "autoconf-archive pkgconfig gconf procps curl libxml2 rpm \ DEPENDS_class-native = "autoconf-archive-native pkgconfig-native swig-native curl-native libxml2-native libxslt-native dpkg-native libgcrypt-native nss-native" -SRCREV = "240930d42611983c65ecae16dbca3248ce130921" +SRCREV = "59c234b3e9907480c89dfbd1b466a6bf72a2d2ed" SRC_URI = "git://github.com/akuster/openscap.git;branch=oe \ file://crypto_pkgconfig.patch \ file://run-ptest \ @@ -46,6 +46,7 @@ do_configure_prepend () { sed -i 's:-I/usr/include:-I${STAGING_INCDIR}:' ${S}/swig/perl/Makefile.am sed -i 's:-I/usr/include:-I${STAGING_INCDIR}:' ${S}/swig/python3/Makefile.am sed -i 's:-I/usr/include:-I${STAGING_INCDIR}:' ${S}/swig/python2/Makefile.am + sed -i 's:python2:python:' ${S}/utils/scap-as-rpm } |