From 0a83fab4d8467ee33604d9ce613d152846eb4ea0 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Thu, 19 Aug 2021 12:47:00 +0800 Subject: augeas: drop bbappend The PACKAGECONFIG[selinux] is enabled in augeas recipe. Signed-off-by: Yi Zhao Signed-off-by: Joe MacDonald --- conf/layer.conf | 4 +--- .../openembedded-layer/recipes-support/augeas/augeas_%.bbappend | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/augeas/augeas_%.bbappend diff --git a/conf/layer.conf b/conf/layer.conf index 673cc13..ebc8e33 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -5,9 +5,7 @@ BBPATH .= ":${LAYERDIR}" BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" -BBFILES_DYNAMIC += "openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \ - openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \ - networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \ +BBFILES_DYNAMIC += "networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \ networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bbappend \ virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes*/*/*.bb \ virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes*/*/*.bbappend \ diff --git a/dynamic-layers/openembedded-layer/recipes-support/augeas/augeas_%.bbappend b/dynamic-layers/openembedded-layer/recipes-support/augeas/augeas_%.bbappend deleted file mode 100644 index b01ad25..0000000 --- a/dynamic-layers/openembedded-layer/recipes-support/augeas/augeas_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-selinux', '', d)} -- cgit v1.2.3-54-g00ecf