diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-06-27 08:16:32 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-06-27 08:21:12 +0300 |
commit | c87764fefff10735006a31fab72d76c243a3eb40 (patch) | |
tree | a1536c529ff12a4cd591ef528e4857d4f2fe9572 /meta-openembedded/meta-oe/recipes-devtools | |
parent | 064f75b35a14f3bd6e99ce65a7f7609b973036d5 (diff) | |
download | openbmc-c87764fefff10735006a31fab72d76c243a3eb40.tar.xz |
meta-openembedded: subtree update:fe77eaab8f..629696b64b
Alex Kiernan (4):
zstd: Upgrade 1.4.4 -> 1.4.5
libxmlb: Add recipe
libjcat: Add recipe
gcab: Add recipe
Andreas Müller (14):
libdvdcss: upgrade 1.3.0 -> 1.4.2
vlc: upgrade 3.0.10 -> 3.0.11
netdata: upgrade 1.17.0 -> 1.22.1
libsass: upgrade 3.6.3 -> 3.6.4 / rename recipe
gnome-desktop3: upgrade 3.36.2 -> 3.36.3.1
evince: upgrade 3.36.3 -> 3.36.5
gnome-control-center: upgrade 3.36.2 -> 3.36.3
redis: upgrade 5.0.9 -> 6.0.4
squid: upgrade 4.9 -> 4.12
libgit2: upgrade 1.0.0 -> 1.0.1
openh264: upgrade 2.1.0 -> 2.1.1
tcpreplay: upgrade 4.3.2 -> 4.3.3
asio: upgrade 1.12.2 -> 1.16.1
Revert "packagegroup-xfce-base: add RDEPEND packagegroup-core-x11"
Anuj Mittal (2):
opencl: move headers and loader recipe to common directory
opencl-clhpp: add recipe
Armin Kuster (9):
python3-configobj: Add package
python3-croniter: add package
python3-flask-versioned: Add package
python3-huey: Add package
python3-sqlsoup: add package
python3-smpplib: add package
python3-pyrad: add package
libuv: pkg now in core, remove
ntp: update 4.2.8p15
Christian Eggers (1):
linuxptp: Fix segmentation fault on 32 bit platforms with 64 bit time_t
Konrad Weihmann (1):
libtalloc: fix upstream url
Leon Anavi (82):
python3-packaging: Consolidate in a single file
python3-packaging: Upgrade 20.3 -> 20.4
python3-parse-type: Consolidate in a single file
python3-parse-type: Upgrade 0.4.2 -> 0.5.2
python3-javaobj-py3: Consolidate in a single file
python3-jsonpointer: Consolidate in a single file
python3-kconfiglib: Consolidate in a single file
python3-twisted: Consolidate in a single file
python3-twisted: Upgrade 19.10.0 -> 20.3.0
protobuf: Upgrade 3.11.4 -> 3.12.3
xscreensaver: Upgrade 5.39 -> 5.44
python3-iso8601: Consolidate in a single file
python3-isodate: Consolidate in a single file
python3-incremental: Consolidate in a single file
python3-itsdangerous: Consolidate in a single file
python3-importlib-metadata: Consolidate in a single file
python3-importlib-metadata: Upgrade 1.5.2 -> 1.6.1
python3-can: Upgrade 3.3.2 -> 3.3.3
python3-psutil: Consolidate in a single file
python3-protobuf: Consolidate in a single file
python3-protobuf: Upgrade 3.11.3 -> 3.12.2
python-kconfiglib.inc: Remove
sip3: Consolidate in a single file
sip3: Upgrade 4.19.19 -> 4.19.23
python3-pexpect: Consolidate in a single file
python3-periphery: Consolidate in a single file
python3-periphery: Upgrade 2.0.1 -> 2.1.0
python3-pocketsphinx: Inherit features_check
python3-parse: Consolidate in a single file
python3-passlib: Consolidate in a single file
python3-pathlib2: Consolidate in a single file
python3-pretend: Consolidate in a single file
python3-prompt-toolkit: Consolidate in a single file
python3-prompt-toolkit: Upgrade 2.0.10 -> 3.0.5
python3-ptyprocess: Consolidate in a single file
python3-booleanpy: Upgrade 3.7 to 3.8
python3-toml: Upgrade 0.10.0 -> 0.10.1
python3-msgpack: Upgrade 0.6.2 -> 1.0.0
lirc: Add python3 to the run-time dependencies
python3-sqlalchemy: Upgrade 1.3.12 -> 1.3.17
python3-sh: Upgrade 1.12.14 -> 1.13.1
python3-certifi: Upgrade 2019.11.28 -> 2020.6.20
python3-setuptools-scm: Upgrade 3.5.0 -> 4.1.2
python3-more-itertools: Upgrade 8.3.0 -> 8.4.0
python3-configparser: Upgrade 4.0.2 -> 5.0.0
python3-pytest-timeout: Upgrade 1.3.4 -> 1.4.1
python3-semver: Upgrade 2.8.1 -> 2.10.2
python3-spidev: Upgrade 3.4 -> 3.5
python3-pint: Upgrade 0.12 -> 0.13
python3-xxhash: Upgrade 1.4.3 -> 1.4.4
python3-networkx: Consolidate in a single file
python3-netifaces: Consolidate in a single file
python3-netaddr: Consolidate in a single file
python3-netaddr: Upgrade 0.7.19 -> 0.7.20
python3-ndg-httpsclient: Consolidate in a single file
python3-lazy-object-proxy: Consolidate in a single file
python3-lazy-object-proxy: Upgrade 1.4.3 -> 1.5.0
python3-license-expression: Consolidate in a single file
python3-license-expression: Upgrade 1.0 -> 1.2
python3-wcwidth: Upgrade 0.2.4 -> 0.2.5
python3-ordered-set: Upgrade 3.1.1 -> 4.0.2
python3-cheetah: Upgrade 3.2.4 -> 3.2.5
python3-cmd2: Upgrade 0.9.23 -> 1.1.0
python3-pyrsistent: Upgrade 0.15.7 -> 0.16.0
python3-requests-file: Upgrade 1.4.3 -> 1.5.1
python3-msk: Upgrade 0.3.13 -> 0.3.15
python3-pyperf: Upgrade 1.7.1 -> 2.0.0
python3-padatious: Upgrade 0.4.7 -> 0.4.8
python3-croniter: Upgrade 0.3.33 -> 0.3.34
python3-lrparsing: Consolidate in a single file
python3-pytun: Consolidate in a single file
python3-jsonpatch: Upgrade 1.25 -> 1.26
python3-socketio: Upgrade 4.5.1 -> 4.6.0
python3-twine: Upgrade 3.1.1 -> 3.2.0
python3-pyexpect: Upgrade 1.0.19 -> 1.0.20
python3-pyjks: Upgrade 19.0.0 -> 20.0.0
python3-ruamel-yaml: Upgrade 0.16.5 0> 0.16.10
python3-pandas: Upgrade 1.0.3 -> 1.0.5
python3-matplotlib: Upgrade 3.2.1 -> 3.2.2
python3-coverage: Upgrade 5.0.2 -> 5.1
python3-coloredlogs: Upgrade 10.0 -> 14.0
python3-astroid: Upgrade 2.3.3 -> 2.4.2
Liwei Song (1):
pm-graph: add flags support for RT kernel
Madhavan Krishnan (1):
libcamera: Bumped to latest source revision
Martin Jansa (1):
ace: fix installation paths when usrmerge is used
Mingli Yu (1):
opencv: make ts module external
Ovidiu Panait (1):
freediameter: upgrade 1.3.2 -> 1.4.0
Paul Eggleton (1):
protobuf-c: disable parallelism to avoid race condition
Peace Lee (1):
Update commit for version 3.9.7
Pierre-Jean Texier (3):
rsnapshot: upgrade 1.4.2 -> 1.4.3
libzip: upgrade 1.7.0 -> 1.7.1
fuse3: upgrade 3.9.1 -> 3.9.2
Ryan Rowe (3):
python3-typeguard: Upgrade 2.7.1 -> 2.9.1
add python3-dynamic-dispatch
add python3-argexec
Sakib Sajal (1):
python3-requests-toolbelt: add recipe for v0.9.1
Trevor Gamblin (1):
python3-django: upgrade 2.2.7 -> 2.2.13
Wang Mingyu (4):
openipmi: upgrade 2.0.28 -> 2.0.29
twm: upgrade 1.0.10 -> 1.0.11
python3-wtforms: upgrade 2.2.1 -> 2.3.1
python3-py: upgrade 1.8.1 -> 1.8.2
Zang Ruochen (6):
python3-geojson: Enable ptest
python3-intervals: Enable ptest
python3-ipy: Enable ptest
python3-iso3166: Enable ptest
python-html2text: Enable ptest
python3-gunicorn: Enable ptest
Zheng Ruoqin (3):
python3-cachetools: Enable ptest
python3-dnspython: Enable ptest
python3-dominate: Enable ptest
lumag (1):
lmsensors: do not depend on lmsensors-isatools on non-x86
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I66b8b206b1f74dab49ef7c266e145127ba27869b
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.7.bb | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb | 5 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch | 12 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.12.3.bb (renamed from meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.11.4.bb) | 4 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.19.bb | 11 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb (renamed from meta-openembedded/meta-oe/recipes-devtools/sip/sip.inc) | 17 |
6 files changed, 30 insertions, 21 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.7.bb b/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.7.bb index 2b799fd5e..88fad936b 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.7.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.7.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2" PV = "3.9.7+git${SRCPV}" SRC_URI = "git://github.com/iipeace/${BPN}" -SRCREV = "c87269d6d4669d12c99a2a7b9b07c39a5dd24ac6" +SRCREV = "459b5189a46023fc98e19888b196bdc2674022fd" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb index bb8aecded..6fef0bed2 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb @@ -22,6 +22,11 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig +# After several fix attempts there is still a race between generating +# t.test-full.pb.h and compiling cxx_generate_packed_data.c despite +# BUILT_SOURCES and explicit dependencies. +PARALLEL_MAKE = "" + PACKAGE_BEFORE_PN = "${PN}-compiler" FILES_${PN}-compiler = "${bindir}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch index 0a2e5e2df..934c98193 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch @@ -1,4 +1,4 @@ -From a28e15092a298e0c73c6fc1ded0913275cf27cb0 Mon Sep 17 00:00:00 2001 +From e5340f816aa273cfda36998466739ca0748caafb Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Fri, 28 Jun 2019 13:50:52 +0000 Subject: [PATCH] examples/Makefile: respect CXX,LDFLAGS variables, fix build @@ -23,12 +23,13 @@ Subject: [PATCH] examples/Makefile: respect CXX,LDFLAGS variables, fix build Upstream-Status: Pending Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> --- examples/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/Makefile b/examples/Makefile -index 4ad605641..31d887639 100644 +index e9f9635ae..b2fbe2de1 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -2,6 +2,8 @@ @@ -44,13 +45,16 @@ index 4ad605641..31d887639 100644 add_person_cpp: add_person.cc protoc_middleman pkg-config --cflags protobuf # fails if protobuf is not installed -- c++ add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf` +- c++ -std=c++11 add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf` + $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) add_person.cc addressbook.pb.cc -o add_person_cpp list_people_cpp: list_people.cc protoc_middleman pkg-config --cflags protobuf # fails if protobuf is not installed -- c++ list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf` +- c++ -std=c++11 list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf` + $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) list_people.cc addressbook.pb.cc -o list_people_cpp add_person_dart: add_person.dart protoc_middleman_dart +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.11.4.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.12.3.bb index 4d6c5b255..21ad7a460 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.11.4.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.12.3.bb @@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" DEPENDS = "zlib" DEPENDS_append_class-target = " protobuf-native" -SRCREV = "d0bfd5221182da1a7cc280f3337b5e41a89539cf" +SRCREV = "31ebe2ac71400344a5db91ffc13c4ddfb7589f92" -SRC_URI = "git://github.com/google/protobuf.git;branch=3.11.x \ +SRC_URI = "git://github.com/protocolbuffers/protobuf.git \ file://run-ptest \ file://0001-protobuf-fix-configure-error.patch \ file://0001-Makefile.am-include-descriptor.cc-when-building-libp.patch \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.19.bb b/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.19.bb deleted file mode 100644 index 010fa30fe..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.19.bb +++ /dev/null @@ -1,11 +0,0 @@ -require sip.inc - -DEPENDS = "python3" - -inherit python3-dir python3native - -PACKAGES += "python3-sip3" - -FILES_python3-sip3 = "${libdir}/${PYTHON_DIR}/site-packages/" -FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug" - diff --git a/meta-openembedded/meta-oe/recipes-devtools/sip/sip.inc b/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb index d8e32a768..320755b84 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/sip/sip.inc +++ b/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb @@ -1,16 +1,22 @@ SUMMARY = "SIP is a C++/Python Wrapper Generator" -HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip" +HOMEPAGE = "https://riverbankcomputing.com/software/sip/" SECTION = "devel" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303" SRC_URI = "https://www.riverbankcomputing.com/static/Downloads/sip/${PV}/sip-${PV}.tar.gz \ " -SRC_URI[md5sum] = "98111479309dc472410f26080d6d4a88" -SRC_URI[sha256sum] = "5436b61a78f48c7e8078e93a6b59453ad33780f80c644e5f3af39f94be1ede44" +SRC_URI[md5sum] = "70adc0c9734e2d9dcd241d3f931dfc74" +SRC_URI[sha256sum] = "22ca9bcec5388114e40d4aafd7ccd0c4fe072297b628d0c5cdfa2f010c0bc7e7" + +inherit python3-dir python3native S = "${WORKDIR}/sip-${PV}" +DEPENDS = "python3" + +PACKAGES += "python3-sip3" + BBCLASSEXTEND = "native" do_configure_prepend_class-target() { @@ -22,6 +28,7 @@ do_configure_prepend_class-target() { echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg ${PYTHON} configure.py --configuration sip.cfg --sip-module PyQt5.sip --sysroot ${STAGING_DIR_HOST} CC="${CC}" CXX="${CXX}" LINK="${CXX}" STRIP="" LINK_SHLIB="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LFLAGS="${LDFLAGS}" } + do_configure_prepend_class-native() { echo "py_platform = linux" > sip.cfg echo "py_inc_dir = ${includedir}/python%(py_major).%(py_minor)${PYTHON_ABI}" >> sip.cfg @@ -31,6 +38,10 @@ do_configure_prepend_class-native() { echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg ${PYTHON} configure.py --configuration sip.cfg --sip-module PyQt5.sip --sysroot=${STAGING_DIR_NATIVE} } + do_install() { oe_runmake install } + +FILES_python3-sip3 = "${libdir}/${PYTHON_DIR}/site-packages/" +FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug" |