summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2021-08-19 12:47:00 +0800
committerJoe MacDonald <joe@deserted.net>2021-08-29 21:34:22 -0400
commit0a83fab4d8467ee33604d9ce613d152846eb4ea0 (patch)
tree4423f68cfb0a03f6869e5f4c9b1758f3f7f9475c
parentfe801fd2db588b5587a91109770ddda79eb70380 (diff)
downloadmeta-selinux-0a83fab4d8467ee33604d9ce613d152846eb4ea0.tar.gz
augeas: drop bbappend
The PACKAGECONFIG[selinux] is enabled in augeas recipe. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Joe MacDonald <joe@deserted.net>
-rw-r--r--conf/layer.conf4
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/augeas/augeas_%.bbappend1
2 files changed, 1 insertions, 4 deletions
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}"
5BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ 5BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
6 ${LAYERDIR}/recipes-*/*/*.bbappend" 6 ${LAYERDIR}/recipes-*/*/*.bbappend"
7 7
8BBFILES_DYNAMIC += "openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \ 8BBFILES_DYNAMIC += "networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \
9 openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \
10 networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \
11 networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bbappend \ 9 networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bbappend \
12 virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes*/*/*.bb \ 10 virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes*/*/*.bb \
13 virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes*/*/*.bbappend \ 11 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 @@
1inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-selinux', '', d)}