From 184f8b79f85fac04262e78fec8b160f8617fbd30 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Wed, 20 Jun 2018 22:59:45 +0200 Subject: Remove duplicate config inclusion of 4a-sound.cfg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After https://gerrit.automotivelinux.org/gerrit/14561 the kernel config is included in the toplevel config file (linux-agl.inc) to avoid changes to linux-libc-headers. Remove it here as discussed during ALS. Change-Id: I7db7ac34c73bc2eda95c04e0a3f7614ab9a4655e Signed-off-by: Jan-Simon Möller --- .../recipes-kernel/linux/files/4a-sound.cfg | 1 - .../recipes-kernel/linux/linux-%.bbappend | 21 --------------------- 2 files changed, 22 deletions(-) delete mode 100644 meta-audio-4a-framework/recipes-kernel/linux/files/4a-sound.cfg delete mode 100644 meta-audio-4a-framework/recipes-kernel/linux/linux-%.bbappend diff --git a/meta-audio-4a-framework/recipes-kernel/linux/files/4a-sound.cfg b/meta-audio-4a-framework/recipes-kernel/linux/files/4a-sound.cfg deleted file mode 100644 index 780e1ad5..00000000 --- a/meta-audio-4a-framework/recipes-kernel/linux/files/4a-sound.cfg +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SND_ALOOP=y diff --git a/meta-audio-4a-framework/recipes-kernel/linux/linux-%.bbappend b/meta-audio-4a-framework/recipes-kernel/linux/linux-%.bbappend deleted file mode 100644 index cc613708..00000000 --- a/meta-audio-4a-framework/recipes-kernel/linux/linux-%.bbappend +++ /dev/null @@ -1,21 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -IS_KERNEL_RECIPE := "${@bb.data.inherits_class('kernel', d) and 'yes' or 'no'}" - -4A_KERNEL_SRC_URI_no = "" -4A_KERNEL_SRC_URI_yes = "" - -4A_KERNEL_CONFIG_FRAGMENT_no = "" -4A_KERNEL_CONFIG_FRAGMENT_yes = "" - -# ---------- 4a-sound.cfg ------------ - -4A_KERNEL_SRC_URI_yes += "file://4a-sound.cfg" -4A_KERNEL_CONFIG_FRAGMENT_yes += "${WORKDIR}/4a-sound.cfg" - - -# append to SRC_URI and KERNEL_CONFIG_FRAGMENTS (see meta-agl/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc) - -SRC_URI_append = " ${4A_KERNEL_SRC_URI_${IS_KERNEL_RECIPE}}" -KERNEL_CONFIG_FRAGMENTS_append = " ${4A_KERNEL_CONFIG_FRAGMENT_${IS_KERNEL_RECIPE}}" - -- cgit 1.2.3-korg