From 032ef5310419563a01baad0b1b94e4587d12f777 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Fri, 20 Apr 2018 07:34:56 -0700 Subject: refactor for YP Compat for PV changes Only include our versions of recipes if virtualiztions is in DISTRO_FEATURE Signed-off-by: Armin Kuster Signed-off-by: Bruce Ashfield --- conf/distro/include/meta-virt-default-versions.inc | 9 +++++++++ conf/layer.conf | 2 ++ recipes-devtools/python/python-blinker_1.3.bb | 2 ++ recipes-devtools/python/python-gevent_1.0.1.bb | 4 +++- recipes-devtools/python/python-m2crypto_0.22.3.bb | 2 ++ recipes-devtools/python/python-pyyaml_3.11.bb | 2 ++ recipes-devtools/python/python-redis_2.10.3.bb | 2 ++ recipes-devtools/python/python-sqlalchemy_1.1.5.bb | 2 ++ recipes-devtools/python/python-werkzeug_0.10.4.bb | 2 ++ 9 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 conf/distro/include/meta-virt-default-versions.inc diff --git a/conf/distro/include/meta-virt-default-versions.inc b/conf/distro/include/meta-virt-default-versions.inc new file mode 100644 index 00000000..27e7b90d --- /dev/null +++ b/conf/distro/include/meta-virt-default-versions.inc @@ -0,0 +1,9 @@ +# 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/conf/layer.conf b/conf/layer.conf index 4233d39e..fa2e015e 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -26,3 +26,5 @@ 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)} diff --git a/recipes-devtools/python/python-blinker_1.3.bb b/recipes-devtools/python/python-blinker_1.3.bb index 24e19b50..8abb9c07 100644 --- a/recipes-devtools/python/python-blinker_1.3.bb +++ b/recipes-devtools/python/python-blinker_1.3.bb @@ -18,5 +18,7 @@ SRC_URI[sha256sum] = "6811010809262261e41ab7b92f3f6d23f35cf816fbec2bc05077992eeb S = "${WORKDIR}/${SRCNAME}-${PV}" +DEFAULT_PREFERENCE = "-1" + inherit setuptools diff --git a/recipes-devtools/python/python-gevent_1.0.1.bb b/recipes-devtools/python/python-gevent_1.0.1.bb index 7f1d2622..8cd1388a 100644 --- a/recipes-devtools/python/python-gevent_1.0.1.bb +++ b/recipes-devtools/python/python-gevent_1.0.1.bb @@ -25,4 +25,6 @@ SRC_URI += "file://gevent-allow-ssl-v2-or-v3-certificates.patch" # so always force a cross compile do_configure_append() { sed -i -e 's/^cross_compiling=no/cross_compiling=yes/' ${S}/libev/configure -} \ No newline at end of file +} + +DEFAULT_PREFERENCE = "-1" diff --git a/recipes-devtools/python/python-m2crypto_0.22.3.bb b/recipes-devtools/python/python-m2crypto_0.22.3.bb index 2c2625d3..e151dcc4 100644 --- a/recipes-devtools/python/python-m2crypto_0.22.3.bb +++ b/recipes-devtools/python/python-m2crypto_0.22.3.bb @@ -22,6 +22,8 @@ SRC_URI += " \ SRC_URI[md5sum] = "573f21aaac7d5c9549798e72ffcefedd" SRC_URI[sha256sum] = "6071bfc817d94723e9b458a010d565365104f84aa73f7fe11919871f7562ff72" +DEFAULT_PREFERENCE = "-1" + inherit setuptools pypi DEPENDS += "openssl swig-native" diff --git a/recipes-devtools/python/python-pyyaml_3.11.bb b/recipes-devtools/python/python-pyyaml_3.11.bb index cb1db8c6..ecb1719a 100644 --- a/recipes-devtools/python/python-pyyaml_3.11.bb +++ b/recipes-devtools/python/python-pyyaml_3.11.bb @@ -25,6 +25,8 @@ SRC_URI[sha256sum] = "c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b S = "${WORKDIR}/${SRCNAME}-${PV}" +DEFAULT_PREFERENCE = "-1" + inherit setuptools DEPENDS += "libyaml python-cython-native" diff --git a/recipes-devtools/python/python-redis_2.10.3.bb b/recipes-devtools/python/python-redis_2.10.3.bb index 9eda8a5c..2ef2b6b7 100644 --- a/recipes-devtools/python/python-redis_2.10.3.bb +++ b/recipes-devtools/python/python-redis_2.10.3.bb @@ -15,6 +15,8 @@ SRC_URI[sha256sum] = "a4fb37b02860f6b1617f6469487471fd086dd2d38bbce640c2055862b9 S = "${WORKDIR}/${SRCNAME}-${PV}" +DEFAULT_PREFERENCE = "-1" + inherit setuptools RDEPENDS_${PN} = "redis" diff --git a/recipes-devtools/python/python-sqlalchemy_1.1.5.bb b/recipes-devtools/python/python-sqlalchemy_1.1.5.bb index 63caeb48..f22d2728 100644 --- a/recipes-devtools/python/python-sqlalchemy_1.1.5.bb +++ b/recipes-devtools/python/python-sqlalchemy_1.1.5.bb @@ -13,4 +13,6 @@ SRC_URI[sha256sum] = "68fb40049690e567ebda7b270176f5abf0d53d9fbd515fec4e43326f60 S = "${WORKDIR}/${SRCNAME}-${PV}" +DEFAULT_PREFERENCE = "-1" + inherit setuptools diff --git a/recipes-devtools/python/python-werkzeug_0.10.4.bb b/recipes-devtools/python/python-werkzeug_0.10.4.bb index 763e5b98..5f3e01fd 100644 --- a/recipes-devtools/python/python-werkzeug_0.10.4.bb +++ b/recipes-devtools/python/python-werkzeug_0.10.4.bb @@ -14,6 +14,8 @@ SRC_URI[sha256sum] = "9d2771e4c89be127bc4bac056ab7ceaf0e0064c723d6b6e195739c3af4 S = "${WORKDIR}/${SRCNAME}-${PV}" +DEFAULT_PREFERENCE = "-1" + inherit setuptools RDEPENDS_${PN} += "python-io \ -- cgit v1.2.3-54-g00ecf