rpm: upgrade to 4.15.1
PATCH 1/15 rpm: upgrade to 4.15.1
Drop patches that were merged upstream.
0001-mono-find-provides-requires-do-not-use-monodis-from-.patch modifies a file that was removed upstream.
Add a 0001-rpmfc.c-do-not-run-file-classification-in-parallel.patch as unfortunately the new parallel file classification feature from upstream trips over somewhere in libmagic when inspected files are compressed:
https://github.com/rpm-software-management/rpm/issues/756
---
...satisfiable-dependency-when-building.patch | 28 +-
...lib-rpm-as-the-installation-path-for.patch | 14 +-
...kage-building-into-a-separate-functi.patch | 84 -----
...es-requires-do-not-use-monodis-from-.patch | 58 ---
...-run-file-classification-in-parallel.patch | 65 ++++
...ry-package-creation-via-thread-pools.patch | 127 -------
...e-operations-over-string-pools-threa.patch | 207 -----------
...ove-static-local-variables-from-buil.patch | 336 ------------------
.../rpm/{rpm_4.14.2.1.bb => rpm_4.15.1.bb} | 16 +-
9 files changed, 90 insertions(+), 845 deletions(-)
delete mode 100644 meta/recipes-devtools/rpm/files/0001-Split-binary-package-building-into-a-separate-functi.patch
delete mode 100644 meta/recipes-devtools/rpm/files/0001-mono-find-provides-requires-do-not-use-monodis-from-.patch
create mode 100644 meta/recipes-devtools/rpm/files/0001-rpmfc.c-do-not-run-file-classification-in-parallel.patch
delete mode 100644 meta/recipes-devtools/rpm/files/0002-Run-binary-package-creation-via-thread-pools.patch
delete mode 100644 meta/recipes-devtools/rpm/files/0003-rpmstrpool.c-make-operations-over-string-pools-threa.patch
delete mode 100644 meta/recipes-devtools/rpm/files/0004-build-pack.c-remove-static-local-variables-from-buil.patch
rename meta/recipes-devtools/rpm/{rpm_4.14.2.1.bb => rpm_4.15.1.bb} (89%)meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch +13 -15
@@ -1,4 +1,4 @@ -From 87cfc0db1ed6fe381a5ed5f0016d8c3344a31a11 Mon Sep 17 00:00:00 2001 +From f39c28eb52f12ae6e82db360ffd5a903ac8faca5 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Mon, 9 Jan 2017 18:52:11 +0200 Subject: [PATCH] Do not add an unsatisfiable dependency when building rpms in
@@ -9,25 +9,23 @@ hand produces rpms that way by design. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <[email protected]> + --- build/pack.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build/pack.c b/build/pack.c -index 1261cdbba..bb2d6f4f6 100644 +index e6cec1816..810cd7351 100644 --- a/build/pack.c +++ b/build/pack.c -@@ -595,10 +595,6 @@ rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating) - headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16); - } +@@ -724,10 +724,6 @@ static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int ch + headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16); + } + +- if (cheating) { +- (void) rpmlibNeedsFeature(pkg, "ShortCircuited", "4.9.0-1"); +- } +- + if ((rc = getPkgFilename(pkg->header, filename))) + return rc; -- if (cheating) { -- (void) rpmlibNeedsFeature(pkg, "ShortCircuited", "4.9.0-1"); -- } -- - { char *binFormat = rpmGetPath("%{_rpmfilename}", NULL); - char *binRpm, *binDir; - binRpm = headerFormat(pkg->header, binFormat, &errorString); --- -2.11.0 -
meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch +7 -7
@@ -1,4 +1,4 @@ -From bd08eb0ae1312f347f49949481daa7c923752df2 Mon Sep 17 00:00:00 2001 +From 2f3d1619b6510bc131c4375827caf912559f0fa2 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Mon, 27 Feb 2017 09:43:30 +0200 Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index 09af7c4..9bd6903 100644 +index d3aeab86e..1a1f3f91f 100644 --- a/configure.ac +++ b/configure.ac -@@ -1055,7 +1055,7 @@ else +@@ -1086,7 +1086,7 @@ else usrprefix=$prefix fi
@@ -27,10 +27,10 @@ index 09af7c4..9bd6903 100644 AC_SUBST(OBJDUMP) diff --git a/macros.in b/macros.in -index a3aa7a9..62cee5c 100644 +index fe9803aad..d128675bf 100644 --- a/macros.in +++ b/macros.in -@@ -970,7 +970,7 @@ package or when debugging this package.\ +@@ -985,7 +985,7 @@ package or when debugging this package.\ %_sharedstatedir %{_prefix}/com %_localstatedir %{_prefix}/var %_lib lib
@@ -40,7 +40,7 @@ index a3aa7a9..62cee5c 100644 %_infodir %{_datadir}/info %_mandir %{_datadir}/man diff --git a/rpm.am b/rpm.am -index 82c2d7c..6341b51 100644 +index 40b4ec55f..3139ce8f6 100644 --- a/rpm.am +++ b/rpm.am @@ -1,10 +1,10 @@
@@ -55,4 +55,4 @@ index 82c2d7c..6341b51 100644 +rpmconfigdir = $(libdir)/rpm # Libtool version (current-revision-age) for all our libraries - rpm_version_info = 9:0:1 + rpm_version_info = 9:1:0
meta/recipes-devtools/rpm/files/0001-Split-binary-package-building-into-a-separate-functi.patch deleted +0 -84
84 lines not on this page · raw message
meta/recipes-devtools/rpm/files/0001-mono-find-provides-requires-do-not-use-monodis-from-.patch deleted +0 -58
58 lines not on this page · raw message
meta/recipes-devtools/rpm/files/0001-rpmfc.c-do-not-run-file-classification-in-parallel.patch new file +65 -0
65 lines not on this page · raw message
meta/recipes-devtools/rpm/files/0002-Run-binary-package-creation-via-thread-pools.patch deleted +0 -127
127 lines not on this page · raw message
meta/recipes-devtools/rpm/files/0003-rpmstrpool.c-make-operations-over-string-pools-threa.patch deleted +0 -207
207 lines not on this page · raw message
meta/recipes-devtools/rpm/files/0004-build-pack.c-remove-static-local-variables-from-buil.patch deleted +0 -336
336 lines not on this page · raw message
meta/recipes-devtools/rpm/rpm_4.15.1.bb renamed from meta/recipes-devtools/rpm/rpm_4.14.2.1.bb +5 -11
@@ -24,7 +24,7 @@ HOMEPAGE = "http://www.rpm.org" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=c0bf017c0fd1920e6158a333acabfd4a" -SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.14.x \ +SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.15.x \ file://0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch \ file://0001-Do-not-read-config-files-from-HOME.patch \ file://0001-When-cross-installing-execute-package-scriptlets-wit.patch \
@@ -34,20 +34,15 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.14.x \ file://0001-Fix-build-with-musl-C-library.patch \ file://0001-Add-a-color-setting-for-mips64_n32-binaries.patch \ file://0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch \ - file://0001-Split-binary-package-building-into-a-separate-functi.patch \ - file://0002-Run-binary-package-creation-via-thread-pools.patch \ - file://0003-rpmstrpool.c-make-operations-over-string-pools-threa.patch \ - file://0004-build-pack.c-remove-static-local-variables-from-buil.patch \ file://0001-perl-disable-auto-reqs.patch \ file://0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch \ file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \ - file://0001-mono-find-provides-requires-do-not-use-monodis-from-.patch \ - file://0001-Rip-out-partial-support-for-unused-MD2-and-RIPEMD160.patch \ file://0001-rpmplugins.c-call-dlerror-prior-to-dlsym.patch \ + file://0001-rpmfc.c-do-not-run-file-classification-in-parallel.patch \ " PE = "1" -SRCREV = "4a9440006398646583f0d9ae1837dad2875013aa" +SRCREV = "ab2179452c5be276a6b96c591afded485c7e58c3" S = "${WORKDIR}/git"
@@ -61,7 +56,7 @@ export PYTHON_ABI EXTRA_AUTORECONF_append = " --exclude=gnu-configize" EXTRA_OECONF_append = " --without-lua --enable-python --with-crypto=openssl" -EXTRA_OECONF_append_libc-musl = " --disable-nls" +EXTRA_OECONF_append_libc-musl = " --disable-nls --disable-openmp" # --sysconfdir prevents rpm from attempting to access machine-specific configuration in sysroot/etc; we need to have it in rootfs #
@@ -127,8 +122,7 @@ do_install_append () { ${D}/${libdir}/rpm/macros sed -i -e 's|/usr/bin/python|${USRBINPATH}/env ${PYTHON_PN}|' \ - ${D}${libdir}/rpm/pythondistdeps.py \ - ${D}${libdir}/rpm/python-macro-helper + ${D}${libdir}/rpm/pythondistdeps.py } FILES_${PN} += "${libdir}/rpm-plugins/*.so \
Signature · 1 line
2.26.1
PATCH 2/15 libmodulemd: move from 1.x to 2.x version
New libdnf requires 2.x and is the only consumer in oe-core (or elsewhere).
---
meta/conf/distro/include/maintainers.inc | 2 +-
...ec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch | 22 ---------------
...e-the-manpage-only-if-the-feature-is.patch | 28 +++++++++++++++++++
...ld-do-not-install-python-gi-bindings.patch | 23 +++++++++++++++
...bmodulemd-v1_git.bb => libmodulemd_git.bb} | 12 ++++----
5 files changed, 58 insertions(+), 29 deletions(-)
delete mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch
create mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd/0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch
create mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd/0002-meson.build-do-not-install-python-gi-bindings.patch
rename meta/recipes-devtools/libmodulemd/{libmodulemd-v1_git.bb => libmodulemd_git.bb} (57%)meta/conf/distro/include/maintainers.inc +1 -1
@@ -349,7 +349,7 @@ RECIPE_MAINTAINER_pn-libmatchbox = "Ross Burton <[email protected]>" RECIPE_MAINTAINER_pn-libmnl = "Khem Raj <[email protected]>" RECIPE_MAINTAINER_pn-libmpc = "Khem Raj <[email protected]>" RECIPE_MAINTAINER_pn-libmodule-build-perl = "Tim Orling <[email protected]>" -RECIPE_MAINTAINER_pn-libmodulemd-v1 = "Alexander Kanavin <[email protected]>" +RECIPE_MAINTAINER_pn-libmodulemd = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-libnewt = "Hongxu Jia <[email protected]>" RECIPE_MAINTAINER_pn-libnl = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-libnotify = "Anuj Mittal <[email protected]>"
meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch deleted +0 -22
@@ -1,22 +0,0 @@ -From 4e67f6049b3f822fe6f5af46790a51ace581bf82 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Tue, 6 Nov 2018 13:41:29 +0100 -Subject: [PATCH] spec_tmpl.sh: use /bin/sh, not /usr/bin/sh - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <[email protected]> - ---- - spec_tmpl.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/spec_tmpl.sh b/spec_tmpl.sh -index 0238087..126853c 100755 ---- a/spec_tmpl.sh -+++ b/spec_tmpl.sh -@@ -1,4 +1,4 @@ --#!/usr/bin/sh -+#!/bin/sh - - version=$1 - template=$2
meta/recipes-devtools/libmodulemd/libmodulemd/0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch new file +28 -0
@@ -0,0 +1,28 @@ +From a04fd2c8ac9e0f7a6fc17f02b2a95227b3d0aae4 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Tue, 31 Mar 2020 16:06:39 +0200 +Subject: [PATCH] modulemd: generate the manpage only if the feature is enabled + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <[email protected]> +--- + modulemd/meson.build | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/modulemd/meson.build b/modulemd/meson.build +index 9ef1902..9f71e72 100644 +--- a/modulemd/meson.build ++++ b/modulemd/meson.build +@@ -494,6 +494,7 @@ if with_docs + ) + endif + ++if with_manpages == 'enabled' + help2man_opts = [ + '--no-info', + '--section=1', +@@ -506,3 +507,4 @@ custom_target( + ], + install: true, + install_dir: join_paths(get_option('mandir'), 'man1')) ++endif
meta/recipes-devtools/libmodulemd/libmodulemd/0002-meson.build-do-not-install-python-gi-bindings.patch new file +23 -0
@@ -0,0 +1,23 @@ +From d7eeac90fe02ccf5c5e4334e41ec75fc33803643 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Tue, 31 Mar 2020 16:12:28 +0200 +Subject: [PATCH] meson.build: do not install python gi bindings + +These are unnecessary for oe-core, and the install location +is incorrectly determined using native python. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/meson.build b/meson.build +index a8b02b4..8ff737b 100644 +--- a/meson.build ++++ b/meson.build +@@ -171,4 +171,3 @@ configure_file( + ) + + subdir('modulemd') +-subdir('bindings/python')
meta/recipes-devtools/libmodulemd/libmodulemd_git.bb renamed from meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb +6 -6
@@ -2,19 +2,19 @@ SUMMARY = "C Library for manipulating module metadata files" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb" -SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=1.x-maint \ - file://0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch \ +SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https \ + file://0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch \ + file://0002-meson.build-do-not-install-python-gi-bindings.patch \ " -PV = "1.8.16" -SRCREV = "d0dcf7b373b3cf85cd39eb3bc23d31e06195a75a" -UPSTREAM_CHECK_GITTAGREGEX = "libmodulemd-(?P<pver>1.*\d)" +PV = "2.9.2" +SRCREV = "780750eab8a0587b20d033f335301f16d00ab9c9" S = "${WORKDIR}/git" inherit meson gobject-introspection -EXTRA_OEMESON = "-Ddeveloper_build=false -Dwith_docs=false" +EXTRA_OEMESON = "-Ddeveloper_build=false -Dwith_docs=false -Drpmio=disabled -Dlibmagic=disabled -Dwith_manpages=disabled" DEPENDS += "glib-2.0 libyaml glib-2.0-native python3"
Signature · 1 line
2.26.1
PATCH 3/15 libdnf: upgrade 0.28.1 -> 0.47.0
In reply to Alexander KanavinAdd a patch that avoids hardcoded sphinx dependency.
Switch off a couple of new features (zchunk, html docs for hawkey library via sphinx) that both require new dependencies.
Move from modulemd 1.x to 2.x, drop upstreamed patches.
---
.../libdnf/0001-Add-WITH_TESTS-option.patch | 12 ++--
...nly-if-documentation-is-actually-ena.patch | 42 +++++++++++
...-include-stdexcept-for-runtime_error.patch | 65 -----------------
.../libdnf/fix-deprecation-warning.patch | 71 -------------------
.../{libdnf_0.28.1.bb => libdnf_0.47.0.bb} | 11 +--
5 files changed, 54 insertions(+), 147 deletions(-)
create mode 100644 meta/recipes-devtools/libdnf/libdnf/0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch
delete mode 100644 meta/recipes-devtools/libdnf/libdnf/0001-include-stdexcept-for-runtime_error.patch
delete mode 100644 meta/recipes-devtools/libdnf/libdnf/fix-deprecation-warning.patch
rename meta/recipes-devtools/libdnf/{libdnf_0.28.1.bb => libdnf_0.47.0.bb} (80%)meta/recipes-devtools/libdnf/libdnf/0001-Add-WITH_TESTS-option.patch +6 -6
@@ -1,4 +1,4 @@ -From e5a50db749b2b02e9e0cff9f7b639020e8ac76da Mon Sep 17 00:00:00 2001 +From 56fa2bbdbd29377a6ef0d0b7aadbac8b5ea8c95b Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Tue, 6 Nov 2018 13:54:43 +0100 Subject: [PATCH] Add WITH_TESTS option
@@ -14,18 +14,18 @@ Signed-off-by: Alexander Kanavin <[email protected]> 2 files changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index ce88b9e3..7a99320a 100644 +index 881152a..965c992 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -32,6 +32,7 @@ option(WITH_HTML "Enables hawkey HTML generation" ON) - option(WITH_MAN "Enables hawkey man page generation" ON) +@@ -33,6 +33,7 @@ option(WITH_MAN "Enables hawkey man page generation" ON) + option(WITH_ZCHUNK "Build with zchunk support" ON) option(ENABLE_RHSM_SUPPORT "Build with Red Hat Subscription Manager support?" OFF) option(ENABLE_SOLV_URPMREORDER "Build with support for URPM-like solution reordering?" OFF) +option(WITH_TESTS "Enables unit tests" ON) # load pkg-config first; it's required by other modules -@@ -158,8 +159,10 @@ endif() +@@ -165,8 +166,10 @@ endif() # build tests
@@ -37,7 +37,7 @@ index ce88b9e3..7a99320a 100644 add_subdirectory(python/hawkey) endif() diff --git a/python/hawkey/CMakeLists.txt b/python/hawkey/CMakeLists.txt -index d9645346..84d17204 100644 +index d964534..84d1720 100644 --- a/python/hawkey/CMakeLists.txt +++ b/python/hawkey/CMakeLists.txt @@ -50,4 +50,6 @@ target_link_libraries(_hawkeymodule ${PYTHON_LIBRARY})
meta/recipes-devtools/libdnf/libdnf/0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch new file +42 -0
42 lines not on this page · raw message
meta/recipes-devtools/libdnf/libdnf/0001-include-stdexcept-for-runtime_error.patch deleted +0 -65
65 lines not on this page · raw message
meta/recipes-devtools/libdnf/libdnf/fix-deprecation-warning.patch deleted +0 -71
71 lines not on this page · raw message
meta/recipes-devtools/libdnf/libdnf_0.47.0.bb renamed from meta/recipes-devtools/libdnf/libdnf_0.28.1.bb +6 -5
@@ -2,27 +2,28 @@ SUMMARY = "Library providing simplified C and Python API to libsolv" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "git://github.com/rpm-software-management/libdnf \ +SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master \ file://0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch \ file://0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch \ file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \ file://0001-Add-WITH_TESTS-option.patch \ - file://0001-include-stdexcept-for-runtime_error.patch \ - file://fix-deprecation-warning.patch \ + file://0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch \ " -SRCREV = "751f89045b80d58c0d05800f74357cf78cdf7e77" +SRCREV = "8330eea6985c4e4b53796f858de5b6b38b1ddf5c" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" -DEPENDS = "glib-2.0 libsolv libcheck librepo rpm gtk-doc libmodulemd-v1 json-c swig-native" +DEPENDS = "glib-2.0 libsolv libcheck librepo rpm gtk-doc libmodulemd json-c swig-native" inherit gtk-doc gobject-introspection cmake pkgconfig distutils3-base EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DWITH_MAN=OFF -DPYTHON_DESIRED=3 \ ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DWITH_GIR=ON', '-DWITH_GIR=OFF', d)} \ -DWITH_TESTS=OFF \ + -DWITH_ZCHUNK=OFF \ + -DWITH_HTML=OFF \ " EXTRA_OECMAKE_append_class-native = " -DWITH_GIR=OFF" EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_GIR=OFF"
Signature · 1 line
2.26.1
PATCH 4/15 dnf: upgrade 4.2.2 -> 4.2.21
In reply to Alexander KanavinDrop upstreamed patches.
---
.../dnf/dnf/Fix-SyntaxWarning.patch | 34 -------------------
.../dnf/{dnf_4.2.2.bb => dnf_4.2.21.bb} | 3 +-
2 files changed, 1 insertion(+), 36 deletions(-)
delete mode 100644 meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch
rename meta/recipes-devtools/dnf/{dnf_4.2.2.bb => dnf_4.2.21.bb} (97%)meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From 23c5b15efe42e5e6ee695e54798bac248532d8d6 Mon Sep 17 00:00:00 2001 - -Date: Tue, 28 May 2019 13:14:51 +0200 -Subject: [oe-core][PATCH 1/1] Fix SyntaxWarning: "is" with a literal. Did you - mean "=="? - ---- - dnf/cli/commands/repoquery.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) ---- - -Unchanged. Appears in version 4.2.7. - -Upstream-Status: Backport [git://github.com/rpm-software-management/dnf.git] - -Signed-off-by: Joe Slater <[email protected]> - - -diff --git a/dnf/cli/commands/repoquery.py b/dnf/cli/commands/repoquery.py -index 941a470..63fc668 100644 ---- a/dnf/cli/commands/repoquery.py -+++ b/dnf/cli/commands/repoquery.py -@@ -611,7 +611,7 @@ class RepoQueryCommand(commands.Command): - - def tree_seed(self, query, aquery, opts, level=-1, usedpkgs=None): - for pkg in sorted(set(query.run()), key=lambda p: p.name): -- usedpkgs = set() if usedpkgs is None or level is -1 else usedpkgs -+ usedpkgs = set() if usedpkgs is None or level == -1 else usedpkgs - if pkg.name.startswith("rpmlib") or pkg.name.startswith("solvable"): - return - self.grow_tree(level, pkg, opts) --- -2.7.4 -
meta/recipes-devtools/dnf/dnf_4.2.21.bb renamed from meta/recipes-devtools/dnf/dnf_4.2.2.bb +1 -2
@@ -13,11 +13,10 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \ file://0005-Do-not-prepend-installroot-to-logdir.patch \ file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ file://0030-Run-python-scripts-using-env.patch \ - file://Fix-SyntaxWarning.patch \ file://0001-set-python-path-for-completion_helper.patch \ " -SRCREV = "9947306a55271b8b7c9e2b6e3b7d582885b6045d" +SRCREV = "864c381baabf024c299dca75abfda96139b8f583" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git"
Signature · 1 line
2.26.1
PATCH 5/15 quilt: do not test patch-wrapper as it is not enabled
In reply to Alexander KanavinUpstream only enables the test if --with-patch-wrapper was supplied to ./configure, and so should we.
--- meta/recipes-devtools/quilt/quilt.inc | 3 +++ 1 file changed, 3 insertions(+)
meta/recipes-devtools/quilt/quilt.inc +3 -0
@@ -71,6 +71,9 @@ do_install_ptest() { tar -c --exclude=mail.test --exclude=delete.test test/ | ( cd ${D}${PTEST_PATH} && tar -xf - && chmod 777 test) cp ${WORKDIR}/Makefile ${D}${PTEST_PATH} cp ${WORKDIR}/test.sh ${D}${PTEST_PATH} + + # This is specifically excluded when --with-patch-wrapper is absent during ./configure + rm ${D}${PTEST_PATH}/test/patch-wrapper.test } PACKAGES += "guards guards-doc"
Signature · 1 line
2.26.1
PATCH 6/15 libinput: add ptest
In reply to Alexander KanavinThe test takes about 17 minutes, and fully passes.
--- meta/conf/distro/include/ptest-packagelists.inc | 1 + meta/recipes-graphics/wayland/libinput/run-ptest | 9 +++++++++ meta/recipes-graphics/wayland/libinput_1.15.2.bb | 8 +++++--- 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-graphics/wayland/libinput/run-ptest
meta/conf/distro/include/ptest-packagelists.inc +1 -0
@@ -72,6 +72,7 @@ PTESTS_SLOW = "\ glib-2.0-ptest \ gstreamer1.0-ptest \ libevent-ptest \ + libinput-ptest \ lttng-tools-ptest \ openssh-ptest \ openssl-ptest \
meta/recipes-graphics/wayland/libinput/run-ptest new file +9 -0
@@ -0,0 +1,9 @@ +#!/bin/sh + +/usr/libexec/libinput/libinput-test-suite +if [ $? -eq 0 ]; then + echo 'PASS: libinput-test-suite' +else + echo 'FAIL: libinput-test-suite' +fi +
meta/recipes-graphics/wayland/libinput_1.15.2.bb +5 -3
@@ -10,9 +10,10 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=1f2ea9ebff3a2c6d458faf58492efb63" -DEPENDS = "libevdev udev mtdev" +DEPENDS = "libevdev udev mtdev libcheck" SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ + file://run-ptest \ file://determinism.patch \ " SRC_URI[md5sum] = "eb6bd2907ad33d53954d70dfb881a643"
@@ -20,7 +21,7 @@ SRC_URI[sha256sum] = "971c3fbfb624f95c911adeb2803c372e4e3647d1b98f278f660051f834 UPSTREAM_CHECK_REGEX = "libinput-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" -inherit meson pkgconfig lib_package +inherit meson pkgconfig lib_package ptest PACKAGECONFIG ??= "" PACKAGECONFIG[libwacom] = "-Dlibwacom=true,-Dlibwacom=false,libwacom"
@@ -30,7 +31,7 @@ UDEVDIR = "`pkg-config --variable=udevdir udev`" EXTRA_OEMESON += "-Dudev-dir=${UDEVDIR} \ -Ddocumentation=false \ - -Dtests=false \ + ${@bb.utils.contains('PTEST_ENABLED', '1', '-Dtests=true -Dinstall-tests=true', '-Dtests=false -Dinstall-tests=false', d)} \ -Dzshcompletiondir=no" # package name changed in 1.8.1 upgrade: make sure package upgrades work
@@ -38,3 +39,4 @@ RPROVIDES_${PN} = "libinput" RREPLACES_${PN} = "libinput" RCONFLICTS_${PN} = "libinput" +FILES_${PN}-ptest += "${libexecdir}/libinput/libinput-test-suite"
Signature · 1 line
2.26.1
PATCH 7/15 libinput: update 1.15.2 -> 1.15.5
In reply to Alexander Kanavin---
.../wayland/{libinput_1.15.2.bb => libinput_1.15.5.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/wayland/{libinput_1.15.2.bb => libinput_1.15.5.bb} (91%)meta/recipes-graphics/wayland/libinput_1.15.5.bb renamed from meta/recipes-graphics/wayland/libinput_1.15.2.bb +2 -2
@@ -16,8 +16,8 @@ SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ file://run-ptest \ file://determinism.patch \ " -SRC_URI[md5sum] = "eb6bd2907ad33d53954d70dfb881a643" -SRC_URI[sha256sum] = "971c3fbfb624f95c911adeb2803c372e4e3647d1b98f278f660051f834597747" +SRC_URI[md5sum] = "c9a1b15bb932eaf22f840efe4c3f84eb" +SRC_URI[sha256sum] = "a90efc8f423c3094f2f9f372fb92381b2f3aad62e8b5882a8abe333aa8249c97" UPSTREAM_CHECK_REGEX = "libinput-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
Signature · 1 line
2.26.1
PATCH 8/15 perl: update to 5.30.2
In reply to Alexander Kanavinracefix.patch was merged to perl-cross determinism.patch was partially merged to perl-cross
0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch is no longer needed as issue is addressed upstream.
---
...correctly-exclude-unbuilt-extensions.patch | 27 -------------------
.../perl/files/determinism.patch | 13 ---------
.../recipes-devtools/perl/files/racefix.patch | 24 -----------------
.../perl/{perl_5.30.1.bb => perl_5.30.2.bb} | 10 +++----
4 files changed, 3 insertions(+), 71 deletions(-)
delete mode 100644 meta/recipes-devtools/perl/files/0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch
delete mode 100644 meta/recipes-devtools/perl/files/racefix.patch
rename meta/recipes-devtools/perl/{perl_5.30.1.bb => perl_5.30.2.bb} (97%)meta/recipes-devtools/perl/files/0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch deleted +0 -27
@@ -1,27 +0,0 @@ -From b0d53cfd785f64002128ac5eecc4aed0663d9c30 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Thu, 9 Jan 2020 17:26:55 +0100 -Subject: [PATCH] tests: adjust to correctly exclude unbuilt extensions - -Issue is reported here: -https://github.com/arsv/perl-cross/issues/85 - -Upstream-Status: Inappropriate [issue caused by perl-cross] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - t/TEST | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/t/TEST b/t/TEST -index a9c844f..8d3505f 100755 ---- a/t/TEST -+++ b/t/TEST -@@ -419,7 +419,7 @@ sub _tests_from_manifest { - while (<MANI>) { - if (m!^((?:cpan|dist|ext)/(\S+)/+(?:[^/\s]+\.t|test\.pl)|lib/\S+?(?:\.t|test\.pl))\s!) { - my $t = $1; -- my $extension = $2; -+ my $extension = $1."/".$2; - - # XXX Generates way too many error lines currently. Skip for - # v5.22
meta/recipes-devtools/perl/files/determinism.patch +0 -13
@@ -21,19 +21,6 @@ RP 2020/2/7 Upstream-Status: Pending [75% submitted] Signed-off-by: Richard Purdie <[email protected] -Index: perl-5.30.1/cnf/configure_attr.sh -=================================================================== ---- perl-5.30.1.orig/cnf/configure_attr.sh -+++ perl-5.30.1/cnf/configure_attr.sh -@@ -131,7 +131,7 @@ if not hinted d_c99_variadic_macros 'sup - try_start - try_add '#include <stdio.h>' - try_add '#define foo(fmt, ...) printf(fmt, __VA_ARGS__)' -- try_add 'int main(void) { foo("%i\n", 1234); return 0; }' -+ try_add 'int main(void) { foo("%i", 1234); return 0; }' - try_compile - resdef d_c99_variadic_macros 'supported' 'missing' - fi Index: perl-5.30.1/cnf/configure_mods.sh =================================================================== --- perl-5.30.1.orig/cnf/configure_mods.sh
meta/recipes-devtools/perl/files/racefix.patch deleted +0 -24
@@ -1,24 +0,0 @@ -In our builds Config_heavy.pl sometimes has lines: -cwarnflags=XXX -ccstdflags=XXX -and sometimes does not. -The reason is that this information is pulled from cflags by configpm and yet -there is no dependency in the Makefile. Add one to fix this. - -Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/89] -RP 2020/2/19 -Signed-off-by: Richard Purdie <[email protected]> - -Index: perl-5.30.1/Makefile -=================================================================== ---- perl-5.30.1.orig/Makefile -+++ perl-5.30.1/Makefile -@@ -204,7 +204,7 @@ configpod: $(CONFIGPOD) - git_version.h lib/Config_git.pl: make_patchnum.pl | miniperl$X - ./miniperl_top make_patchnum.pl - --lib/Config.pm lib/Config_heavy.pl lib/Config.pod: config.sh \ -+lib/Config.pm lib/Config_heavy.pl lib/Config.pod: config.sh cflags \ - lib/Config_git.pl Porting/Glossary | miniperl$X - ./miniperl_top configpm -
meta/recipes-devtools/perl/perl_5.30.2.bb renamed from meta/recipes-devtools/perl/perl_5.30.1.bb +3 -7
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ - https://github.com/arsv/perl-cross/releases/download/1.3.1/perl-cross-1.3.1.tar.gz;name=perl-cross \ + https://github.com/arsv/perl-cross/releases/download/1.3.2/perl-cross-1.3.2.tar.gz;name=perl-cross \ file://perl-rdepends.txt \ file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \ file://0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch \
@@ -20,10 +20,8 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \ file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ file://0002-Constant-Fix-up-shebang.patch \ - file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \ file://0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch \ file://determinism.patch \ - file://racefix.patch \ " SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \
@@ -32,10 +30,8 @@ SRC_URI_append_class-target = " \ file://encodefix.patch \ " -SRC_URI[perl.md5sum] = "6438eb7b8db9bbde28e01086de376a46" -SRC_URI[perl.sha256sum] = "bf3d25571ff1ee94186177c2cdef87867fd6a14aa5a84f0b1fb7bf798f42f964" -SRC_URI[perl-cross.md5sum] = "1e463b105cfa56d251a86979af23e3a7" -SRC_URI[perl-cross.sha256sum] = "edce0b0c2f725e2db3f203d6d8e9f3f7161256f5d1590551e40694f21200141d" +SRC_URI[perl.sha256sum] = "66db7df8a91979eb576fac91743644da878244cf8ee152f02cd6f5cd7a731689" +SRC_URI[perl-cross.sha256sum] = "defa12f0ad7be0b6c48b4f76e2fb5b37c1b37fbeb6e9ebe938279cd539a0c20c" S = "${WORKDIR}/perl-${PV}"
Signature · 1 line
2.26.1
PATCH 9/15 gobject-introspection: update to 1.64.1
In reply to Alexander KanavinAll the cross-support patches are finally merged upstream; the maintainer also changed the option naming to his preference, so the recipe is adjusted.
---
.../0001-Fix-build-reproducibility.patch | 50 ------
...t-cross-compilation-support-to-meson.patch | 163 ------------------
...pository-directory-for-native-builds.patch | 8 +-
...scanner-add-a-lib-dirs-envvar-option.patch | 70 --------
...d-disable-tests-when-cross-compiling.patch | 26 ---
...canner-add-use-binary-wrapper-option.patch | 49 ------
...scanner-add-a-use-ldd-wrapper-option.patch | 45 -----
...g-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch | 39 -----
...2.0.bb => gobject-introspection_1.64.1.bb} | 23 +--
9 files changed, 12 insertions(+), 461 deletions(-)
delete mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Fix-build-reproducibility.patch
delete mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch
delete mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch
delete mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-disable-tests-when-cross-compiling.patch
delete mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch
delete mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch
delete mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch
rename meta/recipes-gnome/gobject-introspection/{gobject-introspection_1.62.0.bb => gobject-introspection_1.64.1.bb} (89%)meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Fix-build-reproducibility.patch deleted +0 -50
@@ -1,50 +0,0 @@ -From 59d2cbb54c012b25adeb965a94b6585d911a4539 Mon Sep 17 00:00:00 2001 -From: Joshua Watt <[email protected]> -Date: Wed, 20 Nov 2019 09:03:47 -0600 -Subject: [PATCH] Fix build reproducibility - -ba744068 ("Make meson.override_find_program working on more complex use -cases") made the build no longer reproducible by encoding a build system -path into the output. This shouldn't be necessary anyway, since it -should be possible to add new paths to search for gir files by setting -the XDG_DATA_DIR environment variable. - -Closes #318 - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/192] -Signed-off-by: Joshua Watt <[email protected]> ---- - girepository/girparser.c | 4 ---- - meson.build | 1 - - 2 files changed, 5 deletions(-) - -diff --git a/girepository/girparser.c b/girepository/girparser.c -index fb47e75c..53450baf 100644 ---- a/girepository/girparser.c -+++ b/girepository/girparser.c -@@ -309,10 +309,6 @@ locate_gir (GIrParser *parser, - if (g_file_test (path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) - return path; - g_free (path); -- path = g_build_filename (UNINSTALLED_GIR_DIR, girname, NULL); -- if (g_file_test (path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) -- return path; -- g_free (path); - return NULL; - } - -diff --git a/meson.build b/meson.build -index d6231c5f..2f248579 100644 ---- a/meson.build -+++ b/meson.build -@@ -90,7 +90,6 @@ endif - girdir = join_paths(gir_dir_prefix, 'gir-1.0') - config.set_quoted('GIR_DIR', girdir) - config.set_quoted('GOBJECT_INTROSPECTION_LIBDIR', join_paths(get_option('prefix'), get_option('libdir'))) --config.set_quoted('UNINSTALLED_GIR_DIR', join_paths(meson.current_build_dir(), 'gir')) - - foreach type : ['char', 'short', 'int', 'long'] - size = cc.sizeof(type) --- -2.23.0 -
meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch deleted +0 -163
163 lines not on this page · raw message
meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch +4 -4
@@ -1,4 +1,4 @@ -From 673623851fb70c0e43cf79cef67b3751432ebe72 Mon Sep 17 00:00:00 2001 +From 8dfb44450ca9fffc15977e95eadcb7054ab60a9a Mon Sep 17 00:00:00 2001 From: Sascha Silbe <[email protected]> Date: Fri, 8 Jun 2018 13:55:10 +0200 Subject: [PATCH] Relocate the repository directory for native builds
@@ -21,7 +21,7 @@ Signed-off-by: Sascha Silbe <[email protected]> 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/girepository/girepository.c b/girepository/girepository.c -index ca5dc2b..7a4d17f 100644 +index b7948d6..39a2586 100644 --- a/girepository/girepository.c +++ b/girepository/girepository.c @@ -21,6 +21,8 @@
@@ -42,7 +42,7 @@ index ca5dc2b..7a4d17f 100644 /** * SECTION:girepository * @short_description: GObject Introspection repository manager -@@ -212,9 +216,16 @@ init_globals (void) +@@ -215,9 +219,16 @@ init_globals (void) g_free (custom_dirs); }
@@ -62,7 +62,7 @@ index ca5dc2b..7a4d17f 100644 typelib_search_path = g_slist_prepend (typelib_search_path, typelib_dir); diff --git a/girepository/meson.build b/girepository/meson.build -index 1d7aed6..5637fb5 100644 +index 204659f..3e61d31 100644 --- a/girepository/meson.build +++ b/girepository/meson.build @@ -44,7 +44,7 @@ girepo_internals_lib = static_library('girepository-internals',
meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch deleted +0 -70
70 lines not on this page · raw message
meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-disable-tests-when-cross-compiling.patch deleted +0 -26
@@ -1,26 +0,0 @@ -From 2c384187cc22113c0c9b1cd233948118f7c085ef Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Mon, 25 Mar 2019 13:28:48 +0100 -Subject: [PATCH] meson.build: disable tests when cross-compiling - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/64] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - meson.build | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 2544ff3..4c16fe5 100644 ---- a/meson.build -+++ b/meson.build -@@ -168,7 +168,9 @@ if get_option('enable-introspection-data') == true - endif - subdir('examples') - subdir('docs') --subdir('tests') -+if not meson.is_cross_build() -+ subdir('tests') -+endif - - install_data('Makefile.introspection', install_dir: join_paths(get_option('datadir'), 'gobject-introspection-1.0')) - install_data('m4/introspection.m4', install_dir: join_paths(get_option('datadir'), 'aclocal'))
meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch deleted +0 -49
49 lines not on this page · raw message
meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch deleted +0 -45
45 lines not on this page · raw message
meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch deleted +0 -39
@@ -1,39 +0,0 @@ -From 740d91151ffe576e0c08513af9d7bc8133eb9dfb Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Thu, 8 Oct 2015 18:30:35 +0300 -Subject: [PATCH] Prefix pkg-config paths with PKG_CONFIG_SYSROOT_DIR - environment variable - -This environment variable sets the location of sysroot directory in cross-compilation -environments; if the variable is not set, the prefix will be empty. - -Upstream-Status: Pending [review on oe-core list] -Signed-off-by: Alexander Kanavin <[email protected]> - ---- - m4/introspection.m4 | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/m4/introspection.m4 b/m4/introspection.m4 -index d89c3d9..b562266 100644 ---- a/m4/introspection.m4 -+++ b/m4/introspection.m4 -@@ -56,14 +56,14 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], - INTROSPECTION_GIRDIR= - INTROSPECTION_TYPELIBDIR= - if test "x$found_introspection" = "xyes"; then -- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` -- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` -- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -+ INTROSPECTION_SCANNER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` -+ INTROSPECTION_COMPILER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` -+ INTROSPECTION_GENERATE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` -- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection -+ INTROSPECTION_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection - fi - AC_SUBST(INTROSPECTION_SCANNER) - AC_SUBST(INTROSPECTION_COMPILER)
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.64.1.bb renamed from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb +8 -15
@@ -14,18 +14,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \ " SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ - file://0003-giscanner-add-use-binary-wrapper-option.patch \ - file://0004-giscanner-add-a-use-ldd-wrapper-option.patch \ - file://0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch \ - file://0001-giscanner-add-a-lib-dirs-envvar-option.patch \ file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \ - file://0001-Port-cross-compilation-support-to-meson.patch \ - file://0001-meson.build-disable-tests-when-cross-compiling.patch \ - file://0001-Fix-build-reproducibility.patch \ " -SRC_URI[md5sum] = "37278eab3704e42234b6080b8cf241f1" -SRC_URI[sha256sum] = "b1ee7ed257fdbc008702bdff0ff3e78a660e7e602efa8f211dc89b9d1e7d90a2" +SRC_URI[md5sum] = "3419dfd086efcf83768e0579ab6abd2b" +SRC_URI[sha256sum] = "80beae6728c134521926affff9b2e97125749b38d38744dc901f4010ee3e7fa7" SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch"
@@ -49,16 +42,16 @@ export STAGING_DIR_HOST export B PACKAGECONFIG ?= "" -PACKAGECONFIG[doctool] = "-Ddoctool=true,-Ddoctool=false,python3-mako," +PACKAGECONFIG[doctool] = "-Ddoctool=enabled,-Ddoctool=disabled,python3-mako," # Configure target build to use native tools of itself and to use a qemu wrapper # and optionally to generate introspection data EXTRA_OEMESON_class-target = " \ - -Denable-host-gi=true \ - -Denable-gi-cross-wrapper=${B}/g-ir-scanner-qemuwrapper \ - -Denable-gi-ldd-wrapper=${B}/g-ir-scanner-lddwrapper \ - -Dpkgconfig-sysroot-path=${PKG_CONFIG_SYSROOT_DIR} \ - ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Denable-introspection-data=true', '-Denable-introspection-data=false', d)} \ + -Dgi_cross_use_host_gi=true \ + -Dgi_cross_binary_wrapper=${B}/g-ir-scanner-qemuwrapper \ + -Dgi_cross_ldd_wrapper=${B}/g-ir-scanner-lddwrapper \ + -Dgi_cross_pkgconfig_sysroot_path=${PKG_CONFIG_SYSROOT_DIR} \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dbuild_introspection_data=true', '-Dbuild_introspection_data=false', d)} \ ${@'-Dgir_dir_prefix=${libdir}' if d.getVar('MULTILIBS') else ''} \ "
Signature · 1 line
2.26.1
PATCH 10/15 python3-pyparsing: add from meta-oe
In reply to Alexander KanavinThis is needed for python3-cython, which is needed by new python3-numpy.
--- .../python/python-pyparsing.inc | 22 +++++++++++++++++++ .../python/python3-pyparsing_2.4.6.bb | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 meta/recipes-devtools/python/python-pyparsing.inc create mode 100644 meta/recipes-devtools/python/python3-pyparsing_2.4.6.bb
meta/recipes-devtools/python/python-pyparsing.inc new file +22 -0
@@ -0,0 +1,22 @@ +SUMMARY = "Python parsing module" +HOMEPAGE = "http://pyparsing.wikispaces.com/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=657a566233888513e1f07ba13e2f47f1" + +SRC_URI[md5sum] = "29733ea8cbee0291aad121c69c6e51a1" +SRC_URI[sha256sum] = "4c830582a84fb022400b85429791bc551f1f4871c33f23e44f353119e92f969f" +UPSTREAM_CHECK_REGEX = "pyparsing-(?P<pver>.*)\.tar" + +inherit pypi + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-debugger \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-pprint \ + ${PYTHON_PN}-stringold \ + ${PYTHON_PN}-threading \ +" + +BBCLASSEXTEND = "native nativesdk"
meta/recipes-devtools/python/python3-pyparsing_2.4.6.bb new file +2 -0
@@ -0,0 +1,2 @@ +inherit setuptools3 +require python-pyparsing.inc
Signature · 1 line
2.26.1
PATCH 11/15 python3-cython: add from meta-oe
In reply to Alexander KanavinThis is needed by new python3-numpy.
--- .../recipes-devtools/python/python-cython.inc | 41 +++++++++++++++++++ .../python/python3-cython_0.29.14.bb | 18 ++++++++ 2 files changed, 59 insertions(+) create mode 100644 meta/recipes-devtools/python/python-cython.inc create mode 100644 meta/recipes-devtools/python/python3-cython_0.29.14.bb
meta/recipes-devtools/python/python-cython.inc new file +41 -0
@@ -0,0 +1,41 @@ +DESCRIPTION = "Cython is a language specially designed for writing Python extension modules. \ +It's designed to bridge the gap between the nice, high-level, easy-to-use world of Python \ +and the messy, low-level world of C." +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa" +PYPI_PACKAGE = "Cython" +BBCLASSEXTEND = "native nativesdk" + +SRC_URI[md5sum] = "6e2f139e30bb08d68366f9370d87964c" +SRC_URI[sha256sum] = "e4d6bb8703d0319eb04b7319b12ea41580df44fd84d83ccda13ea463c6801414" +UPSTREAM_CHECK_REGEX = "Cython-(?P<pver>.*)\.tar" + +inherit pypi + +RDEPENDS_${PN}_class-target += "\ + ${PYTHON_PN}-misc \ + ${PYTHON_PN}-netserver \ + ${PYTHON_PN}-pkgutil \ + ${PYTHON_PN}-pyparsing \ + ${PYTHON_PN}-setuptools \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-xml \ +" + +RDEPENDS_${PN}_class-nativesdk += "\ + nativesdk-${PYTHON_PN}-misc \ + nativesdk-${PYTHON_PN}-netserver \ + nativesdk-${PYTHON_PN}-pkgutil \ + nativesdk-${PYTHON_PN}-pyparsing \ + nativesdk-${PYTHON_PN}-setuptools \ + nativesdk-${PYTHON_PN}-shell \ + nativesdk-${PYTHON_PN}-xml \ +" + +do_install_append() { + # Make sure we use /usr/bin/env python + for PYTHSCRIPT in `grep -rIl '^#!.*python' ${D}`; do + sed -i -e '1s|^#!.*|#!/usr/bin/env ${PYTHON_PN}|' $PYTHSCRIPT + done +}
meta/recipes-devtools/python/python3-cython_0.29.14.bb new file +18 -0
@@ -0,0 +1,18 @@ +inherit setuptools3 +require python-cython.inc + +RDEPENDS_${PN} += "\ + python3-setuptools \ +" + +# running build_ext a second time during install fails, because Python +# would then attempt to import cythonized modules built for the target +# architecture. +DISTUTILS_INSTALL_ARGS += "--skip-build" + +do_install_append() { + # rename scripts that would conflict with the Python 2 build of Cython + mv ${D}${bindir}/cython ${D}${bindir}/cython3 + mv ${D}${bindir}/cythonize ${D}${bindir}/cythonize3 + mv ${D}${bindir}/cygdb ${D}${bindir}/cygdb3 +}
Signature · 1 line
2.26.1
PATCH 12/15 maintainers.inc: add entries for cython and pyparsing
In reply to Alexander Kanavin--- meta/conf/distro/include/maintainers.inc | 2 ++ 1 file changed, 2 insertions(+)
meta/conf/distro/include/maintainers.inc +2 -0
@@ -574,6 +574,7 @@ RECIPE_MAINTAINER_pn-pulseaudio-client-conf-sato = "Tanu Kaskinen <[email protected]> RECIPE_MAINTAINER_pn-puzzles = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER_pn-python3 = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER_pn-python3-async = "Oleksandr Kravchuk <[email protected]>" +RECIPE_MAINTAINER_pn-python3-cython = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER_pn-python3-dbus = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER_pn-python3-docutils = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER_pn-python3-extras = "Oleksandr Kravchuk <[email protected]>"
@@ -590,6 +591,7 @@ RECIPE_MAINTAINER_pn-python3-pip = "Oleksandr Kravchuk <open.source@oleksandr-kr RECIPE_MAINTAINER_pn-python3-pycairo = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER_pn-python3-pygments = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER_pn-python3-pygobject = "Oleksandr Kravchuk <[email protected]>" +RECIPE_MAINTAINER_pn-python3-pyparsing = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER_pn-python3-scons = "Tim Orling <[email protected]>" RECIPE_MAINTAINER_pn-python3-scons-native = "Tim Orling <[email protected]>" RECIPE_MAINTAINER_pn-python3-setuptools = "Oleksandr Kravchuk <[email protected]>"
Signature · 1 line
2.26.1
PATCH 13/15 python3-cython: update to 0.29.16
In reply to Alexander Kanavin---
meta/recipes-devtools/python/python-cython.inc | 4 ++--
.../{python3-cython_0.29.14.bb => python3-cython_0.29.16.bb} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python3-cython_0.29.14.bb => python3-cython_0.29.16.bb} (100%)meta/recipes-devtools/python/python-cython.inc +2 -2
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa" PYPI_PACKAGE = "Cython" BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "6e2f139e30bb08d68366f9370d87964c" -SRC_URI[sha256sum] = "e4d6bb8703d0319eb04b7319b12ea41580df44fd84d83ccda13ea463c6801414" +SRC_URI[md5sum] = "a899abaa48b68bb679aef45ceb4b89d3" +SRC_URI[sha256sum] = "232755284f942cbb3b43a06cd85974ef3c970a021aef19b5243c03ee2b08fa05" UPSTREAM_CHECK_REGEX = "Cython-(?P<pver>.*)\.tar" inherit pypi
meta/recipes-devtools/python/python3-cython_0.29.16.bb renamed from meta/recipes-devtools/python/python3-cython_0.29.14.bb +0 -0
Signature · 1 line
2.26.1
PATCH 14/15 python3-pyparsing: update to 2.4.7
In reply to Alexander Kanavin---
meta/recipes-devtools/python/python-pyparsing.inc | 4 ++--
...{python3-pyparsing_2.4.6.bb => python3-pyparsing_2.4.7.bb} | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python3-pyparsing_2.4.6.bb => python3-pyparsing_2.4.7.bb} (98%)meta/recipes-devtools/python/python-pyparsing.inc +2 -2
@@ -3,8 +3,8 @@ HOMEPAGE = "http://pyparsing.wikispaces.com/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=657a566233888513e1f07ba13e2f47f1" -SRC_URI[md5sum] = "29733ea8cbee0291aad121c69c6e51a1" -SRC_URI[sha256sum] = "4c830582a84fb022400b85429791bc551f1f4871c33f23e44f353119e92f969f" +SRC_URI[md5sum] = "f0953e47a0112f7a65aec2305ffdf7b4" +SRC_URI[sha256sum] = "c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1" UPSTREAM_CHECK_REGEX = "pyparsing-(?P<pver>.*)\.tar" inherit pypi
meta/recipes-devtools/python/python3-pyparsing_2.4.7.bb renamed from meta/recipes-devtools/python/python3-pyparsing_2.4.6.bb +1 -0
@@ -1,2 +1,3 @@ inherit setuptools3 require python-pyparsing.inc +
Signature · 1 line
2.26.1
PATCH 15/15 python3-numpy: update to 1.18.3
In reply to Alexander Kanavin---
...nvert-shebang-from-python-to-python3.patch | 176 ++++++++----------
...up.py-remove-the-detection-of-x86-ta.patch | 32 ----
.../python-numpy/python-numpy.inc | 7 +-
...umpy_1.17.4.bb => python3-numpy_1.18.3.bb} | 0
4 files changed, 80 insertions(+), 135 deletions(-)
delete mode 100644 meta/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch
rename meta/recipes-devtools/python-numpy/{python3-numpy_1.17.4.bb => python3-numpy_1.18.3.bb} (100%)meta/recipes-devtools/python-numpy/files/0001-convert-shebang-from-python-to-python3.patch +76 -100
@@ -1,4 +1,4 @@ -From c53237f90e4a3a435a20517552186d394d6d09c8 Mon Sep 17 00:00:00 2001 +From 00848d760fa3999e2bed759b585452b35d65d6ec Mon Sep 17 00:00:00 2001 From: Changqing Li <[email protected]> Date: Thu, 5 Mar 2020 12:02:35 +0800 Subject: [PATCH] convert shebang from python to python3
@@ -7,62 +7,61 @@ Upstream-Status: Backport [https://github.com/numpy/numpy/commit/583901a074dc65145d3d6136ba7dcd02634d680b] Signed-off-by: Changqing Li <[email protected]> + --- - doc/DISTUTILS.rst.txt | 2 +- - doc/cdoc/numpyfilter.py | 2 +- - doc/postprocess.py | 2 +- - doc/summarize.py | 2 +- - numpy/distutils/conv_template.py | 2 +- - numpy/distutils/cpuinfo.py | 2 +- - numpy/distutils/from_template.py | 2 +- - numpy/distutils/setup.py | 2 +- - numpy/distutils/system_info.py | 2 +- - numpy/f2py/__init__.py | 2 +- - numpy/f2py/auxfuncs.py | 2 +- - numpy/f2py/capi_maps.py | 2 +- - numpy/f2py/cb_rules.py | 2 +- - numpy/f2py/cfuncs.py | 2 +- - numpy/f2py/common_rules.py | 2 +- - numpy/f2py/crackfortran.py | 2 +- - numpy/f2py/diagnose.py | 2 +- - numpy/f2py/f2py2e.py | 2 +- - numpy/f2py/f90mod_rules.py | 2 +- - numpy/f2py/func2subr.py | 2 +- - numpy/f2py/rules.py | 2 +- - numpy/f2py/setup.py | 2 +- - numpy/f2py/use_rules.py | 2 +- - numpy/linalg/lapack_lite/clapack_scrub.py | 2 +- - numpy/linalg/lapack_lite/make_lite.py | 2 +- - numpy/ma/bench.py | 2 +- - numpy/ma/setup.py | 2 +- - numpy/matrixlib/setup.py | 2 +- - numpy/random/examples/cython/extending.pyx | 2 +- - numpy/random/examples/cython/extending_distributions.pyx | 2 +- - numpy/setup.py | 2 +- - numpy/testing/print_coercion_tables.py | 2 +- - numpy/testing/setup.py | 2 +- - runtests.py | 2 +- - setup.py | 2 +- - tools/c_coverage/c_coverage_report.py | 2 +- - tools/changelog.py | 2 +- - tools/ci/push_docs_to_repo.py | 2 +- - tools/cythonize.py | 2 +- - tools/find_deprecated_escaped_characters.py | 2 +- - tools/refguide_check.py | 2 +- - tools/swig/test/setup.py | 2 +- - tools/swig/test/testArray.py | 2 +- - tools/swig/test/testFarray.py | 2 +- - tools/swig/test/testFlat.py | 2 +- - tools/swig/test/testFortran.py | 2 +- - tools/swig/test/testMatrix.py | 2 +- - tools/swig/test/testSuperTensor.py | 2 +- - tools/swig/test/testTensor.py | 2 +- - tools/swig/test/testVector.py | 2 +- - tools/test-installed-numpy.py | 2 +- - 51 files changed, 51 insertions(+), 51 deletions(-) + doc/DISTUTILS.rst.txt | 2 +- + doc/cdoc/numpyfilter.py | 2 +- + doc/postprocess.py | 2 +- + doc/summarize.py | 2 +- + numpy/distutils/conv_template.py | 2 +- + numpy/distutils/cpuinfo.py | 2 +- + numpy/distutils/from_template.py | 2 +- + numpy/distutils/setup.py | 2 +- + numpy/distutils/system_info.py | 2 +- + numpy/f2py/__init__.py | 2 +- + numpy/f2py/auxfuncs.py | 2 +- + numpy/f2py/capi_maps.py | 2 +- + numpy/f2py/cb_rules.py | 2 +- + numpy/f2py/cfuncs.py | 2 +- + numpy/f2py/common_rules.py | 2 +- + numpy/f2py/crackfortran.py | 2 +- + numpy/f2py/diagnose.py | 2 +- + numpy/f2py/f2py2e.py | 2 +- + numpy/f2py/f90mod_rules.py | 2 +- + numpy/f2py/func2subr.py | 2 +- + numpy/f2py/rules.py | 2 +- + numpy/f2py/setup.py | 2 +- + numpy/f2py/use_rules.py | 2 +- + numpy/linalg/lapack_lite/clapack_scrub.py | 2 +- + numpy/linalg/lapack_lite/make_lite.py | 2 +- + numpy/ma/bench.py | 2 +- + numpy/ma/setup.py | 2 +- + numpy/matrixlib/setup.py | 2 +- + numpy/random/_examples/cython/extending.pyx | 2 +- + numpy/random/_examples/cython/extending_distributions.pyx | 2 +- + numpy/setup.py | 2 +- + numpy/testing/print_coercion_tables.py | 2 +- + numpy/testing/setup.py | 2 +- + runtests.py | 2 +- + setup.py | 2 +- + tools/c_coverage/c_coverage_report.py | 2 +- + tools/changelog.py | 2 +- + tools/ci/push_docs_to_repo.py | 2 +- + tools/find_deprecated_escaped_characters.py | 2 +- + tools/refguide_check.py | 2 +- + tools/swig/test/setup.py | 2 +- + tools/swig/test/testArray.py | 2 +- + tools/swig/test/testFarray.py | 2 +- + tools/swig/test/testFlat.py | 2 +- + tools/swig/test/testFortran.py | 2 +- + tools/swig/test/testMatrix.py | 2 +- + tools/swig/test/testSuperTensor.py | 2 +- + tools/swig/test/testTensor.py | 2 +- + tools/swig/test/testVector.py | 2 +- + 49 files changed, 49 insertions(+), 49 deletions(-) diff --git a/doc/DISTUTILS.rst.txt b/doc/DISTUTILS.rst.txt -index eadde63..2402110 100644 +index bcef825..bc1700f 100644 --- a/doc/DISTUTILS.rst.txt +++ b/doc/DISTUTILS.rst.txt @@ -59,7 +59,7 @@ SciPy pure Python package example
@@ -115,7 +114,7 @@ index 3bcb7b8..88432c8 100644 takes templated file .xxx.src and produces .xxx file where .xxx is .i or .c or .h, using the following template rules diff --git a/numpy/distutils/cpuinfo.py b/numpy/distutils/cpuinfo.py -index 5802993..7f6742e 100644 +index bc97283..87502a9 100644 --- a/numpy/distutils/cpuinfo.py +++ b/numpy/distutils/cpuinfo.py @@ -1,4 +1,4 @@
@@ -145,7 +144,7 @@ index 82a53bd..646921b 100644 def configuration(parent_package='',top_path=None): diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py -index f94dce1..df526f6 100644 +index 4f340b6..189081d 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py @@ -1,4 +1,4 @@
@@ -155,7 +154,7 @@ index f94dce1..df526f6 100644 This file defines a set of system_info classes for getting information about various resources (libraries, library directories, diff --git a/numpy/f2py/__init__.py b/numpy/f2py/__init__.py -index d146739..0a83b99 100644 +index 42e3632..09a3657 100644 --- a/numpy/f2py/__init__.py +++ b/numpy/f2py/__init__.py @@ -1,4 +1,4 @@
@@ -175,7 +174,7 @@ index 404bdbd..d23d959 100644 Auxiliary functions for f2py2e. diff --git a/numpy/f2py/capi_maps.py b/numpy/f2py/capi_maps.py -index c41dd77..a3e2dc2 100644 +index ce79f68..e5d3fd2 100644 --- a/numpy/f2py/capi_maps.py +++ b/numpy/f2py/capi_maps.py @@ -1,4 +1,4 @@
@@ -195,7 +194,7 @@ index 183d7c2..93e93fe 100644 Build call-back mechanism for f2py2e. diff --git a/numpy/f2py/cfuncs.py b/numpy/f2py/cfuncs.py -index d59b630..3847745 100644 +index ccb7b3a..cdb783d 100644 --- a/numpy/f2py/cfuncs.py +++ b/numpy/f2py/cfuncs.py @@ -1,4 +1,4 @@
@@ -205,7 +204,7 @@ index d59b630..3847745 100644 C declarations, CPP macros, and C functions for f2py2e. diff --git a/numpy/f2py/common_rules.py b/numpy/f2py/common_rules.py -index 62c1ba2..c1825d4 100644 +index f61d881..fe510bf 100644 --- a/numpy/f2py/common_rules.py +++ b/numpy/f2py/common_rules.py @@ -1,4 +1,4 @@
@@ -235,7 +234,7 @@ index 0241fed..6c0304c 100644 import os diff --git a/numpy/f2py/f2py2e.py b/numpy/f2py/f2py2e.py -index 110337f..c0789f6 100755 +index d03eff9..c17bfd9 100755 --- a/numpy/f2py/f2py2e.py +++ b/numpy/f2py/f2py2e.py @@ -1,4 +1,4 @@
@@ -265,7 +264,7 @@ index 6010d5a..fdea0c2 100644 Rules for building C/API module with f2py2e. diff --git a/numpy/f2py/rules.py b/numpy/f2py/rules.py -index 1b41498..790d197 100755 +index f2f713b..f87b03c 100755 --- a/numpy/f2py/rules.py +++ b/numpy/f2py/rules.py @@ -1,4 +1,4 @@
@@ -275,7 +274,7 @@ index 1b41498..790d197 100755 Rules for building C/API module with f2py2e. diff --git a/numpy/f2py/setup.py b/numpy/f2py/setup.py -index c0c50ce..044c9f2 100644 +index a8c1401..2e7a517 100644 --- a/numpy/f2py/setup.py +++ b/numpy/f2py/setup.py @@ -1,4 +1,4 @@
@@ -344,26 +343,26 @@ index d0981d6..57534d1 100644 from __future__ import division, print_function def configuration(parent_package='', top_path=None): -diff --git a/numpy/random/examples/cython/extending.pyx b/numpy/random/examples/cython/extending.pyx -index a6a4ba4..33f28f9 100644 ---- a/numpy/random/examples/cython/extending.pyx -+++ b/numpy/random/examples/cython/extending.pyx +diff --git a/numpy/random/_examples/cython/extending.pyx b/numpy/random/_examples/cython/extending.pyx +index 7a0dfe0..3a7f81a 100644 +--- a/numpy/random/_examples/cython/extending.pyx ++++ b/numpy/random/_examples/cython/extending.pyx @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 #cython: language_level=3 from libc.stdint cimport uint32_t -diff --git a/numpy/random/examples/cython/extending_distributions.pyx b/numpy/random/examples/cython/extending_distributions.pyx -index 3cefec9..7a526ab 100644 ---- a/numpy/random/examples/cython/extending_distributions.pyx -+++ b/numpy/random/examples/cython/extending_distributions.pyx +diff --git a/numpy/random/_examples/cython/extending_distributions.pyx b/numpy/random/_examples/cython/extending_distributions.pyx +index 1bef506..4da6a4b 100644 +--- a/numpy/random/_examples/cython/extending_distributions.pyx ++++ b/numpy/random/_examples/cython/extending_distributions.pyx @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 #cython: language_level=3 """ - This file shows how the distributions that are accessed through + This file shows how the to use a BitGenerator to create a distribution. diff --git a/numpy/setup.py b/numpy/setup.py index 4ccdaee..db06c82 100644 --- a/numpy/setup.py
@@ -375,7 +374,7 @@ index 4ccdaee..db06c82 100644 diff --git a/numpy/testing/print_coercion_tables.py b/numpy/testing/print_coercion_tables.py -index 3a359f4..a9c5363 100755 +index 72b22ce..1e9a301 100755 --- a/numpy/testing/print_coercion_tables.py +++ b/numpy/testing/print_coercion_tables.py @@ -1,4 +1,4 @@
@@ -395,7 +394,7 @@ index 7c3f2fb..bd315ee 100755 diff --git a/runtests.py b/runtests.py -index 23245ae..cafdb92 100755 +index a38054f..383ddaa 100755 --- a/runtests.py +++ b/runtests.py @@ -1,4 +1,4 @@
@@ -405,7 +404,7 @@ index 23245ae..cafdb92 100755 runtests.py [OPTIONS] [-- ARGS] diff --git a/setup.py b/setup.py -index a205913..010884f 100755 +index d7f807b..705ea5d 100755 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@
@@ -444,16 +443,6 @@ index a989668..ae53054 100755 import argparse import subprocess -diff --git a/tools/cythonize.py b/tools/cythonize.py -index c81b72d..c1d4384 100755 ---- a/tools/cythonize.py -+++ b/tools/cythonize.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """ cythonize - - Cythonize pyx files into C files as needed. diff --git a/tools/find_deprecated_escaped_characters.py b/tools/find_deprecated_escaped_characters.py index 6f90001..10e0378 100644 --- a/tools/find_deprecated_escaped_characters.py
@@ -465,7 +454,7 @@ index 6f90001..10e0378 100644 Look for escape sequences deprecated in Python 3.6. diff --git a/tools/refguide_check.py b/tools/refguide_check.py -index c208072..798e322 100644 +index 2c62809..a19a29e 100644 --- a/tools/refguide_check.py +++ b/tools/refguide_check.py @@ -1,4 +1,4 @@
@@ -495,7 +484,7 @@ index 8d9c797..54ffe71 100755 # System imports diff --git a/tools/swig/test/testFarray.py b/tools/swig/test/testFarray.py -index 0037dc9..bedf384 100755 +index e8bf711..b377f7c 100755 --- a/tools/swig/test/testFarray.py +++ b/tools/swig/test/testFarray.py @@ -1,4 +1,4 @@
@@ -564,16 +553,3 @@ index 45e763b..067b922 100755 from __future__ import division, absolute_import, print_function # System imports -diff --git a/tools/test-installed-numpy.py b/tools/test-installed-numpy.py -index 5240253..fd7541c 100755 ---- a/tools/test-installed-numpy.py -+++ b/tools/test-installed-numpy.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - from __future__ import division, absolute_import, print_function - - # A simple script to test the installed version of numpy by calling --- -2.7.4 -
meta/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From b881e0b2ba9cf1a4aa351a1c1ea90b1e1776ce21 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Mon, 12 Aug 2019 15:37:36 +0200 -Subject: [PATCH] numpy/random/setup.py: remove the detection of x86 targets - via uname() - -This was badly breaking compilation for ARM targets (and possibly -other non-x86 targets); if -msse2 is desirable for x86 builds it has -to be passed through another channel. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - numpy/random/setup.py | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/numpy/random/setup.py b/numpy/random/setup.py -index a1bf3b8..60fb534 100644 ---- a/numpy/random/setup.py -+++ b/numpy/random/setup.py -@@ -49,11 +49,6 @@ def configuration(parent_package='', top_path=None): - elif not is_msvc: - # Some bit generators require c99 - EXTRA_COMPILE_ARGS += ['-std=c99'] -- INTEL_LIKE = any(arch in platform.machine() -- for arch in ('x86', 'i686', 'i386', 'amd64')) -- if INTEL_LIKE: -- # Assumes GCC or GCC-like compiler -- EXTRA_COMPILE_ARGS += ['-msse2'] - - # Use legacy integer variable sizes - LEGACY_DEFS = [('NP_RANDOM_LEGACY', '1')]
meta/recipes-devtools/python-numpy/python-numpy.inc +4 -3
@@ -7,11 +7,10 @@ SRCNAME = "numpy" SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${SRCNAME}-${PV}.tar.gz \ file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ - file://0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch \ file://0001-convert-shebang-from-python-to-python3.patch \ " -SRC_URI[md5sum] = "9147c3ee75e58d657b5b8b5a4f3564e0" -SRC_URI[sha256sum] = "fb0415475e673cb9a6dd816df999e0ab9f86fa3af2b1770944e7288d2bea4ac9" +SRC_URI[md5sum] = "cd631c761f141d382b4e1b31c8232fc0" +SRC_URI[sha256sum] = "93ee59ec38f3bf8f9a42d5f4301f60e6825a4a6385a145f70badcd2bf2a11134" UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
@@ -19,6 +18,8 @@ UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" # Needed for building with gcc 4.x from centos 7 CFLAGS_append_class-native = " -std=c99" +DEPENDS += "python3-cython-native" + S = "${WORKDIR}/numpy-${PV}" CLEANBROKEN = "1"
meta/recipes-devtools/python-numpy/python3-numpy_1.18.3.bb renamed from meta/recipes-devtools/python-numpy/python3-numpy_1.17.4.bb +0 -0
Signature · 1 line
2.26.1
Quoted 5 lines · Alexander Kanavin
Drop patches that were merged upstream.
0001-mono-find-provides-requires-do-not-use-monodis-from-.patch modifies a file that was removed upstream.
Quoted 7 lines
Add a 0001-rpmfc.c-do-not-run-file-classification-in-parallel.patch as unfortunately the new parallel file classification feature from upstream trips over somewhere in libmagic when inspected files are compressed:
https://github.com/rpm-software-management/rpm/issues/756Signed-off-by Alexander Kanavin <[email protected]>
Hi Alex,
There were some failures from this series:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/890
It may be easiest for you to have a look through that build result as I think all the failures are from your patches as that is the main thing in -next! :)
Cheers,
Richard
Quoted 9 lines · Richard Purdie
There were some failures from this series:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/890
It may be easiest for you to have a look through that build result as I think all the failures are from your patches as that is the main thing in -next! :)
Thanks Richard, I'll work through these one by one. Hopefully the amount of actual issues is a lot less than the amount of red in that build.
Alex
A message that is not in the archive (sent off-list or not yet received): [email protected]
I started looking into it, but quickly found that all or almost all the failures are all due to the rpm upgrade, and the failures all happen on three old distros: centos 7, debian 8, ubuntu 16.04.
What is particularly odd is that the centos/debian failures are
non-deterministic: in some cases rpm-native fails to build due to missing omp.h, in other cases it builds, but the resulting binaries segfault. This non-determinism seems to happen even on the same worker, e.g.:
https://autobuilder.yoctoproject.org/typhoon/#/builders/75/builds/1812
https://autobuilder.yoctoproject.org/typhoon/#/builders/15/builds/2073
(one is failing in do_compile, another compiles fine, but then produces segfaults)
Ubuntu always segfaults, but maybe it's just coincidental.
I am not sure how to take this further, but maybe the best course of action is to defer the rpm/dnf update once more, until those old distros are finally retired.
Alex
Quoted 19 lines · Alexander Kanavin via lists.openembedded.org
Quoted 9 lines · Richard Purdie
There were some failures from this series:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/890
It may be easiest for you to have a look through that build result as I think all the failures are from your patches as that is the main thing in -next! :)
Thanks Richard, I'll work through these one by one. Hopefully the amount of actual issues is a lot less than the amount of red in that build.
Alex
Quoted 3 lines · Alexander Kanavin
I started looking into it, but quickly found that all or almost all the failures are all due to the rpm upgrade, and the failures all happen on three old distros: centos 7, debian 8, ubuntu 16.04.
I did notice there was a reproducibility issue with libinput too but that is a useful pattern to have for the rpm issues.
Quoted 8 lines
What is particularly odd is that the centos/debian failures are non-
deterministic: in some cases rpm-native fails to build due to missingomp.h, in other cases it builds, but the resulting binaries segfault. This non-determinism seems to happen even on the same worker, e.g.:
https://autobuilder.yoctoproject.org/typhoon/#/builders/75/builds/1812
https://autobuilder.yoctoproject.org/typhoon/#/builders/15/builds/2073
(one is failing indo_compile, another compiles fine, but then produces segfaults)
I think what may happen is that sstate may become populated and then builds proceed further than they did previously.
Quoted 5 lines
Ubuntu always segfaults, but maybe it's just coincidental.
I am not sure how to take this further, but maybe the best course of action is to defer the rpm/dnf update once more, until those old distros are finally retired.
We are aiming to support these using buildtools tarball which should already be active on centos7/debian8 (but not ubuntu1604) so I'm a little worried this may point to a problem with the buildtools tarball :(
Unfortunately I think we need to get to the bottom of it. One possibility which I'm wondering about is ehther its possible that some binary is not being relocated by uninative but most are and that could be causing some of the issues. That is just a wild guess though.
Cheers,
Richard
Quoted 7 lines · Richard Purdie
On Sun, 2020-04-26 at 22:40 +0200, Alexander Kanavin wrote:
...Quoted 5 lines
What is particularly odd is that the centos/debian failures are non-
deterministic: in some cases rpm-native fails to build due to missingomp.h, in other cases it builds, but the resulting binaries segfault.
...
Ubuntu always segfaults, but maybe it's just coincidental.
Quoted 6 lines
...
We are aiming to support these using buildtools tarball which should already be active on centos7/debian8 (but not ubuntu1604) so I'm a little worried this may point to a problem with the buildtools tarball :(
...
I don't see omp.h installed anywhere by the buildtools-extended tarball. This would explain the build failures.
gcc 6 updated OpenMP support from OpenMP 4.0 to OpenMP 4.5. This might be a plausible explanation for segfaults on systems with older libgomp.
Quoted 3 lines
Cheers,
Richard
cu
Adrian
Quoted 7 lines · Adrian Bunk
I don't see
omp.hinstalled anywhere by the buildtools-extended tarball. This would explain the build failures.gcc 6 updated OpenMP support from OpenMP 4.0 to OpenMP 4.5. This might be a plausible explanation for segfaults on systems with older libgomp.
Yes, I thought of sending a patch that adds libgomp-dev to the extended tarball, but... the mysterious problem is, in some cases, rpm-native will compile on the same worker machines without any failure (and maybe it then gets linked against 'wrong' gomp, hence failures) - see links above. I'd like to try to ssh in and see how this could happen.
Alex
Quoted 9 lines · Alexander Kanavin
Quoted 6 lines · Adrian Bunk
I don't see
omp.hinstalled anywhere by the buildtools-extended tarball. This would explain the build failures.gcc 6 updated OpenMP support from OpenMP 4.0 to OpenMP 4.5. This might be a plausible explanation for segfaults on systems with older libgomp.
Quoted 5 lines
Yes, I thought of sending a patch that adds libgomp-dev to the extended tarball, but... the mysterious problem is, in some cases, rpm-native will compile on the same worker machines without any failure (and maybe it then gets linked against 'wrong' gomp, hence failures) - see links above. I'd like to try to ssh in and see how this could happen.
Richard had a possible explanation for that:
Quoted 5 lines · Richard Purdie
I think what may happen is that sstate may become populated and then builds proceed further than they did previously.
Alex
cu
Adrian
Quoted 13 lines · Adrian Bunk
Quoted 3 lines
Yes, I thought of sending a patch that adds libgomp-dev to the extended tarball, but... the mysterious problem is, in some cases, rpm-native will compile on the same worker machines without any failure (and maybe it
then
Quoted 2 lines
gets linked against 'wrong' gomp, hence failures) - see links above. I'd like to try to ssh in and see how this could happen.
Richard had a possible explanation for that:
Quoted 2 lines · Richard Purdie
I think what may happen is that sstate may become populated and then builds proceed further than they did previously.
I still don't understand this. In both cases, rpm-native is compiled (not taken from sstate). In one case, it fails due to missing omp.h, but in another, do_compile completes without error. How does sstate influence this?
I think the build should be run again, then particularly the build directory of debian/centos where rpm-native was able to complete should be preserved. I suspect it succeeds because,
somehow, the old gcc from the host is used, which might be a serious issue :(
After that we can look into the (most likely different) issue of providing the header via buildtools-tarball.
Alex
Quoted 14 lines · Alexander Kanavin
Quoted 13 lines · Adrian Bunk
Quoted 1 line
Yes, I thought of sending a patch that adds libgomp-dev to the
extended
Quoted 1 line
tarball, but... the mysterious problem is, in some cases, rpm-
native will
Quoted 1 line
compile on the same worker machines without any failure (and
maybe it then
Quoted 1 line
gets linked against 'wrong' gomp, hence failures) - see links
above. I'd
Quoted 1 line
like to try to ssh in and see how this could happen.
Richard had a possible explanation for that:
On Sun, Apr 26, 2020 at 10:07:30PM +0100, Richard Purdie wrote:
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
I think what may happen is that sstate may become populated and
then
Quoted 1 line
builds proceed further than they did previously.
I still don't understand this. In both cases, rpm-native is compiled (not taken from sstate). In one case, it fails due to missing
omp.h, but in another,do_compilecompletes without error. How does sstate influence this?
Have you a pointer to a build where this succeeds and one where it fails?
Quoted 8 lines
I think the build should be run again, then particularly the build directory of debian/centos where rpm-native was able to complete should be preserved. I suspect it succeeds because, somehow, the old gcc from the host is used, which might be a serious issue :(
After that we can look into the (most likely different) issue of providing the header via buildtools-tarball.
The infrastructure doesn't make it very easy to do that unfortunately. I can do it but it will involve shutting down all the cleanup processes, stopping all other builds, monitoring and manually coercing things back to the "right" state for you to look at. I can do that but it will take me several hours.
Cheers,
Richard
Quoted 8 lines · Richard Purdie
Quoted 4 lines
I still don't understand this. In both cases, rpm-native is compiled (not taken from sstate). In one case, it fails due to missing
omp.h, but in another,do_compilecompletes without error. How does sstate influence this?Have you a pointer to a build where this succeeds and one where it fails?
Yes, from a few emails back:
https://autobuilder.yoctoproject.org/typhoon/#/builders/75/builds/1812
https://autobuilder.yoctoproject.org/typhoon/#/builders/15/builds/2073
I can't ssh into that worker for some reason.
Alex
Quoted 6 lines · Alexander Kanavin
Quoted 5 lines · Richard Purdie
Quoted 4 lines
I still don't understand this. In both cases, rpm-native is compiled (not taken from sstate). In one case, it fails due to missing
omp.h, but in another,do_compilecompletes without error. How does sstate influence this?
Quoted 8 lines
Quoted 2 lines
Have you a pointer to a build where this succeeds and one where it fails?
Yes, from a few emails back:
https://autobuilder.yoctoproject.org/typhoon/#/builders/75/builds/1812
https://autobuilder.yoctoproject.org/typhoon/#/builders/15/builds/2073I can't ssh into that worker for some reason.
Ok, I can't either.
I've removed the janitor from centos-ty-4.yocto.io, added the patches back to master-next and then triggered non-gplv3 and poky-tiny builds of master-next on that specific worker.
That worker is backed up with jobs so only one is running right now. When they complete I just need to rescue the build from the cleanup.
Cheers,
Richard