From 3de4de2c995dcc430ebc9572ab5e6b13ec70f346 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Thu, 10 Sep 2020 23:46:29 +0800 Subject: [PATCH] python-cherrypy: add recipe for version 3.2.2 python-cherrypy 3.2.2 is required by ceph-mgr, so the fix includes: - Add new recipe for python-cherrypy 3.2.2 - Set 3.2.2 as the preferred version - Add python-cherrypy into packagegroup-stx Issue-ID: INF-189 Signed-off-by: Jackie Huang Change-Id: I9de245e35ad5bd7b6b929f82c2796dddebc8d66b --- .../conf/distro/include/stx-preferred-vers.inc | 2 +- .../recipes-core/packagegroups/packagegroup-stx.bb | 1 + .../python/python-cherrypy_3.2.2.bb | 43 ++++++++++++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 meta-stx/recipes-devtools/python/python-cherrypy_3.2.2.bb diff --git a/meta-stx/conf/distro/include/stx-preferred-vers.inc b/meta-stx/conf/distro/include/stx-preferred-vers.inc index 4aa1eb3..d59dc9b 100644 --- a/meta-stx/conf/distro/include/stx-preferred-vers.inc +++ b/meta-stx/conf/distro/include/stx-preferred-vers.inc @@ -22,7 +22,7 @@ PREFERRED_VERSION_python-voluptuous = "0.8.9" PREFERRED_VERSION_python3-cherrypy = "18.2.0" PREFERRED_VERSION_python-cheroot = "7.0.0" PREFERRED_VERSION_python3-cheroot = "7.0.0" -PREFERRED_VERSION_python-cherrypy = "git" +PREFERRED_VERSION_python-cherrypy = "3.2.2" PREFERRED_VERSION_pythonkeystoneauth1 = "3.17.1" PREFERRED_VERSION_drbd-utils = "8.4.3rc1" PREFERRED_VERSION_python-pyyaml = "3.13" diff --git a/meta-stx/recipes-core/packagegroups/packagegroup-stx.bb b/meta-stx/recipes-core/packagegroups/packagegroup-stx.bb index 49cf0bb..e1d1df6 100644 --- a/meta-stx/recipes-core/packagegroups/packagegroup-stx.bb +++ b/meta-stx/recipes-core/packagegroups/packagegroup-stx.bb @@ -216,6 +216,7 @@ RDEPENDS_packagegroup-stx-integ = " \ kubernetes \ ldapscripts \ python-3parclient \ + python-cherrypy \ python-lefthandclient \ python-setuptools \ python-ryu \ diff --git a/meta-stx/recipes-devtools/python/python-cherrypy_3.2.2.bb b/meta-stx/recipes-devtools/python/python-cherrypy_3.2.2.bb new file mode 100644 index 0000000..ca70c30 --- /dev/null +++ b/meta-stx/recipes-devtools/python/python-cherrypy_3.2.2.bb @@ -0,0 +1,43 @@ +# +# Copyright (C) 2019 Wind River Systems, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +SUMMARY = " CherryPy is a pythonic, object-oriented HTTP framework" +DESCRIPTION = "\ +It allows building web applications in much the same way one would build any \ +other object-oriented program. This design results in less and more readable \ +code being developed faster. It's all just properties and methods. \ +It is now more than ten years old and has proven fast and very stable. \ +It is being used in production by many sites, from the simplest to the most \ +demanding. \ +" + +HOMEPAGE = "https://www.cherrypy.org/" +AUTHOR = "CherryPy Team" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://cherrypy/LICENSE.txt;md5=c187ff3653a0878075713adef2c545c3" + +SRC_URI = "https://pypi.python.org/packages/source/C/CherryPy/CherryPy-${PV}.tar.gz" +SRC_URI[md5sum] = "c1b1e9577f65f9bb88bfd1b15b93b911" +SRC_URI[sha256sum] = "dc5a88562795c2ee462dac5b37aba1cf4f34f3e27281ec11049227039308b691" + +S = "${WORKDIR}/CherryPy-${PV}" + +inherit setuptools + +FILES_${PN} += "\ + ${datadir}/cherrypy \ +" -- 2.16.6