diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
commit | d73e39703a0260c8911cb439b579e1c2bada4b20 (patch) | |
tree | 4fa9f965ae954c587ab773ecaced6b8f8e18d359 /meta-security/kas | |
parent | 6f106a0a4ce15fe0678d4ffefd572e6978c72597 (diff) | |
parent | 6d8c5d2c6204714ca6b7a43f04348162b683cdbc (diff) | |
download | openbmc-d73e39703a0260c8911cb439b579e1c2bada4b20.tar.xz |
Merge tag '0.75' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-security/kas')
-rw-r--r-- | meta-security/kas/kas-security-alt.yml | 2 | ||||
-rw-r--r-- | meta-security/kas/kas-security-base.yml | 9 | ||||
-rw-r--r-- | meta-security/kas/kas-security-dm.yml | 1 | ||||
-rw-r--r-- | meta-security/kas/kas-security-parsec.yml | 6 | ||||
-rw-r--r-- | meta-security/kas/qemuarm64-multi.yml | 12 | ||||
-rw-r--r-- | meta-security/kas/qemumips64-multi.yml | 4 | ||||
-rw-r--r-- | meta-security/kas/qemuppc-parsec.yml | 6 | ||||
-rw-r--r-- | meta-security/kas/qemuppc.yml | 6 | ||||
-rw-r--r-- | meta-security/kas/qemux86-64-multi.yml | 12 | ||||
-rw-r--r-- | meta-security/kas/qemux86-comp.yml | 4 |
10 files changed, 11 insertions, 51 deletions
diff --git a/meta-security/kas/kas-security-alt.yml b/meta-security/kas/kas-security-alt.yml index 25384dfba..f073216cd 100644 --- a/meta-security/kas/kas-security-alt.yml +++ b/meta-security/kas/kas-security-alt.yml @@ -10,4 +10,4 @@ repos: local_conf_header: alt: | - DISTRO_FEATURES_append = " systemd" + DISTRO_FEATURES:append = " systemd" diff --git a/meta-security/kas/kas-security-base.yml b/meta-security/kas/kas-security-base.yml index c6cc4fc8e..3bf46dbf0 100644 --- a/meta-security/kas/kas-security-base.yml +++ b/meta-security/kas/kas-security-base.yml @@ -1,5 +1,5 @@ header: - version: 8 + version: 9 distro: poky @@ -32,7 +32,7 @@ repos: local_conf_header: base: | - CONF_VERSION = "1" + CONF_VERSION = "2" SOURCE_MIRROR_URL = "http://downloads.yoctoproject.org/mirror/sources/" SSTATE_MIRRORS = "file://.* http://sstate.yoctoproject.org/dev/PATH;downloadfilename=PATH \n" BB_HASHSERVE = "auto" @@ -51,8 +51,8 @@ local_conf_header: EXTRA_IMAGE_FEATURES ?= "debug-tweaks" PACKAGE_CLASSES = "package_ipk" - DISTRO_FEATURES_append = " pam apparmor smack ima" - MACHINE_FEATURES_append = " tpm tpm2" + DISTRO_FEATURES:append = " security pam apparmor smack ima tpm tpm2" + MACHINE_FEATURES:append = " tpm tpm2" diskmon: | BB_DISKMON_DIRS = "\ @@ -67,7 +67,6 @@ local_conf_header: bblayers_conf_header: base: | - POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" diff --git a/meta-security/kas/kas-security-dm.yml b/meta-security/kas/kas-security-dm.yml index 7ce0e9d72..c03b3361e 100644 --- a/meta-security/kas/kas-security-dm.yml +++ b/meta-security/kas/kas-security-dm.yml @@ -5,6 +5,7 @@ header: local_conf_header: dm-verify: | + DISTRO_FEATURES:append = " integrity" DM_VERITY_IMAGE = "core-image-minimal" DM_VERITY_IMAGE_TYPE = "ext4" IMAGE_CLASSES += "dm-verity-img" diff --git a/meta-security/kas/kas-security-parsec.yml b/meta-security/kas/kas-security-parsec.yml index 6152f0c1d..9a009be14 100644 --- a/meta-security/kas/kas-security-parsec.yml +++ b/meta-security/kas/kas-security-parsec.yml @@ -8,14 +8,10 @@ repos: layers: meta-parsec: - meta-rust: - url: https://github.com/meta-rust/meta-rust.git - refspec: master - meta-clang: url: https://github.com/kraj/meta-clang.git refspec: master local_conf_header: meta-parsec: | - IMAGE_INSTALL_append = " parsec-service parsec-tool" + IMAGE_INSTALL:append = " parsec-service parsec-tool" diff --git a/meta-security/kas/qemuarm64-multi.yml b/meta-security/kas/qemuarm64-multi.yml deleted file mode 100644 index d79142c37..000000000 --- a/meta-security/kas/qemuarm64-multi.yml +++ /dev/null @@ -1,12 +0,0 @@ -header: - version: 8 - includes: - - kas-security-base.yml - -local_conf_header: - multi: | - require conf/multilib.conf - MULTILIBS = "multilib:lib32" - DEFAULTTUNE_virtclass-multilib-lib32 = "armv7athf-neon" - -machine: qemuarm64 diff --git a/meta-security/kas/qemumips64-multi.yml b/meta-security/kas/qemumips64-multi.yml index c8cf94b71..6ef8b3984 100644 --- a/meta-security/kas/qemumips64-multi.yml +++ b/meta-security/kas/qemumips64-multi.yml @@ -8,7 +8,7 @@ local_conf_header: require conf/multilib.conf MULTILIBS = "multilib:lib64 multilib:lib32" DEFAULTTUNE = "mips64-n32" - DEFAULTTUNE_virtclass-multilib-lib64 = "mips64" - DEFAULTTUNE_virtclass-multilib-lib32 = "mips32r2" + DEFAULTTUNE:virtclass-multilib-lib64 = "mips64" + DEFAULTTUNE:virtclass-multilib-lib32 = "mips32r2" machine: qemumips64 diff --git a/meta-security/kas/qemuppc-parsec.yml b/meta-security/kas/qemuppc-parsec.yml deleted file mode 100644 index 1176d1369..000000000 --- a/meta-security/kas/qemuppc-parsec.yml +++ /dev/null @@ -1,6 +0,0 @@ -header: - version: 8 - includes: - - kas-security-parsec.yml - -machine: qemuppc diff --git a/meta-security/kas/qemuppc.yml b/meta-security/kas/qemuppc.yml deleted file mode 100644 index 3dad81c27..000000000 --- a/meta-security/kas/qemuppc.yml +++ /dev/null @@ -1,6 +0,0 @@ -header: - version: 8 - includes: - - kas-security-base.yml - -machine: qemuppc diff --git a/meta-security/kas/qemux86-64-multi.yml b/meta-security/kas/qemux86-64-multi.yml deleted file mode 100644 index 711ce2863..000000000 --- a/meta-security/kas/qemux86-64-multi.yml +++ /dev/null @@ -1,12 +0,0 @@ -header: - version: 8 - includes: - - kas-security-base.yml - -local_conf_header: - multi: | - require conf/multilib.conf - MULTILIBS = "multilib:lib32" - DEFAULTTUNE_virtclass-multilib-lib32 = "x86" - -machine: qemux86-64 diff --git a/meta-security/kas/qemux86-comp.yml b/meta-security/kas/qemux86-comp.yml index 14c5dcabf..478d63187 100644 --- a/meta-security/kas/qemux86-comp.yml +++ b/meta-security/kas/qemux86-comp.yml @@ -5,7 +5,7 @@ header: local_conf_header: meta-compliance: | - IMAGE_INSTALL_append = " lynis" - IMAGE_INSTALL_append = " openscap openscap-daemon scap-security-guide" + IMAGE_INSTALL:append = " lynis" + IMAGE_INSTALL:append = " openscap openscap-daemon scap-security-guide" machine: qemux86 |