summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2021-08-19 12:47:01 +0800
committerJoe MacDonald <joe@deserted.net>2021-08-29 21:34:22 -0400
commit0c417aa70d0e70e3067f4142a3311e49c759b234 (patch)
treec2f9da893bf71ad0d6d260088d0f9c2c6ecbd9b8
parent0a83fab4d8467ee33604d9ce613d152846eb4ea0 (diff)
downloadmeta-selinux-0c417aa70d0e70e3067f4142a3311e49c759b234.tar.gz
lxc: drop bbappend
The PACKAGECONFIG[selinux] is enabled in lxc recipe. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Joe MacDonald <joe@deserted.net>
-rw-r--r--conf/layer.conf2
-rw-r--r--dynamic-layers/virtualization-layer/recipes-containers/lxc/lxc_%.bbappend1
2 files changed, 0 insertions, 3 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index ebc8e33..fcd61d5 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -7,8 +7,6 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
7 7
8BBFILES_DYNAMIC += "networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \ 8BBFILES_DYNAMIC += "networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \
9 networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bbappend \ 9 networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bbappend \
10 virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes*/*/*.bb \
11 virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes*/*/*.bbappend \
12 meta-python2:${LAYERDIR}/dynamic-layers/python2-layer/recipes*/*/*.bb \ 10 meta-python2:${LAYERDIR}/dynamic-layers/python2-layer/recipes*/*/*.bb \
13 meta-python2:${LAYERDIR}/dynamic-layers/python2-layer/recipes*/*/*.bbappend \ 11 meta-python2:${LAYERDIR}/dynamic-layers/python2-layer/recipes*/*/*.bbappend \
14 " 12 "
diff --git a/dynamic-layers/virtualization-layer/recipes-containers/lxc/lxc_%.bbappend b/dynamic-layers/virtualization-layer/recipes-containers/lxc/lxc_%.bbappend
deleted file mode 100644
index 74e22b3..0000000
--- a/dynamic-layers/virtualization-layer/recipes-containers/lxc/lxc_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
1inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)}