diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2020-05-26 20:25:03 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2020-05-26 20:25:03 +0300 |
| commit | 35a774200999ac2fca48693c1c169bf99d2f63ea (patch) | |
| tree | 0b2f65ce3a90f41d1c2542d0fd20b1604fd83fe5 /meta-security/recipes-kernel/linux | |
| parent | 497a23ef6661ad6ca7b75009e48a592c1620d46c (diff) | |
| download | openbmc-2.8.0.tar.xz | |
Reset the following subtrees on HEAD:
poky: ed3bdd7fbc(dunfell)
meta-raspberrypi: 8066fac91d(dunfell)
meta-security: d83f7cb0c9(dunfell)
meta-openembedded: e413c1ef62(dunfell)
Change-Id: Ifd3228663b08911c890d7631310294cccb3dd232
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-security/recipes-kernel/linux')
| -rw-r--r-- | meta-security/recipes-kernel/linux/linux-yocto-dev.bbappend | 2 | ||||
| -rw-r--r-- | meta-security/recipes-kernel/linux/linux-yocto_5.%.bbappend (renamed from meta-security/recipes-kernel/linux/linux-yocto_4.%.bbappend) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/meta-security/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-security/recipes-kernel/linux/linux-yocto-dev.bbappend index 239e30e707..39d4e6f502 100644 --- a/meta-security/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/meta-security/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -1,2 +1,2 @@ KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "apparmor", " features/apparmor/apparmor.scc", "" ,d)}" -+KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "smack", " features/smack/smack.scc", "" ,d)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "smack", " features/smack/smack.scc", "" ,d)}" diff --git a/meta-security/recipes-kernel/linux/linux-yocto_4.%.bbappend b/meta-security/recipes-kernel/linux/linux-yocto_5.%.bbappend index 39d4e6f502..39d4e6f502 100644 --- a/meta-security/recipes-kernel/linux/linux-yocto_4.%.bbappend +++ b/meta-security/recipes-kernel/linux/linux-yocto_5.%.bbappend |