From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- .../recipes-connectivity/gateone/gateone_git.bb | 4 +--- .../python-pyconnman/python-pyconnman.inc | 12 ++++++++++++ .../python-pyconnman/python-pyconnman_0.1.0.bb | 13 +++---------- .../python-pyconnman/python3-pyconnman_0.1.0.bb | 5 +++++ .../python-pyro4/python-pyro4_4.63.bb | 18 ------------------ .../python-pyro4/python-pyro4_4.73.bb | 18 ++++++++++++++++++ .../python-thrift/python-thrift_0.11.0.bb | 3 +++ .../python-txws/python-txws_0.9.1.bb | 2 +- 8 files changed, 43 insertions(+), 32 deletions(-) create mode 100644 meta-openembedded/meta-python/recipes-connectivity/python-pyconnman/python-pyconnman.inc create mode 100644 meta-openembedded/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman_0.1.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python-pyro4_4.63.bb create mode 100644 meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python-pyro4_4.73.bb (limited to 'meta-openembedded/meta-python/recipes-connectivity') diff --git a/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone_git.bb b/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone_git.bb index 4577873de..5d2ca00ef 100644 --- a/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone_git.bb +++ b/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone_git.bb @@ -16,9 +16,7 @@ S = "${WORKDIR}/git" inherit setuptools python-dir systemd update-rc.d -DISTUTILS_INSTALL_ARGS = "--root=${D} \ - --prefix=${prefix} \ - --install-lib=${PYTHON_SITEPACKAGES_DIR} \ +DISTUTILS_INSTALL_ARGS += " \ --install-data=${PYTHON_SITEPACKAGES_DIR} \ --install-scripts=${bindir} \ --skip_init_scripts" diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-pyconnman/python-pyconnman.inc b/meta-openembedded/meta-python/recipes-connectivity/python-pyconnman/python-pyconnman.inc new file mode 100644 index 000000000..beb2baf83 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-pyconnman/python-pyconnman.inc @@ -0,0 +1,12 @@ +DESCRIPTION = "Python-based Network Connectivity Management" +HOMEPAGE = "https://pypi.python.org/pypi/pyconnman/" +LICENSE = "Apache-2.0" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI[md5sum] = "b7fa82034b1c0e1fb1b518ffe3bb4fc0" +SRC_URI[sha256sum] = "46c64c0692063fd0c9fb0216d49f7884bec9fa9760d8473db4b1e2f8162fab4a" + +inherit pypi + +RDEPENDS_${PN} = "connman" diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-pyconnman/python-pyconnman_0.1.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-pyconnman/python-pyconnman_0.1.0.bb index 77b5e4dcf..3c12db944 100644 --- a/meta-openembedded/meta-python/recipes-connectivity/python-pyconnman/python-pyconnman_0.1.0.bb +++ b/meta-openembedded/meta-python/recipes-connectivity/python-pyconnman/python-pyconnman_0.1.0.bb @@ -1,12 +1,5 @@ -DESCRIPTION = "Python-based Network Connectivity Management" -HOMEPAGE = "https://pypi.python.org/pypi/pyconnman/" -LICENSE = "Apache-2.0" +require python-pyconnman.inc -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" +inherit setuptools -SRC_URI[md5sum] = "b7fa82034b1c0e1fb1b518ffe3bb4fc0" -SRC_URI[sha256sum] = "46c64c0692063fd0c9fb0216d49f7884bec9fa9760d8473db4b1e2f8162fab4a" - -inherit pypi setuptools - -RDEPENDS_${PN} = "connman python-dbus python-pprint" +RDEPENDS_${PN} += "python-dbus python-pprint" diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman_0.1.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman_0.1.0.bb new file mode 100644 index 000000000..e0f3fdd75 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman_0.1.0.bb @@ -0,0 +1,5 @@ +require python-pyconnman.inc + +inherit setuptools3 + +RDEPENDS_${PN} += "python3-dbus python3-pprint" diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python-pyro4_4.63.bb b/meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python-pyro4_4.63.bb deleted file mode 100644 index 6f683e3e7..000000000 --- a/meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python-pyro4_4.63.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Python Remote Objects" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=378acef375e17a3bff03bd0f78c53220" - -SRC_URI[md5sum] = "e1d772b67bf7c6f75fa3174bc95c8839" -SRC_URI[sha256sum] = "67d2b34156619ba37e92100af95aade8129dd2b7327eb05821d43887451f7d7b" - -PYPI_PACKAGE = "Pyro4" - -inherit pypi setuptools - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-selectors34 \ - ${PYTHON_PN}-serpent \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-zlib \ - " diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python-pyro4_4.73.bb b/meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python-pyro4_4.73.bb new file mode 100644 index 000000000..88f5b1855 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python-pyro4_4.73.bb @@ -0,0 +1,18 @@ +SUMMARY = "Python Remote Objects" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=cd13dafd4eeb0802bb6efea6b4a4bdbc" + +SRC_URI[md5sum] = "0375c061b93411feb86da01e801df888" +SRC_URI[sha256sum] = "536b07a097d0619e7ab1effa3747fda177a24168d17a07a93ca9ac30977608f7" + +PYPI_PACKAGE = "Pyro4" + +inherit pypi setuptools + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-selectors34 \ + ${PYTHON_PN}-serpent \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-zlib \ + " diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python-thrift_0.11.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python-thrift_0.11.0.bb index 8047ec77b..10cff425e 100644 --- a/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python-thrift_0.11.0.bb +++ b/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python-thrift_0.11.0.bb @@ -7,6 +7,9 @@ SRC_URI[sha256sum] = "7d59ac4fdcb2c58037ebd4a9da5f9a49e3e034bf75b3f26d9fe48ba3d8 inherit pypi setuptools +# Use different filename to prevent conflicts with thrift itself +PYPI_SRC_URI_append = ";downloadfilename=${BP}.${PYPI_PACKAGE_EXT}" + RDEPENDS_${PN} += "\ ${PYTHON_PN}-logging \ ${PYTHON_PN}-six \ diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-txws/python-txws_0.9.1.bb b/meta-openembedded/meta-python/recipes-connectivity/python-txws/python-txws_0.9.1.bb index 0b2ac118a..f3631cda3 100644 --- a/meta-openembedded/meta-python/recipes-connectivity/python-txws/python-txws_0.9.1.bb +++ b/meta-openembedded/meta-python/recipes-connectivity/python-txws/python-txws_0.9.1.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/MostAwesomeDude/txWS" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=76699830db7fa9e897f6a1ad05f98ec8" -DEPENDS = "python-twisted python-six python-vcversioner" +DEPENDS = "python-twisted python-six python-vcversioner python-six-native python-vcversioner-native" SRC_URI = "git://github.com/MostAwesomeDude/txWS.git" SRCREV= "88cf6d9b9b685ffa1720644bd53c742afb10a414" -- cgit v1.2.3