From 3f962c7d202055777dd0238f12dbcf70f09ac07d Mon Sep 17 00:00:00 2001 From: José Bollo Date: Wed, 24 Jan 2018 11:18:02 +0100 Subject: Rename smack OVERRIDE to with-lsm-smack MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using the OVERRIDE "smack" came with the use of the layer meta-intel-iot-security. When switching to meta-security, it conflicts with the package name 'smack' that provide the smack user library. Yocto was reporting the following error: ERROR: .../meta-security/recipes-security/smack/smack_1.3.0.bb: QA Issue: Recipe .../meta-security/recipes-security/smack/smack_1.3.0.bb has PN of "smack" which is in OVERRIDES, this can result in unexpected behaviour. [pn-overrides] Change-Id: Id71b283bf1ce5682bd94bf96595eb32506acb1d5 Signed-off-by: José Bollo --- meta-app-framework/recipes-kernel/linux/linux-%.bbappend | 2 +- meta-app-framework/recipes-kernel/linux/linux-yocto_4.12.bbappend | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-app-framework/recipes-kernel/linux') diff --git a/meta-app-framework/recipes-kernel/linux/linux-%.bbappend b/meta-app-framework/recipes-kernel/linux/linux-%.bbappend index 02595efdf..fba5bf13d 100644 --- a/meta-app-framework/recipes-kernel/linux/linux-%.bbappend +++ b/meta-app-framework/recipes-kernel/linux/linux-%.bbappend @@ -1,3 +1,3 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux:" -SRC_URI_append_smack = " file://audit.cfg" +SRC_URI_append_with-lsm-smack = " file://audit.cfg" diff --git a/meta-app-framework/recipes-kernel/linux/linux-yocto_4.12.bbappend b/meta-app-framework/recipes-kernel/linux/linux-yocto_4.12.bbappend index b1eadaffa..5ae62d586 100644 --- a/meta-app-framework/recipes-kernel/linux/linux-yocto_4.12.bbappend +++ b/meta-app-framework/recipes-kernel/linux/linux-yocto_4.12.bbappend @@ -3,7 +3,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux/linux-yocto-4.12:" #------------------------------------------------------------------------- # smack patches for handling bluetooth -SRC_URI_append_smack = "\ +SRC_URI_append_with-lsm-smack = "\ file://0002-smack-fix-cache-of-access-labels.patch \ file://0003-Smack-ignore-null-signal-in-smack_task_kill.patch \ file://0004-Smack-Assign-smack_known_web-label-for-kernel-thread.patch \ -- cgit 1.2.3-korg