summaryrefslogtreecommitdiffstats
path: root/import-layers/meta-virtualization/conf
diff options
context:
space:
mode:
Diffstat (limited to 'import-layers/meta-virtualization/conf')
-rw-r--r--import-layers/meta-virtualization/conf/distro/include/meta-virt-default-versions.inc9
-rw-r--r--import-layers/meta-virtualization/conf/distro/include/virt_security_flags.inc5
-rw-r--r--import-layers/meta-virtualization/conf/layer.conf30
3 files changed, 0 insertions, 44 deletions
diff --git a/import-layers/meta-virtualization/conf/distro/include/meta-virt-default-versions.inc b/import-layers/meta-virtualization/conf/distro/include/meta-virt-default-versions.inc
deleted file mode 100644
index 27e7b90d4..000000000
--- a/import-layers/meta-virtualization/conf/distro/include/meta-virt-default-versions.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-# Meta-virtuailization PREFERED_VERSION
-
-PREFERRED_VERSION_python-blinker = "1.3"
-PREFERRED_VERSION_python-gevent = "1.0.1"
-PREFERRED_VERSION_python-m2crypto = "0.22.3"
-PREFERRED_VERSION_python-pyyaml = "3.11"
-PREFERRED_VERSION_python-redis = "2.10.3"
-PREFERRED_VERSION_python-sqlalchemy = "1.1.5"
-PREFERRED_VERSION_python-werkzeug = "0.10.4"
diff --git a/import-layers/meta-virtualization/conf/distro/include/virt_security_flags.inc b/import-layers/meta-virtualization/conf/distro/include/virt_security_flags.inc
deleted file mode 100644
index f4c288b8e..000000000
--- a/import-layers/meta-virtualization/conf/distro/include/virt_security_flags.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Build errors with the pie options enabled
-SECURITY_CFLAGS_pn-libvirt = "${SECURITY_NO_PIE_CFLAGS}"
-
-# This has text relco errors with the pie options enabled
-SECURITY_CFLAGS_pn-lxc = "${SECURITY_NO_PIE_CFLAGS}"
diff --git a/import-layers/meta-virtualization/conf/layer.conf b/import-layers/meta-virtualization/conf/layer.conf
deleted file mode 100644
index fa2e015e0..000000000
--- a/import-layers/meta-virtualization/conf/layer.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-# We have a conf and classes directory, append to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have a recipes directory, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "virtualization-layer"
-BBFILE_PATTERN_virtualization-layer := "^${LAYERDIR}/"
-BBFILE_PRIORITY_virtualization-layer = "8"
-
-# Custom licenses used by some packages in this layer
-LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
-
-# This should only be incremented on significant changes that will
-# cause compatibility issues with other layers
-LAYERVERSION_virtualization-layer = "1"
-LAYERSERIES_COMPAT_virtualization-layer = "sumo"
-LAYERDEPENDS_virtualization-layer = "core networking-layer"
-
-# Override security flags
-require conf/distro/include/virt_security_flags.inc
-
-PREFERRED_PROVIDER_virtual/runc ?= "runc-docker"
-PREFERRED_PROVIDER_virtual/containerd ?= "containerd-opencontainers"
-
-# Sanity check for meta-virtualization layer.
-# Setting SKIP_META_VIRT_SANITY_CHECK to "1" would skip the bbappend files check.
-INHERIT += "sanity-meta-virt"
-
-require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'meta-virt-default-versions.inc', '', d)}
OpenPOWER on IntegriCloud