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} | 15 +-
9 files changed, 90 insertions(+), 844 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} (90%)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 -10
@@ -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,18 +34,14 @@ 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-rpmfc.c-do-not-run-file-classification-in-parallel.patch \ " PE = "1" -SRCREV = "4a9440006398646583f0d9ae1837dad2875013aa" +SRCREV = "ab2179452c5be276a6b96c591afded485c7e58c3" S = "${WORKDIR}/git"
@@ -59,7 +55,7 @@ export PYTHON_ABI EXTRA_AUTORECONF_append = " --exclude=gnu-configize" EXTRA_OECONF_append = " --without-lua --enable-python" -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 #
@@ -125,8 +121,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.17.1
PATCH 2/15 libdnf: upgrade 0.28.1 -> 0.38.1
Add 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.
---
.../libdnf/0001-Add-WITH_TESTS-option.patch | 12 +++---
...nly-if-documentation-is-actually-ena.patch | 42 +++++++++++++++++++
.../{libdnf_0.28.1.bb => libdnf_0.38.1.bb} | 5 ++-
3 files changed, 52 insertions(+), 7 deletions(-)
create mode 100644 meta/recipes-devtools/libdnf/libdnf/0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch
rename meta/recipes-devtools/libdnf/{libdnf_0.28.1.bb => libdnf_0.38.1.bb} (84%)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_0.38.1.bb renamed from meta/recipes-devtools/libdnf/libdnf_0.28.1.bb +4 -1
@@ -7,9 +7,10 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf \ 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-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch \ " -SRCREV = "751f89045b80d58c0d05800f74357cf78cdf7e77" +SRCREV = "db4b61afdf65a2b791a58ad8e5c5be70a7fc123c" S = "${WORKDIR}/git"
@@ -20,6 +21,8 @@ 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.17.1
Re: [PATCH 02/15] libdnf: upgrade 0.28.1 -> 0.38.1
FAILED: libdnf/CMakeFiles/libdnf.dir/dnf-context.cpp.o /home/pokybuild/yocto-worker/buildtools/build/build/tmp/work/x86_64-linux/libdnf-native/0.38.1-r0/git/libdnf/dnf-context.cpp:2618:8: error: ‘atomic_flag’ in namespace ‘std’ does not name a type
static std::atomic_flag cfgMainLoaded = ATOMIC_FLAG_INIT;
^
/home/pokybuild/yocto-worker/buildtools/build/build/tmp/work/x86_64-linux/libdnf-native/0.38.1-r0/git/libdnf/dnf-context.cpp: In function ‘libdnf::ConfigMain& libdnf::getGlobalMainConfig()’:
/home/pokybuild/yocto-worker/buildtools/build/build/tmp/work/x86_64-linux/libdnf-native/0.38.1-r0/git/libdnf/dnf-context.cpp:2622:10: error: ‘cfgMainLoaded’ was not declared in this scope
if (!cfgMainLoaded.test_and_set()) {
^This was on a Centos 7 worker...
Ross
Re: [PATCH 02/15] libdnf: upgrade 0.28.1 -> 0.38.1
Quoted 5 lines · Ross Burton
FAILED:
libdnf/CMakeFiles/libdnf.dir/dnf-context.cpp.o/home/pokybuild/yocto-worker/buildtools/build/build/tmp/work/x86_64-linux/libdnf-native/0.38.1-r0/git/libdnf/dnf-context.cpp:2618:8:
error: ‘atomic_flag’ in namespace ‘std’ does not name a typestatic std::atomic_flag cfgMainLoaded = ATOMIC_FLAG_INIT; ^
Quoted 7 lines
/home/pokybuild/yocto-worker/buildtools/build/build/tmp/work/x86_64-linux/libdnf-native/0.38.1-r0/git/libdnf/dnf-context.cpp:
In function ‘libdnf::ConfigMain& libdnf::getGlobalMainConfig()’:/home/pokybuild/yocto-worker/buildtools/build/build/tmp/work/x86_64-linux/libdnf-native/0.38.1-r0/git/libdnf/dnf-context.cpp:2622:10:
error: ‘cfgMainLoaded’ was not declared in this scopeif (!cfgMainLoaded.test_and_set()) { ^This was on a Centos 7 worker...
The build should also fail on Ubuntu 16.04.
Building with -std=gnu++11 should fix it (untested).
Quoted 1 line
Ross
cu
Adrian
Re: [PATCH 02/15] libdnf: upgrade 0.28.1 -> 0.38.1
It's using -std=c++11. I'm not sure if switching to gnu flavour would have made a difference with gcc 4.8 provided in centos 7 and gcc 4.9 from Debian 8 - is it worth trying? Newer gcc versions don't complain and build this without error while still using -std=c++11.
I'm leaning towards taking out the dnf/libdnf updates until these distros are retired from the supported distro list.
Alex
Quoted 26 lines · Adrian Bunk
Quoted 2 lines · Ross Burton
FAILED:
libdnf/CMakeFiles/libdnf.dir/dnf-context.cpp.o
/home/pokybuild/yocto-worker/buildtools/build/build/tmp/work/x86_64-linux/libdnf-native/0.38.1-r0/git/libdnf/dnf-context.cpp:2618:8:Quoted 4 lines
error: ‘atomic_flag’ in namespace ‘std’ does not name a type
static std::atomic_flag cfgMainLoaded = ATOMIC_FLAG_INIT; ^
/home/pokybuild/yocto-worker/buildtools/build/build/tmp/work/x86_64-linux/libdnf-native/0.38.1-r0/git/libdnf/dnf-context.cpp:Quoted 2 lines
In function ‘libdnf::ConfigMain& libdnf::getGlobalMainConfig()’:
/home/pokybuild/yocto-worker/buildtools/build/build/tmp/work/x86_64-linux/libdnf-native/0.38.1-r0/git/libdnf/dnf-context.cpp:2622:10:Quoted 4 lines
error: ‘cfgMainLoaded’ was not declared in this scope
if (!cfgMainLoaded.test_and_set()) { ^This was on a Centos 7 worker...
The build should also fail on Ubuntu 16.04.
Building with -std=gnu++11 should fix it (untested).
Quoted 1 line
Ross
cu
Adrian
Re: [PATCH 02/15] libdnf: upgrade 0.28.1 -> 0.38.1
Quoted 1 line · Alexander Kanavin
It's using -std=c++11.
Oh.
Quoted 3 lines
I'm not sure if switching to gnu flavour would have
made a difference with gcc 4.8 provided in centos 7 and gcc 4.9 from Debian 8 - is it worth trying?
No, it doesn't make a difference.
Quoted 5 lines
Newer gcc versions don't complain and build this
without error while still using -std=c++11.I'm leaning towards taking out the dnf/libdnf updates until these distros are retired from the supported distro list.
I was able to reproduce the error in an Ubuntu 14.04 chroot, but no immediate clue whether it is easily fixable.
Quoted 1 line
Alex
cu
Adrian
Re: [PATCH 02/15] libdnf: upgrade 0.28.1 -> 0.38.1
In reply to Alexander KanavinQuoted 4 lines · Alexander Kanavin
It's using -std=c++11. I'm not sure if switching to gnu flavour would have made a difference with gcc 4.8 provided in centos 7 and gcc 4.9 from Debian 8 - is it worth trying? Newer gcc versions don't complain and build this without error while still using -std=c++11.
I'm leaning towards taking out the dnf/libdnf updates until these distros are retired from the supported distro list.
try adding #include <atomic> in libdnf/dnf-context.cpp
Quoted 33 lines
Alex
Quoted 15 lines · Adrian Bunk
Quoted 5 lines · Ross Burton
FAILED:
libdnf/CMakeFiles/libdnf.dir/dnf-context.cpp.o/home/pokybuild/yocto-worker/buildtools/build/build/tmp/work/x86_64-linux/libdnf-native/0.38.1-r0/git/libdnf/dnf-context.cpp:2618:8:
error: ‘atomic_flag’ in namespace ‘std’ does not name a typestatic std::atomic_flag cfgMainLoaded = ATOMIC_FLAG_INIT; ^Quoted 7 lines
/home/pokybuild/yocto-worker/buildtools/build/build/tmp/work/x86_64-linux/libdnf-native/0.38.1-r0/git/libdnf/dnf-context.cpp:
In function ‘libdnf::ConfigMain& libdnf::getGlobalMainConfig()’:/home/pokybuild/yocto-worker/buildtools/build/build/tmp/work/x86_64-linux/libdnf-native/0.38.1-r0/git/libdnf/dnf-context.cpp:2622:10:
error: ‘cfgMainLoaded’ was not declared in this scopeif (!cfgMainLoaded.test_and_set()) { ^This was on a Centos 7 worker...
Quoted 8 lines
The build should also fail on Ubuntu 16.04.
Building with -std=gnu++11 should fix it (untested).
Quoted 1 line
Ross
cu
Adrian--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [PATCH 02/15] libdnf: upgrade 0.28.1 -> 0.38.1
Quoted 7 lines · Khem Raj
Quoted 4 lines · Alexander Kanavin
It's using -std=c++11. I'm not sure if switching to gnu flavour would have made a difference with gcc 4.8 provided in centos 7 and gcc 4.9 from Debian 8 - is it worth trying? Newer gcc versions don't complain and build this without error while still using -std=c++11.
I'm leaning towards taking out the dnf/libdnf updates until these distros are retired from the supported distro list.
try adding #include <atomic> in libdnf/dnf-context.cpp
Same failure.
cu
Adrian
Re: [PATCH 02/15] libdnf: upgrade 0.28.1 -> 0.38.1
Quoted 11 lines · Adrian Bunk
Quoted 7 lines · Khem Raj
Quoted 4 lines · Alexander Kanavin
It's using -std=c++11. I'm not sure if switching to gnu flavour would have made a difference with gcc 4.8 provided in centos 7 and gcc 4.9 from Debian 8 - is it worth trying? Newer gcc versions don't complain and build this without error while still using -std=c++11.
I'm leaning towards taking out the dnf/libdnf updates until these distros are retired from the supported distro list.
try adding #include <atomic> in libdnf/dnf-context.cpp
Same failure.
#include <atomic>
int foo(){
std::atomic_flag cfgMainLoaded = ATOMIC_FLAG_INIT;
}
does above example compile fine with
g++-4.8 -c -std=c++11
Quoted 3 lines
cu
Adrian
PATCH 3/15 dnf: upgrade 4.2.2 -> 4.2.16
In reply to Alexander Kanavin---
meta/recipes-devtools/dnf/{dnf_4.2.2.bb => dnf_4.2.16.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/dnf/{dnf_4.2.2.bb => dnf_4.2.16.bb} (98%)meta/recipes-devtools/dnf/dnf_4.2.16.bb renamed from meta/recipes-devtools/dnf/dnf_4.2.2.bb +1 -1
@@ -15,7 +15,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \ file://0030-Run-python-scripts-using-env.patch \ " -SRCREV = "9947306a55271b8b7c9e2b6e3b7d582885b6045d" +SRCREV = "4c74fe24c4232ce6bbde4b252f9715cdb29923f0" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git"
Signature · 1 line
2.17.1
PATCH 4/15 gettext-minimal-native: update to 0.20.1
In reply to Alexander KanavinRather than update a tarball, I took m4 files directly from an install of 0.20.1.
The patch is dropped as guile has long been removed from oe-core.
---
...H-Disable-the-test-to-convert-euc-jp.patch | 38 -
.../gettext-minimal-0.19.8.1/aclocal.tgz | Bin 40014 -> 0 bytes
.../COPYING | 0
.../Makefile.in.in | 124 +--
.../gettext-minimal-0.20.1/aclocal/gettext.m4 | 386 +++++++++
.../aclocal/host-cpu-c-abi.m4 | 644 +++++++++++++++
.../gettext-minimal-0.20.1/aclocal/iconv.m4 | 288 +++++++
.../aclocal/intlmacosx.m4 | 72 ++
.../gettext-minimal-0.20.1/aclocal/lib-ld.m4 | 168 ++++
.../aclocal/lib-link.m4 | 774 ++++++++++++++++++
.../aclocal/lib-prefix.m4 | 249 ++++++
.../gettext-minimal-0.20.1/aclocal/nls.m4 | 32 +
.../gettext-minimal-0.20.1/aclocal/po.m4 | 450 ++++++++++
.../aclocal/progtest.m4 | 91 ++
.../config.rpath | 2 +-
.../remove-potcdate.sin | 8 +-
....1.bb => gettext-minimal-native_0.20.1.bb} | 5 +-
17 files changed, 3236 insertions(+), 95 deletions(-)
delete mode 100644 meta/recipes-core/gettext/gettext-minimal-0.19.8.1/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch
delete mode 100644 meta/recipes-core/gettext/gettext-minimal-0.19.8.1/aclocal.tgz
rename meta/recipes-core/gettext/{gettext-minimal-0.19.8.1 => gettext-minimal-0.20.1}/COPYING (100%)
rename meta/recipes-core/gettext/{gettext-minimal-0.19.8.1 => gettext-minimal-0.20.1}/Makefile.in.in (78%)
create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/gettext.m4
create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/host-cpu-c-abi.m4
create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/iconv.m4
create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/intlmacosx.m4
create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-ld.m4
create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-link.m4
create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-prefix.m4
create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/nls.m4
create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/po.m4
create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/progtest.m4
rename meta/recipes-core/gettext/{gettext-minimal-0.19.8.1 => gettext-minimal-0.20.1}/config.rpath (99%)
rename meta/recipes-core/gettext/{gettext-minimal-0.19.8.1 => gettext-minimal-0.20.1}/remove-potcdate.sin (50%)
rename meta/recipes-core/gettext/{gettext-minimal-native_0.19.8.1.bb => gettext-minimal-native_0.20.1.bb} (86%)meta/recipes-core/gettext/gettext-minimal-0.19.8.1/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch deleted +0 -38
@@ -1,38 +0,0 @@ -[PATCH] Disable the test to convert euc-jp - -Remove the test "Test against HP-UX 11.11 bug: -No converter from EUC-JP to UTF-8 is provided" -since we don't support HP-UX and if the euc-jp is not -installed on the host, the dependence will be built without -iconv support and will cause guile-native building fail. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Roy Li <[email protected]> ---- - iconv.m4 | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/iconv.m4 b/iconv.m4 -index 4e37363..35f54bd 100644 ---- a/iconv.m4 -+++ b/iconv.m4 -@@ -165,6 +165,7 @@ AC_DEFUN([AM_ICONV_LINK], - } - } - #endif -+#if 0 - /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is - provided. */ - if (/* Try standardized names. */ -@@ -176,6 +177,7 @@ AC_DEFUN([AM_ICONV_LINK], - /* Try HP-UX names. */ - && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) - result |= 16; -+#endif - return result; - ]])], - [am_cv_func_iconv_works=yes], , --- -2.0.1 -
meta/recipes-core/gettext/gettext-minimal-0.19.8.1/aclocal.tgz deleted binary +0 -0
meta/recipes-core/gettext/gettext-minimal-0.20.1/COPYING renamed from meta/recipes-core/gettext/gettext-minimal-0.19.8.1/COPYING +0 -0
meta/recipes-core/gettext/gettext-minimal-0.20.1/Makefile.in.in renamed from meta/recipes-core/gettext/gettext-minimal-0.19.8.1/Makefile.in.in +72 -52
244 lines not on this page · raw message
meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/gettext.m4 new file +386 -0
386 lines not on this page · raw message
meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/host-cpu-c-abi.m4 new file +644 -0
644 lines not on this page · raw message
meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/iconv.m4 new file +288 -0
288 lines not on this page · raw message
meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/intlmacosx.m4 new file +72 -0
72 lines not on this page · raw message
meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-ld.m4 new file +168 -0
168 lines not on this page · raw message
meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-link.m4 new file +774 -0
774 lines not on this page · raw message
meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-prefix.m4 new file +249 -0
249 lines not on this page · raw message
meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/nls.m4 new file +32 -0
@@ -0,0 +1,32 @@ +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019 Free Software +dnl Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper <[email protected]>, 1995-2000. +dnl Bruno Haible <[email protected]>, 2000-2003. + +AC_PREREQ([2.50]) + +AC_DEFUN([AM_NLS], +[ + AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE([nls], + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) +])
meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/po.m4 new file +450 -0
105 lines not on this page · raw message
meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/progtest.m4 new file +91 -0
91 lines not on this page · raw message
meta/recipes-core/gettext/gettext-minimal-0.20.1/config.rpath renamed from meta/recipes-core/gettext/gettext-minimal-0.19.8.1/config.rpath +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-core/gettext/gettext-minimal-0.20.1/remove-potcdate.sin renamed from meta/recipes-core/gettext/gettext-minimal-0.19.8.1/remove-potcdate.sin +7 -1
Lines of this file are not shown. View the raw message.
meta/recipes-core/gettext/gettext-minimal-native_0.20.1.bb renamed from meta/recipes-core/gettext/gettext-minimal-native_0.19.8.1.bb +2 -3
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.17.1
Part of the diff is not shown here. View the raw message.
PATCH 5/15 gettext: update to 0.20.1
In reply to Alexander KanavinLicense-Update: URLs changed from http to https
---
.../gettext-0.19.8.1/fix-CVE-2018-18751.patch | 141 ----
.../gettext/gettext-0.19.8.1/parallel.patch | 23 -
.../gettext-0.19.8.1/use-pkgconfig.patch | 321 --------
.../add-with-bisonlocaledir.patch | 0
...nt.c-timsort.h-fix-formatting-issues.patch | 30 +-
.../gettext/gettext-0.20.1/parallel.patch | 32 +
.../run-ptest | 0
.../serial-tests-config.patch | 26 +-
.../gettext-0.20.1/use-pkgconfig.patch | 713 ++++++++++++++++++
...{gettext_0.19.8.1.bb => gettext_0.20.1.bb} | 23 +-
10 files changed, 775 insertions(+), 534 deletions(-)
delete mode 100644 meta/recipes-core/gettext/gettext-0.19.8.1/fix-CVE-2018-18751.patch
delete mode 100644 meta/recipes-core/gettext/gettext-0.19.8.1/parallel.patch
delete mode 100644 meta/recipes-core/gettext/gettext-0.19.8.1/use-pkgconfig.patch
rename meta/recipes-core/gettext/{gettext-0.19.8.1 => gettext-0.20.1}/add-with-bisonlocaledir.patch (100%)
rename meta/recipes-core/gettext/{gettext-0.19.8.1 => gettext-0.20.1}/cr-statement.c-timsort.h-fix-formatting-issues.patch (68%)
create mode 100644 meta/recipes-core/gettext/gettext-0.20.1/parallel.patch
rename meta/recipes-core/gettext/{gettext-0.19.8.1 => gettext-0.20.1}/run-ptest (100%)
rename meta/recipes-core/gettext/{gettext-0.19.8.1 => gettext-0.20.1}/serial-tests-config.patch (75%)
create mode 100644 meta/recipes-core/gettext/gettext-0.20.1/use-pkgconfig.patch
rename meta/recipes-core/gettext/{gettext_0.19.8.1.bb => gettext_0.20.1.bb} (94%)meta/recipes-core/gettext/gettext-0.19.8.1/fix-CVE-2018-18751.patch deleted +0 -141
@@ -1,141 +0,0 @@ -Upstream-Status: Backport [https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commit;h=dce3a16] -CVE: CVE-2018-18751 - -Signed-off-by: Kai Kang <[email protected]> - -From dce3a16e5e9368245735e29bf498dcd5e3e474a4 Mon Sep 17 00:00:00 2001 -From: Daiki Ueno <[email protected]> -Date: Thu, 15 Sep 2016 13:57:24 +0200 -Subject: [PATCH] xgettext: Fix crash with *.po file input - -When xgettext was given two *.po files with the same msgid_plural, it -crashed with double-free. Problem reported by Davlet Panech in: -http://lists.gnu.org/archive/html/bug-gettext/2016-09/msg00001.html -* gettext-tools/src/po-gram-gen.y: Don't free msgid_pluralform after -calling do_callback_message, assuming that it takes ownership. -* gettext-tools/src/read-catalog.c (default_add_message): Free -msgid_plural after calling message_alloc. -* gettext-tools/tests/xgettext-po-2: New file. -* gettext-tools/tests/Makefile.am (TESTS): Add new test. ---- - gettext-tools/src/po-gram-gen.y | 13 ++++----- - gettext-tools/src/read-catalog.c | 2 ++ - gettext-tools/tests/Makefile.am | 2 +- - gettext-tools/tests/xgettext-po-2 | 55 +++++++++++++++++++++++++++++++++++++++ - 4 files changed, 63 insertions(+), 9 deletions(-) - create mode 100755 gettext-tools/tests/xgettext-po-2 - -diff --git a/gettext-tools/src/po-gram-gen.y b/gettext-tools/src/po-gram-gen.y -index becf5e6..4428e77 100644 ---- a/gettext-tools/src/po-gram-gen.y -+++ b/gettext-tools/src/po-gram-gen.y -@@ -221,14 +221,11 @@ message - check_obsolete ($1, $3); - check_obsolete ($1, $4); - if (!$1.obsolete || pass_obsolete_entries) -- { -- do_callback_message ($1.ctxt, string2, &$1.pos, $3.string, -- $4.rhs.msgstr, $4.rhs.msgstr_len, &$4.pos, -- $1.prev_ctxt, -- $1.prev_id, $1.prev_id_plural, -- $1.obsolete); -- free ($3.string); -- } -+ do_callback_message ($1.ctxt, string2, &$1.pos, $3.string, -+ $4.rhs.msgstr, $4.rhs.msgstr_len, &$4.pos, -+ $1.prev_ctxt, -+ $1.prev_id, $1.prev_id_plural, -+ $1.obsolete); - else - { - free_message_intro ($1); -diff --git a/gettext-tools/src/read-catalog.c b/gettext-tools/src/read-catalog.c -index 571d18e..6af6d20 100644 ---- a/gettext-tools/src/read-catalog.c -+++ b/gettext-tools/src/read-catalog.c -@@ -397,6 +397,8 @@ default_add_message (default_catalog_reader_ty *this, - appropriate. */ - mp = message_alloc (msgctxt, msgid, msgid_plural, msgstr, msgstr_len, - msgstr_pos); -+ if (msgid_plural != NULL) -+ free (msgid_plural); - mp->prev_msgctxt = prev_msgctxt; - mp->prev_msgid = prev_msgid; - mp->prev_msgid_plural = prev_msgid_plural; -diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am -index 23b09b1..0dfb4d8 100644 ---- a/gettext-tools/tests/Makefile.am -+++ b/gettext-tools/tests/Makefile.am -@@ -95,7 +95,7 @@ TESTS = gettext-1 gettext-2 gettext-3 gettext-4 gettext-5 gettext-6 gettext-7 \ - xgettext-perl-1 xgettext-perl-2 xgettext-perl-3 xgettext-perl-4 \ - xgettext-perl-5 xgettext-perl-6 xgettext-perl-7 xgettext-perl-8 \ - xgettext-php-1 xgettext-php-2 xgettext-php-3 xgettext-php-4 \ -- xgettext-po-1 \ -+ xgettext-po-1 xgettext-po-2 \ - xgettext-properties-1 \ - xgettext-python-1 xgettext-python-2 xgettext-python-3 \ - xgettext-python-4 \ -diff --git a/gettext-tools/tests/xgettext-po-2 b/gettext-tools/tests/xgettext-po-2 -new file mode 100755 -index 0000000..c4bd9d0 ---- /dev/null -+++ b/gettext-tools/tests/xgettext-po-2 -@@ -0,0 +1,55 @@ -+#! /bin/sh -+. "${srcdir=.}/init.sh"; path_prepend_ . ../src -+ -+# Test PO extractors with multiple input files. -+ -+cat <<EOF > xg-po-2-1.po -+msgid "first msgid" -+msgid_plural "first msgid (plural)" -+msgstr[0] "" -+msgstr[1] "" -+ -+msgid "second msgid" -+msgid_plural "second msgid (plural)" -+msgstr[0] "" -+msgstr[1] "" -+EOF -+ -+cat <<EOF > xg-po-2-2.po -+msgid "third msgid" -+msgid_plural "third msgid (plural)" -+msgstr[0] "" -+msgstr[1] "" -+ -+msgid "second msgid" -+msgid_plural "second msgid (plural)" -+msgstr[0] "" -+msgstr[1] "" -+EOF -+ -+: ${XGETTEXT=xgettext} -+${XGETTEXT} --omit-header xg-po-2-1.po xg-po-2-2.po -o xg-po-2.tmp.po || Exit 1 -+LC_ALL=C tr -d '\r' < xg-po-2.tmp.po > xg-po-2.po || Exit 1 -+ -+cat <<EOF > xg-po-2.ok -+msgid "first msgid" -+msgid_plural "first msgid (plural)" -+msgstr[0] "" -+msgstr[1] "" -+ -+msgid "second msgid" -+msgid_plural "second msgid (plural)" -+msgstr[0] "" -+msgstr[1] "" -+ -+msgid "third msgid" -+msgid_plural "third msgid (plural)" -+msgstr[0] "" -+msgstr[1] "" -+EOF -+ -+: ${DIFF=diff} -+${DIFF} xg-po-2.ok xg-po-2.po -+result=$? -+ -+exit $result --- -1.9.1 -
meta/recipes-core/gettext/gettext-0.19.8.1/parallel.patch deleted +0 -23
@@ -1,23 +0,0 @@ -instal libgettextlib.a before removing it - -In a multiple job build, Makefile can simultaneously -be installing and removing libgettextlib.a. We serialize -the operations. - -Upstream-Status: Pending - -Signed-off-by: Joe Slater <[email protected]> - ---- a/gettext-tools/gnulib-lib/Makefile.am -+++ b/gettext-tools/gnulib-lib/Makefile.am -@@ -57,6 +57,10 @@ endif - # Rules generated and collected by gnulib-tool. - include Makefile.gnulib - -+# defined in Makefile.gnulib but missing this dependency -+# -+install-exec-clean: install-libLTLIBRARIES -+ - # Which classes to export from the shared library. - MOOPPFLAGS += --dllexport=styled_ostream -
meta/recipes-core/gettext/gettext-0.19.8.1/use-pkgconfig.patch deleted +0 -321
321 lines not on this page · raw message
meta/recipes-core/gettext/gettext-0.20.1/add-with-bisonlocaledir.patch renamed from meta/recipes-core/gettext/gettext-0.19.8.1/add-with-bisonlocaledir.patch +0 -0
meta/recipes-core/gettext/gettext-0.20.1/cr-statement.c-timsort.h-fix-formatting-issues.patch renamed from meta/recipes-core/gettext/gettext-0.19.8.1/cr-statement.c-timsort.h-fix-formatting-issues.patch +7 -23
@@ -1,4 +1,4 @@ -From e546de65a333789e83f5485757967cee29ee3681 Mon Sep 17 00:00:00 2001 +From f6245ef5530fc37a6243e798df34162fbbeab6f0 Mon Sep 17 00:00:00 2001 From: Robert Yang <[email protected]> Date: Sun, 19 Feb 2017 23:32:46 -0800 Subject: [PATCH] cr-statement.c/timsort.h: fix formatting issues
@@ -15,15 +15,15 @@ gettext-tools/gnulib-lib/libxml/timsort.h:326:80: warning: format '%lu' expects Upstream-Status: Pending Signed-off-by: Robert Yang <[email protected]> + --- - gettext-tools/gnulib-lib/libcroco/cr-statement.c | 10 +++++----- - gettext-tools/gnulib-lib/libxml/timsort.h | 2 +- - 2 files changed, 6 insertions(+), 6 deletions(-) + libtextstyle/lib/libcroco/cr-statement.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) -diff --git a/gettext-tools/gnulib-lib/libcroco/cr-statement.c b/gettext-tools/gnulib-lib/libcroco/cr-statement.c +diff --git a/libtextstyle/lib/libcroco/cr-statement.c b/libtextstyle/lib/libcroco/cr-statement.c index 617520f..100104b 100644 ---- a/gettext-tools/gnulib-lib/libcroco/cr-statement.c -+++ b/gettext-tools/gnulib-lib/libcroco/cr-statement.c +--- a/libtextstyle/lib/libcroco/cr-statement.c ++++ b/libtextstyle/lib/libcroco/cr-statement.c @@ -2607,7 +2607,7 @@ cr_statement_dump_ruleset (CRStatement * a_this, FILE * a_fp, glong a_indent) g_return_if_fail (a_fp && a_this); str = cr_statement_ruleset_to_string (a_this, a_indent);
@@ -69,19 +69,3 @@ index 617520f..100104b 100644 g_free (str) ; str = NULL ; } -diff --git a/gettext-tools/gnulib-lib/libxml/timsort.h b/gettext-tools/gnulib-lib/libxml/timsort.h -index 795f272..443918a 100644 ---- a/gettext-tools/gnulib-lib/libxml/timsort.h -+++ b/gettext-tools/gnulib-lib/libxml/timsort.h -@@ -323,7 +323,7 @@ static void TIM_SORT_RESIZE(TEMP_STORAGE_T *store, const size_t new_size) - SORT_TYPE *tempstore = (SORT_TYPE *)realloc(store->storage, new_size * sizeof(SORT_TYPE)); - if (tempstore == NULL) - { -- fprintf(stderr, "Error allocating temporary storage for tim sort: need %lu bytes", sizeof(SORT_TYPE) * new_size); -+ fprintf(stderr, "Error allocating temporary storage for tim sort: need %zu bytes", sizeof(SORT_TYPE) * new_size); - exit(1); - } - store->storage = tempstore; --- -2.10.2 -
meta/recipes-core/gettext/gettext-0.20.1/parallel.patch new file +32 -0
@@ -0,0 +1,32 @@ +From 4a2a0a93b469093b60ffd0bec55d33d1e03d4713 Mon Sep 17 00:00:00 2001 +From: Joe Slater <[email protected]> +Date: Thu, 7 Jun 2012 16:37:01 -0700 +Subject: [PATCH] instal libgettextlib.a before removing it + +In a multiple job build, Makefile can simultaneously +be installing and removing libgettextlib.a. We serialize +the operations. + +Upstream-Status: Pending + +Signed-off-by: Joe Slater <[email protected]> + +--- + gettext-tools/gnulib-lib/Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/gettext-tools/gnulib-lib/Makefile.am b/gettext-tools/gnulib-lib/Makefile.am +index 2126699..d2dd7e4 100644 +--- a/gettext-tools/gnulib-lib/Makefile.am ++++ b/gettext-tools/gnulib-lib/Makefile.am +@@ -58,6 +58,10 @@ endif + # Rules generated and collected by gnulib-tool. + include Makefile.gnulib + ++# defined in Makefile.gnulib but missing this dependency ++# ++install-exec-clean: install-libLTLIBRARIES ++ + # OS/2 does not support a DLL name longer than 8 characters. + if OS2 + libgettextlib_la_LDFLAGS += -os2dllname gtlib
meta/recipes-core/gettext/gettext-0.20.1/run-ptest renamed from meta/recipes-core/gettext/gettext-0.19.8.1/run-ptest +0 -0
meta/recipes-core/gettext/gettext-0.20.1/serial-tests-config.patch renamed from meta/recipes-core/gettext/gettext-0.19.8.1/serial-tests-config.patch +12 -14
@@ -1,4 +1,4 @@ -From c4b1f3a0c7b7c40b343be9b95deb84e0485643be Mon Sep 17 00:00:00 2001 +From ed64a5724ef7d6eb4e9a876f817ea266a536e195 Mon Sep 17 00:00:00 2001 From: "Hongjun.Yang" <[email protected]> Date: Thu, 28 Jul 2016 12:36:15 +0800 Subject: [PATCH] fix for ptest
@@ -8,6 +8,7 @@ Add serial-tests support, ptest need it Upstream-Status: Inappropriate [oe specific] Signed-off-by: Changqing Li <[email protected]> + --- configure.ac | 2 +- gettext-runtime/configure.ac | 2 +-
@@ -15,24 +16,24 @@ Signed-off-by: Changqing Li <[email protected]> 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 5e996fa..880581f 100644 +index 38db6fd..f019ae0 100644 --- a/configure.ac +++ b/configure.ac -@@ -23,7 +23,7 @@ AC_INIT([gettext], - [[email protected]]) +@@ -22,7 +22,7 @@ AC_INIT([gettext], + [[email protected]]) AC_CONFIG_SRCDIR([gettext-tools/src/msgfmt.c]) AC_CONFIG_AUX_DIR([build-aux]) --AM_INIT_AUTOMAKE([1.13 silent-rules parallel-tests dist-xz dist-lzip]) -+AM_INIT_AUTOMAKE([1.13 silent-rules serial-tests dist-xz dist-lzip]) +-AM_INIT_AUTOMAKE([1.13 silent-rules parallel-tests tar-ustar]) ++AM_INIT_AUTOMAKE([1.13 silent-rules serial-tests tar-ustar]) dnl Override automake's tar command used for creating distributions. - am__tar='${AMTAR} chof - --owner=root --group=root "$$tardir"' + am__tar='${AMTAR} chf - --format=ustar --owner=root --group=root "$$tardir"' diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac -index e9299b6..d4f5528 100644 +index de203e7..138a07f 100644 --- a/gettext-runtime/configure.ac +++ b/gettext-runtime/configure.ac @@ -22,7 +22,7 @@ AC_INIT([gettext-runtime], - [[email protected]]) + [[email protected]]) AC_CONFIG_SRCDIR([intl/dcigettext.c]) AC_CONFIG_AUX_DIR([../build-aux]) -AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests])
@@ -41,11 +42,11 @@ index e9299b6..d4f5528 100644 dnl Installation directories. diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac -index 920eeb6..c507434 100644 +index cf1dd73..b544d6d 100644 --- a/gettext-tools/configure.ac +++ b/gettext-tools/configure.ac @@ -22,7 +22,7 @@ AC_INIT([gettext-tools], - [[email protected]]) + [[email protected]]) AC_CONFIG_SRCDIR([src/msgfmt.c]) AC_CONFIG_AUX_DIR([../build-aux]) -AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests])
@@ -53,6 +54,3 @@ index 920eeb6..c507434 100644 AC_CONFIG_HEADERS([config.h]) dnl Installation directories. --- -2.1.4 -
meta/recipes-core/gettext/gettext-0.20.1/use-pkgconfig.patch new file +713 -0
713 lines not on this page · raw message
meta/recipes-core/gettext/gettext_0.20.1.bb renamed from meta/recipes-core/gettext/gettext_0.19.8.1.bb +11 -12
@@ -6,7 +6,7 @@ a few stand-alone programs to massage in various ways the sets of translatable a HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" SECTION = "libs" LICENSE = "GPLv3+ & LGPL-2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e" # Because po-gram-gen.y has been modified by fix-CVE-2018-18751.patch, # it requires yacc which provided by bison-native
@@ -17,17 +17,16 @@ PROVIDES = "virtual/libintl virtual/gettext" PROVIDES_class-native = "virtual/gettext-native" RCONFLICTS_${PN} = "proxy-libintl" SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ - file://parallel.patch \ - file://add-with-bisonlocaledir.patch \ - file://cr-statement.c-timsort.h-fix-formatting-issues.patch \ - file://use-pkgconfig.patch \ - file://fix-CVE-2018-18751.patch \ - file://run-ptest \ - file://serial-tests-config.patch \ -" + file://parallel.patch \ + file://add-with-bisonlocaledir.patch \ + file://cr-statement.c-timsort.h-fix-formatting-issues.patch \ + file://use-pkgconfig.patch \ + file://run-ptest \ + file://serial-tests-config.patch \ + " -SRC_URI[md5sum] = "97e034cf8ce5ba73a28ff6c3c0638092" -SRC_URI[sha256sum] = "ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c125c43" +SRC_URI[md5sum] = "bb5b0c0caa028105f3ca1905ddc306e2" +SRC_URI[sha256sum] = "66415634c6e8c3fa8b71362879ec7575e27da43da562c798a8a2f223e6e47f5c" inherit autotools texinfo pkgconfig ptest
@@ -127,7 +126,7 @@ do_install_append_class-native () { rm ${D}${datadir}/gettext/po/remove-potcdate.sin create_wrapper ${D}${bindir}/msgfmt \ - GETTEXTDATADIR="${STAGING_DATADIR_NATIVE}/gettext-0.19.8/" + GETTEXTDATADIR="${STAGING_DATADIR_NATIVE}/gettext-0.20/" }
Signature · 1 line
2.17.1
PATCH 6/15 lrzsz: fix issues with newer versions of gettext
In reply to Alexander Kanavin--- ...-issues-with-recent-gettext-versions.patch | 42 +++++++++++++++++++ meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb | 11 ++--- 2 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-bsp/lrzsz/lrzsz-0.12.20/0009-Fix-issues-with-recent-gettext-versions.patch
meta/recipes-bsp/lrzsz/lrzsz-0.12.20/0009-Fix-issues-with-recent-gettext-versions.patch new file +42 -0
@@ -0,0 +1,42 @@ +From 245c104267363c13f2ba83eca4409c673ee99fcf Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Thu, 21 Nov 2019 12:34:56 +0100 +Subject: [PATCH] Fix issues with recent gettext versions + +[external] is required by recent gettext versions, +USE_INCLUDED_LIBINTL is no longer defined by the gettext m4 +macro and was never documented anyway. + +Upstream-Status: Inappropriate [upstream is dead] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + configure.in | 2 +- + intl/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index aa20263..4bde433 100644 +--- a/configure.in ++++ b/configure.in +@@ -256,7 +256,7 @@ AC_SUBST(CFLAGS) + AC_SUBST(LDFLAGS) + AC_SUBST(LIBS) + +-AM_GNU_GETTEXT ++AM_GNU_GETTEXT([external]) + + AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME",[locale directory]) + +diff --git a/intl/Makefile.in b/intl/Makefile.in +index bbac1d5..7629a94 100644 +--- a/intl/Makefile.in ++++ b/intl/Makefile.in +@@ -138,7 +138,7 @@ libgnuintl.h.msvc-static libgnuintl.h.msvc-shared README.woe32 Makefile.msvc + DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \ + COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h + +-all: all-@USE_INCLUDED_LIBINTL@ ++all: all-no-no + all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed + all-no: all-no-@BUILD_INCLUDED_LIBINTL@ + all-no-yes: libgnuintl.$la
meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb +6 -5
@@ -13,14 +13,15 @@ DEPENDS = "" PR = "r6" SRC_URI = "http://www.ohse.de/uwe/releases/lrzsz-${PV}.tar.gz \ - file://autotools.patch \ - file://makefile.patch \ - file://gettext.patch \ - file://acdefine.patch \ - file://lrzsz_fix_for_automake-1.12.patch \ + file://autotools.patch \ + file://makefile.patch \ + file://gettext.patch \ + file://acdefine.patch \ + file://lrzsz_fix_for_automake-1.12.patch \ file://lrzsz-check-locale.h.patch \ file://cve-2018-10195.patch \ file://include.patch \ + file://0009-Fix-issues-with-recent-gettext-versions.patch \ " SRC_URI[md5sum] = "b5ce6a74abc9b9eb2af94dffdfd372a4"
Signature · 1 line
2.17.1
PATCH 7/15 p11-kit: convert to meson
In reply to Alexander Kanavin--- .../p11-kit/p11-kit_0.23.18.1.bb | 30 ++++--------------- 1 file changed, 6 insertions(+), 24 deletions(-)
meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb +6 -24
@@ -2,38 +2,20 @@ SUMMARY = "Provides a way to load and enumerate PKCS#11 modules" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=02933887f609807fbb57aa4237d14a50" -inherit autotools gettext pkgconfig gtk-doc +inherit meson gettext pkgconfig gtk-doc DEPENDS = "libtasn1 libffi" +DEPENDS_append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" + SRC_URI = "git://github.com/p11-glue/p11-kit" SRCREV = "b0ebe7555c291808db29377ba79cb8326301f0a6" S = "${WORKDIR}/git" -AUTOTOOLS_AUXDIR = "${S}/build/litter" - PACKAGECONFIG ??= "" -PACKAGECONFIG[trust-paths] = "--with-trust-paths=/etc/ssl/certs/ca-certificates.crt,--without-trust-paths,,ca-certificates" - -# This recipe does not use the standard gtk-doc m4 macros, and so the ./configure flags -# that control gtk-doc build are non-standard -EXTRA_OECONF_prepend_class-target = "${@bb.utils.contains('GTKDOC_ENABLED', 'True', '--enable-doc --enable-doc-html --disable-doc-pdf', \ - '--disable-doc', d)} " - -# When building native recipes, disable gtkdoc, as it is not necessary, -# pulls in additional dependencies, and makes build times longer -EXTRA_OECONF_prepend_class-native = "--disable-doc " -EXTRA_OECONF_prepend_class-nativesdk = "--disable-doc " - -UNKNOWN_CONFIGURE_WHITELIST_append = " --enable-gtk-doc-html --disable-gtk-doc-pdf --enable-gtk-doc --disable-gtk-doc" - -# p11-kit relies on these two being copied from source tree -# instead of being regenerated by gtkdoc-scan, but doesn't setup -# dependencies correctly when there is a parallel build. Let's pre-copy -# them instead. -do_compile_prepend () { - cp ${S}/doc/manual/p11-kit-overrides.txt ${S}/doc/manual/p11-kit-sections.txt ${B}/doc/manual/ -} +PACKAGECONFIG[trust-paths] = "-Dtrust_paths=/etc/ssl/certs/ca-certificates.crt,,,ca-certificates" + +GTKDOC_MESON_OPTION = 'gtk_doc' FILES_${PN} += " \ ${libdir}/p11-kit-proxy.so \
Signature · 1 line
2.17.1
Re: [PATCH 07/15] p11-kit: convert to meson
Is this intentional?
packages/corei7-64-poky-linux/p11-kit/p11-kit: FILELIST: removed "/usr/libexec/p11-kit/trust-extract-compat /usr/share/p11-kit/modules/p11-kit-trust.module /usr/lib/pkcs11/p11-kit-trust.so /usr/bin/trust" packages/corei7-64-poky-linux/p11-kit/p11-kit: RDEPENDS: removed all items "libtasn1 (['>= 4.14'])"
Ross
Re: [PATCH 07/15] p11-kit: convert to meson
Quoted 9 lines · Ross Burton
Is this intentional?
packages/corei7-64-poky-linux/p11-kit/p11-kit: FILELIST: removed "
/usr/libexec/p11-kit/trust-extract-compat/usr/share/p11-kit/modules/p11-kit-trust.module/usr/lib/pkcs11/p11-kit-trust.so/usr/bin/trust" packages/corei7-64-poky-linux/p11-kit/p11-kit: RDEPENDS: removed all items "libtasn1 (['>= 4.14'])"
Nope; meson build requires an additional native dependency for these to be enabled. I've adjusted the patch.
'trust-extract-compat' doesn't seem to be supported at all with meson.
Alex
PATCH 8/15 psmisc: revert to default autopoint exclusion
In reply to Alexander KanavinOtherwise, builds break with latest gettext.
--- meta/recipes-extended/psmisc/psmisc.inc | 1 - 1 file changed, 1 deletion(-)
meta/recipes-extended/psmisc/psmisc.inc +0 -1
@@ -19,7 +19,6 @@ inherit autotools gettext # Upstream has a custom autogen.sh which invokes po/update-potfiles as they # don't ship a po/POTFILES.in (which is silly). Without that file gettext # doesn't believe po/ is a gettext directory and won't generate po/Makefile. -EXTRA_AUTORECONF_remove = "--exclude=autopoint" do_configure_prepend() { ( cd ${S} && po/update-potfiles ) }
Signature · 1 line
2.17.1
PATCH 9/15 sed: upgrade to 4.7
In reply to Alexander KanavinDrop both patches as they are no longer necessary.
Rewrite ptest support as it has been refactored upstream.
Ptest results:
TOTAL: 67
PASS: 59
SKIP: 8 (due to missing valgrind)
--- ...charset_alias-when-building-for-musl.patch | 33 ---------- meta/recipes-extended/sed/sed-4.2.2/run-ptest | 3 - .../sed/sed-4.2.2/sed-add-ptest.patch | 66 ------------------- meta/recipes-extended/sed/sed/run-ptest | 5 ++ meta/recipes-extended/sed/sed_4.2.2.bb | 53 --------------- meta/recipes-extended/sed/sed_4.7.bb | 61 +++++++++++++++++ 6 files changed, 66 insertions(+), 155 deletions(-) delete mode 100644 meta/recipes-extended/sed/sed-4.2.2/0001-Unset-need_charset_alias-when-building-for-musl.patch delete mode 100644 meta/recipes-extended/sed/sed-4.2.2/run-ptest delete mode 100644 meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch create mode 100644 meta/recipes-extended/sed/sed/run-ptest delete mode 100644 meta/recipes-extended/sed/sed_4.2.2.bb create mode 100644 meta/recipes-extended/sed/sed_4.7.bb
meta/recipes-extended/sed/sed-4.2.2/0001-Unset-need_charset_alias-when-building-for-musl.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Mon, 13 Apr 2015 17:02:13 -0700 -Subject: [PATCH] Unset need_charset_alias when building for musl - -localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4 -which actually shoudl be fixed in gnulib and then all downstream -projects will get it eventually. For now we apply the fix to -coreutils - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <[email protected]> ---- - lib/gnulib.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/gnulib.mk b/lib/gnulib.mk -index e1d74db..c0e92dd 100644 ---- a/lib/gnulib.mk -+++ b/lib/gnulib.mk -@@ -1882,7 +1882,7 @@ install-exec-localcharset: all-local - case '$(host_os)' in \ - darwin[56]*) \ - need_charset_alias=true ;; \ -- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ -+ darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \ - need_charset_alias=false ;; \ - *) \ - need_charset_alias=true ;; \ --- -2.1.4 -
meta/recipes-extended/sed/sed-4.2.2/run-ptest deleted +0 -3
@@ -1,3 +0,0 @@ -#!/bin/sh - -make -C testsuite -k runtest-TESTS
meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch deleted +0 -66
66 lines not on this page · raw message
meta/recipes-extended/sed/sed/run-ptest new file +5 -0
@@ -0,0 +1,5 @@ +#!/bin/sh + +chown nobody testsuite +chown nobody ../ptest +su nobody -c "make test-suite.log"
meta/recipes-extended/sed/sed_4.2.2.bb deleted +0 -53
53 lines not on this page · raw message
meta/recipes-extended/sed/sed_4.7.bb new file +61 -0
61 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 10/15 bind: update 9.11.5-P4 -> 9.11.13
In reply to Alexander KanavinDrop backports.
Drop 0001-gen.c-extend-DIRNAMESIZE-from-256-to-512.patch and 0001-lib-dns-gen.c-fix-too-long-error.patch as problem is fixed upstream.
---
.../bind/0001-bind-fix-CVE-2019-6471.patch | 64 --
....in-remove-useless-L-use_openssl-lib.patch | 18 +-
...01-fix-enforcement-of-tcp-clients-v1.patch | 60 --
...c-extend-DIRNAMESIZE-from-256-to-512.patch | 22 -
...001-lib-dns-gen.c-fix-too-long-error.patch | 31 -
...p-clients-could-still-be-exceeded-v2.patch | 670 -------------
...rence-counter-for-pipeline-groups-v3.patch | 278 ------
...accounting-and-client-mortality-chec.patch | 512 ----------
...a-and-pipeline-refs-allow-special-ca.patch | 911 ------------------
...allowance-for-tcp-clients-interfaces.patch | 80 --
...perations-in-bin-named-client.c-with.patch | 140 ---
...ching-for-json-headers-searches-sysr.patch | 15 +-
.../{bind_9.11.5-P4.bb => bind_9.11.13.bb} | 18 +-
13 files changed, 20 insertions(+), 2799 deletions(-)
delete mode 100644 meta/recipes-connectivity/bind/bind/0001-bind-fix-CVE-2019-6471.patch
delete mode 100644 meta/recipes-connectivity/bind/bind/0001-fix-enforcement-of-tcp-clients-v1.patch
delete mode 100644 meta/recipes-connectivity/bind/bind/0001-gen.c-extend-DIRNAMESIZE-from-256-to-512.patch
delete mode 100644 meta/recipes-connectivity/bind/bind/0001-lib-dns-gen.c-fix-too-long-error.patch
delete mode 100644 meta/recipes-connectivity/bind/bind/0002-tcp-clients-could-still-be-exceeded-v2.patch
delete mode 100644 meta/recipes-connectivity/bind/bind/0003-use-reference-counter-for-pipeline-groups-v3.patch
delete mode 100644 meta/recipes-connectivity/bind/bind/0004-better-tcpquota-accounting-and-client-mortality-chec.patch
delete mode 100644 meta/recipes-connectivity/bind/bind/0005-refactor-tcpquota-and-pipeline-refs-allow-special-ca.patch
delete mode 100644 meta/recipes-connectivity/bind/bind/0006-restore-allowance-for-tcp-clients-interfaces.patch
delete mode 100644 meta/recipes-connectivity/bind/bind/0007-Replace-atomic-operations-in-bin-named-client.c-with.patch
rename meta/recipes-connectivity/bind/{bind_9.11.5-P4.bb => bind_9.11.13.bb} (86%)meta/recipes-connectivity/bind/bind/0001-bind-fix-CVE-2019-6471.patch deleted +0 -64
@@ -1,64 +0,0 @@ -Backport patch to fix CVE-2019-6471. - -Ref: -https://security-tracker.debian.org/tracker/CVE-2019-6471 - -CVE: CVE-2019-6471 -Upstream-Status: Backport [https://gitlab.isc.org/isc-projects/bind9/commit/3a9c7bb] - -Signed-off-by: Kai Kang <[email protected]> - -From 3a9c7bb80d4a609b86427406d9dd783199920b5b Mon Sep 17 00:00:00 2001 -From: Mark Andrews <[email protected]> -Date: Tue, 19 Mar 2019 14:14:21 +1100 -Subject: [PATCH] move item_out test inside lock in dns_dispatch_getnext() - -(cherry picked from commit 60c42f849d520564ed42e5ed0ba46b4b69c07712) ---- - lib/dns/dispatch.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c -index 408beda367..3278db4a07 100644 ---- a/lib/dns/dispatch.c -+++ b/lib/dns/dispatch.c -@@ -134,7 +134,7 @@ struct dns_dispentry { - isc_task_t *task; - isc_taskaction_t action; - void *arg; -- bool item_out; -+ bool item_out; - dispsocket_t *dispsocket; - ISC_LIST(dns_dispatchevent_t) items; - ISC_LINK(dns_dispentry_t) link; -@@ -3422,13 +3422,14 @@ dns_dispatch_getnext(dns_dispentry_t *resp, dns_dispatchevent_t **sockevent) { - disp = resp->disp; - REQUIRE(VALID_DISPATCH(disp)); - -- REQUIRE(resp->item_out == true); -- resp->item_out = false; -- - ev = *sockevent; - *sockevent = NULL; - - LOCK(&disp->lock); -+ -+ REQUIRE(resp->item_out == true); -+ resp->item_out = false; -+ - if (ev->buffer.base != NULL) - free_buffer(disp, ev->buffer.base, ev->buffer.length); - free_devent(disp, ev); -@@ -3573,6 +3574,9 @@ dns_dispatch_removeresponse(dns_dispentry_t **resp, - isc_task_send(disp->task[0], &disp->ctlevent); - } - -+/* -+ * disp must be locked. -+ */ - static void - do_cancel(dns_dispatch_t *disp) { - dns_dispatchevent_t *ev; --- -2.20.1 -
meta/recipes-connectivity/bind/bind/0001-configure.in-remove-useless-L-use_openssl-lib.patch +8 -10
@@ -1,4 +1,4 @@ -From 950867d9fd3f690e271c8c807b6eed144b2935b2 Mon Sep 17 00:00:00 2001 +From 2325a92f1896a2a7f586611686801b41fbc91b50 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Mon, 27 Aug 2018 15:00:51 +0800 Subject: [PATCH] configure.in: remove useless `-L$use_openssl/lib'
@@ -10,15 +10,16 @@ and helpful for clean up host build path in isc-config.sh Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Hongxu Jia <[email protected]> + --- - configure.in | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.in b/configure.in -index 54efc55..76ac0eb 100644 ---- a/configure.in -+++ b/configure.in -@@ -1691,7 +1691,7 @@ If you don't want OpenSSL, use --without-openssl]) +diff --git a/configure.ac b/configure.ac +index e85a5c6..2bbfc58 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1631,7 +1631,7 @@ If you don't want OpenSSL, use --without-openssl]) fi ;; *)
@@ -27,6 +28,3 @@ index 54efc55..76ac0eb 100644 ;; esac fi --- -2.7.4 -
meta/recipes-connectivity/bind/bind/0001-fix-enforcement-of-tcp-clients-v1.patch deleted +0 -60
60 lines not on this page · raw message
meta/recipes-connectivity/bind/bind/0001-gen.c-extend-DIRNAMESIZE-from-256-to-512.patch deleted +0 -22
@@ -1,22 +0,0 @@ -Upstream-Status: Pending - -Subject: gen.c: extend DIRNAMESIZE from 256 to 512 - -Signed-off-by: Chen Qi <[email protected]> ---- - lib/dns/gen.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: bind-9.11.3/lib/dns/gen.c -=================================================================== ---- bind-9.11.3.orig/lib/dns/gen.c -+++ bind-9.11.3/lib/dns/gen.c -@@ -130,7 +130,7 @@ static const char copyright[] = - #define TYPECLASSBUF (TYPECLASSLEN + 1) - #define TYPECLASSFMT "%" STR(TYPECLASSLEN) "[-0-9a-z]_%d" - #define ATTRIBUTESIZE 256 --#define DIRNAMESIZE 256 -+#define DIRNAMESIZE 512 - - static struct cc { - struct cc *next;
meta/recipes-connectivity/bind/bind/0001-lib-dns-gen.c-fix-too-long-error.patch deleted +0 -31
@@ -1,31 +0,0 @@ -From 5bc3167a8b714ec0c4a3f1c7f3b9411296ec0a23 Mon Sep 17 00:00:00 2001 -From: Robert Yang <[email protected]> -Date: Wed, 16 Sep 2015 20:23:47 -0700 -Subject: [PATCH] lib/dns/gen.c: fix too long error - -The 512 is a little short when build in deep dir, and cause "too long" -error, use PATH_MAX if defined. - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <[email protected]> ---- - lib/dns/gen.c | 4 ++++ - 1 file changed, 4 insertions(+) - -Index: bind-9.11.3/lib/dns/gen.c -=================================================================== ---- bind-9.11.3.orig/lib/dns/gen.c -+++ bind-9.11.3/lib/dns/gen.c -@@ -130,7 +130,11 @@ static const char copyright[] = - #define TYPECLASSBUF (TYPECLASSLEN + 1) - #define TYPECLASSFMT "%" STR(TYPECLASSLEN) "[-0-9a-z]_%d" - #define ATTRIBUTESIZE 256 -+#ifdef PATH_MAX -+#define DIRNAMESIZE PATH_MAX -+#else - #define DIRNAMESIZE 512 -+#endif - - static struct cc { - struct cc *next;
meta/recipes-connectivity/bind/bind/0002-tcp-clients-could-still-be-exceeded-v2.patch deleted +0 -670
670 lines not on this page · raw message
meta/recipes-connectivity/bind/bind/0003-use-reference-counter-for-pipeline-groups-v3.patch deleted +0 -278
278 lines not on this page · raw message
meta/recipes-connectivity/bind/bind/0004-better-tcpquota-accounting-and-client-mortality-chec.patch deleted +0 -512
512 lines not on this page · raw message
meta/recipes-connectivity/bind/bind/0005-refactor-tcpquota-and-pipeline-refs-allow-special-ca.patch deleted +0 -911
911 lines not on this page · raw message
meta/recipes-connectivity/bind/bind/0006-restore-allowance-for-tcp-clients-interfaces.patch deleted +0 -80
80 lines not on this page · raw message
meta/recipes-connectivity/bind/bind/0007-Replace-atomic-operations-in-bin-named-client.c-with.patch deleted +0 -140
140 lines not on this page · raw message
meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch +8 -7
@@ -1,4 +1,4 @@ -From 9473d29843579802e96b0293a3e953fed93de82c Mon Sep 17 00:00:00 2001 +From edda20fb5a6e88548f85e39d34d6c074306e15bc Mon Sep 17 00:00:00 2001 From: Paul Gortmaker <[email protected]> Date: Tue, 9 Jun 2015 11:22:00 -0400 Subject: [PATCH] bind: ensure searching for json headers searches sysroot
@@ -27,15 +27,16 @@ to make use of the combination some day. Upstream-Status: Inappropriate [OE Specific] Signed-off-by: Paul Gortmaker <[email protected]> + --- - configure.in | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: bind-9.11.3/configure.in -=================================================================== ---- bind-9.11.3.orig/configure.in -+++ bind-9.11.3/configure.in -@@ -2574,7 +2574,7 @@ case "$use_libjson" in +diff --git a/configure.ac b/configure.ac +index 17392fd..e85a5c6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2449,7 +2449,7 @@ case "$use_libjson" in libjson_libs="" ;; auto|yes)
meta/recipes-connectivity/bind/bind_9.11.13.bb renamed from meta/recipes-connectivity/bind/bind_9.11.5-P4.bb +4 -14
@@ -15,23 +15,13 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \ file://make-etc-initd-bind-stop-work.patch \ file://init.d-add-support-for-read-only-rootfs.patch \ file://bind-ensure-searching-for-json-headers-searches-sysr.patch \ - file://0001-gen.c-extend-DIRNAMESIZE-from-256-to-512.patch \ - file://0001-lib-dns-gen.c-fix-too-long-error.patch \ file://0001-configure.in-remove-useless-L-use_openssl-lib.patch \ file://0001-named-lwresd-V-and-start-log-hide-build-options.patch \ file://0001-avoid-start-failure-with-bind-user.patch \ - file://0001-bind-fix-CVE-2019-6471.patch \ - file://0001-fix-enforcement-of-tcp-clients-v1.patch \ - file://0002-tcp-clients-could-still-be-exceeded-v2.patch \ - file://0003-use-reference-counter-for-pipeline-groups-v3.patch \ - file://0004-better-tcpquota-accounting-and-client-mortality-chec.patch \ - file://0005-refactor-tcpquota-and-pipeline-refs-allow-special-ca.patch \ - file://0006-restore-allowance-for-tcp-clients-interfaces.patch \ - file://0007-Replace-atomic-operations-in-bin-named-client.c-with.patch \ -" - -SRC_URI[md5sum] = "8ddab4b61fa4516fe404679c74e37960" -SRC_URI[sha256sum] = "7e8c08192bcbaeb6e9f2391a70e67583b027b90e8c4bc1605da6eb126edde434" + " + +SRC_URI[md5sum] = "17de0d024ab1eac377f1c2854dc25057" +SRC_URI[sha256sum] = "fd3f3cc9fcfcdaa752db35eb24598afa1fdcc2509d3227fc90a8631b7b400f7d" UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" # stay at 9.11 until 9.16, from 9.16 follow the ESV versions divisible by 4
Signature · 1 line
2.17.1
PATCH 11/15 flex: update to 2.6.4
In reply to Alexander KanavinAdd a backport patch that addresses segfaults on newer glibc versions.
Remove:
CVE-2016-6354.patch (backport) 0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch (issue fixed upstream) do_not_create_pdf_doc.patch (issue fixed upstream)
ptest pass rate is 100%.
---
...SE_SYSTEM_EXTENSIONS-in-configure.ac.patch | 32 ++++++++++
...-comments-in-c-code-fails-with-gcc-6.patch | 64 -------------------
.../flex/flex/CVE-2016-6354.patch | 59 -----------------
.../flex/flex/do_not_create_pdf_doc.patch | 17 -----
meta/recipes-devtools/flex/flex/run-ptest | 2 +-
.../flex/{flex_2.6.0.bb => flex_2.6.4.bb} | 12 ++--
6 files changed, 38 insertions(+), 148 deletions(-)
create mode 100644 meta/recipes-devtools/flex/flex/0001-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch
delete mode 100644 meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch
delete mode 100644 meta/recipes-devtools/flex/flex/CVE-2016-6354.patch
delete mode 100644 meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch
rename meta/recipes-devtools/flex/{flex_2.6.0.bb => flex_2.6.4.bb} (85%)meta/recipes-devtools/flex/flex/0001-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch new file +32 -0
@@ -0,0 +1,32 @@ +From ed1f7e9de0d6a1d5a9e581e02a63593d22cf1e52 Mon Sep 17 00:00:00 2001 +From: Explorer09 <[email protected]> +Date: Mon, 4 Sep 2017 10:47:33 +0800 +Subject: [PATCH] build: AC_USE_SYSTEM_EXTENSIONS in configure.ac. + +This would, e.g. define _GNU_SOURCE in config.h, enabling the +reallocarray() prototype in glibc 2.26+ on Linux systems with that +version of glibc. + +Fixes #241. + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <[email protected]> +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 55e774b..c879fe1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -25,8 +25,10 @@ + # autoconf requirements and initialization + + AC_INIT([the fast lexical analyser generator],[2.6.4],[[email protected]],[flex]) ++AC_PREREQ([2.60]) + AC_CONFIG_SRCDIR([src/scan.l]) + AC_CONFIG_AUX_DIR([build-aux]) ++AC_USE_SYSTEM_EXTENSIONS + LT_INIT + AM_INIT_AUTOMAKE([1.11.3 -Wno-portability foreign check-news std-options dist-lzip parallel-tests subdir-objects]) + AC_CONFIG_HEADER([src/config.h])
meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch deleted +0 -64
64 lines not on this page · raw message
meta/recipes-devtools/flex/flex/CVE-2016-6354.patch deleted +0 -59
59 lines not on this page · raw message
meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch deleted +0 -17
@@ -1,17 +0,0 @@ -Upstream-Status: Inappropriate (embedded specific) - -Signed-off-by: Laurentiu Palcu <[email protected]> - -Index: flex-2.6.0/doc/Makefile.am -=================================================================== ---- flex-2.6.0.orig/doc/Makefile.am -+++ flex-2.6.0/doc/Makefile.am -@@ -2,7 +2,7 @@ help2man = @HELP2MAN@ - - info_TEXINFOS = flex.texi - dist_man_MANS = flex.1 --dist_doc_DATA= flex.pdf -+EXTRA_DIST= flex.pdf - - CLEANFILES = \ - flex.aux \
meta/recipes-devtools/flex/flex/run-ptest +1 -1
@@ -2,4 +2,4 @@ # make would want to rebuild some files with a compiler otherwise :-/ make FLEX=/usr/bin/flex -t check-TESTS || true -make FLEX=/usr/bin/flex check-TESTS +make FLEX=/usr/bin/flex abs_builddir=./ check-TESTS
meta/recipes-devtools/flex/flex_2.6.4.bb renamed from meta/recipes-devtools/flex/flex_2.6.0.bb +5 -7
@@ -10,17 +10,15 @@ BBCLASSEXTEND = "native nativesdk" LIC_FILES_CHKSUM = "file://COPYING;md5=e4742cf92e89040b39486a6219b68067" -SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-${PV}.tar.bz2 \ +SRC_URI = "https://github.com/westes/flex/releases/download/v${PV}/flex-${PV}.tar.gz \ file://run-ptest \ - file://do_not_create_pdf_doc.patch \ file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ - file://0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch \ - file://CVE-2016-6354.patch \ ${@bb.utils.contains('PTEST_ENABLED', '1', '', 'file://disable-tests.patch', d)} \ + file://0001-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch \ " -SRC_URI[md5sum] = "266270f13c48ed043d95648075084d59" -SRC_URI[sha256sum] = "24e611ef5a4703a191012f80c1027dc9d12555183ce0ecd46f3636e587e9b8e9" +SRC_URI[md5sum] = "2882e3179748cc9f9c23ec593d6adc8d" +SRC_URI[sha256sum] = "e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995" # Flex has moved to github from 2.6.1 onwards UPSTREAM_CHECK_URI = "https://github.com/westes/flex/releases"
@@ -30,7 +28,7 @@ inherit autotools gettext texinfo ptest M4 = "${bindir}/m4" M4_class-native = "${STAGING_BINDIR_NATIVE}/m4" -EXTRA_OECONF += "ac_cv_path_M4=${M4}" +EXTRA_OECONF += "ac_cv_path_M4=${M4} ac_cv_func_reallocarray=no" EXTRA_OEMAKE += "m4=${STAGING_BINDIR_NATIVE}/m4" EXTRA_OEMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', 'FLEX=${STAGING_BINDIR_NATIVE}/flex', '', d)}"
Signature · 1 line
2.17.1
PATCH 12/15 gettext: fix failing ptests
In reply to Alexander KanavinResults:
pass 400
fail 0
skip 32
--- meta/recipes-core/gettext/gettext_0.20.1.bb | 23 +++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)
meta/recipes-core/gettext/gettext_0.20.1.bb +21 -2
@@ -44,6 +44,10 @@ EXTRA_OECONF += "--without-lispdir \ " EXTRA_OECONF_append_class-target = " \ --with-bisonlocaledir=${datadir}/locale \ + gt_cv_locale_fr_utf8=fr_FR \ + gt_cv_locale_fr=fr_FR.ISO-8859-1 \ + gt_cv_locale_de_utf8=de_DE \ + gt_cv_locale_de=de_DE.ISO-8859-1 \ " PACKAGECONFIG ??= "croco glib libxml"
@@ -143,13 +147,17 @@ do_install_ptest() { mkdir -p ${D}${PTEST_PATH}/src mkdir -p ${D}${PTEST_PATH}/po mkdir -p ${D}${PTEST_PATH}/misc + mkdir -p ${D}${PTEST_PATH}/its + mkdir -p ${D}${PTEST_PATH}/styles + cp -rf ${S}/gettext-tools/its/* ${D}${PTEST_PATH}/its + cp -rf ${S}/gettext-tools/styles/* ${D}${PTEST_PATH}/styles cp -rf ${S}/gettext-tools/tests/* ${D}${PTEST_PATH}/tests cp -rf ${B}/gettext-tools/tests/.libs/* ${D}${PTEST_PATH}/tests cp -rf ${B}/gettext-runtime/intl/.libs/libgnuintl.so.8* ${D}${libdir}/ cp -rf ${B}/gettext-tools/tests/Makefile ${D}${PTEST_PATH}/tests + cp -rf ${B}/gettext-tools/tests/init-env ${D}${PTEST_PATH}/tests sed -i '/^Makefile:/c Makefile:' ${D}${PTEST_PATH}/tests/Makefile - sed -i -e 's:CONFIG_SHELL=.*:& LOCALE_FR='fr_FR.iso88591' LOCALE_FR_UTF8='fr_FR.utf8' LOCALE_JA='ja_JP.eucjp':g' \ - -e 's:lang-c lang-c++:lang-c++:g' ${D}${PTEST_PATH}/tests/Makefile + sed -i -e 's:lang-c lang-c++:lang-c++:g' ${D}${PTEST_PATH}/tests/Makefile install ${S}/gettext-tools/src/msgunfmt.tcl ${D}${PTEST_PATH}/src install ${S}/gettext-tools/src/project-id ${D}${PTEST_PATH}/src install ${B}/gettext-runtime/src/gettext.sh ${D}${PTEST_PATH}/src
@@ -177,8 +185,19 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = "\ glibc-gconv-koi8-r \ glibc-gconv-iso8859-2 \ glibc-charmap-iso-8859-2 \ + glibc-gconv-iso8859-1 \ + glibc-charmap-iso-8859-1 \ glibc-gconv-euc-kr \ glibc-charmap-euc-kr \ + glibc-gconv-euc-jp \ + glibc-charmap-euc-jp \ + locale-base-de-de \ + locale-base-fr-fr \ +" + +RRECOMMENDS_${PN}-ptest_append_libc-glibc = "\ + locale-base-de-de.iso-8859-1 \ + locale-base-fr-fr.iso-8859-1 \ " INSANE_SKIP_${PN}-ptest += "ldflags"
Signature · 1 line
2.17.1
PATCH 13/15 libffi: update to 3.3 final
In reply to Alexander KanavinLicense-Update: copyright years
---
...ixed-missed-ifndef-for-__mips_soft_float.patch | 8 ++------
.../recipes-support/libffi/libffi/not-win32.patch | 15 +++++++++++++--
.../libffi/{libffi_3.3~rc0.bb => libffi_3.3.bb} | 11 ++++-------
3 files changed, 19 insertions(+), 15 deletions(-)
rename meta/recipes-support/libffi/{libffi_3.3~rc0.bb => libffi_3.3.bb} (78%)meta/recipes-support/libffi/libffi/0001-Fixed-missed-ifndef-for-__mips_soft_float.patch +2 -6
@@ -1,12 +1,11 @@ -From 4149a7627a998731cc246d3f58a36808745d04c8 Mon Sep 17 00:00:00 2001 +From 14e2e74682db3bfcf057688f738fdd842a02ff2d Mon Sep 17 00:00:00 2001 From: Carl Hurd <[email protected]> Date: Wed, 18 Jul 2018 09:04:32 -0400 Subject: [PATCH] Fixed missed #ifndef for __mips_soft_float Signed-off-by: Peter Kjellerstedt <[email protected]> ---- Upstream-Status: Submitted [https://github.com/libffi/libffi/pull/442] - +--- src/mips/o32.S | 2 ++ 1 file changed, 2 insertions(+)
@@ -26,6 +25,3 @@ index 44e74cb..799139b 100644 1: # prepare arguments for ffi_closure_mips_inner_O32 REG_L a0, 4($15) # cif --- -2.21.0 -
meta/recipes-support/libffi/libffi/not-win32.patch +13 -2
@@ -1,3 +1,8 @@ +From 306719369a0d3608b4ff2737de74ae284788a14b Mon Sep 17 00:00:00 2001 +From: Ross Burton <[email protected]> +Date: Thu, 4 Feb 2016 16:22:50 +0000 +Subject: [PATCH] libffi: ensure sysroot paths are not in libffi.pc + libffi's configure assumes that cross-compiled builds are complicated and introduces convoluted path manipulation involving gcc search paths to the install paths, resulting in paths like -L/usr/lib/../lib/ appearing in
@@ -11,9 +16,15 @@ As this block is generally pointless, disable it. Upstream-Status: Inappropriate Signed-off-by: Ross Burton <[email protected]> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b764368..d51ce91 100644 --- a/configure.ac +++ b/configure.ac -@@ -350,7 +350,7 @@ AC_ARG_ENABLE(multi-os-directory, +@@ -354,7 +354,7 @@ AC_ARG_ENABLE(multi-os-directory, # These variables are only ever used when we cross-build to X86_WIN32. # And we only support this with GCC, so...
@@ -21,4 +32,4 @@ Signed-off-by: Ross Burton <[email protected]> +if false; then if test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then - toolexecdir="${exec_prefix}"/'$(target_alias)' + toolexecdir='${exec_prefix}'/'$(target_alias)'
meta/recipes-support/libffi/libffi_3.3.bb renamed from meta/recipes-support/libffi/libffi_3.3~rc0.bb +4 -7
@@ -8,24 +8,21 @@ library really only provides the lowest, machine dependent layer of a fully feat A layer must exist above `libffi' that handles type conversions for values passed between the two languages." LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3610bb17683a0089ed64055416b2ae1b" +LIC_FILES_CHKSUM = "file://LICENSE;md5=492385fe22195952f5b9b197868ba268" -SRC_URI = "https://github.com/libffi/libffi/releases/download/v3.3-rc0/libffi-3.3-rc0.tar.gz \ +SRC_URI = "https://github.com/libffi/libffi/releases/download/v${PV}/${BPN}-${PV}.tar.gz \ file://not-win32.patch \ file://0001-Fixed-missed-ifndef-for-__mips_soft_float.patch \ " -SRC_URI[md5sum] = "8d2a82a78faf10a5e53c27d986e8f04e" -SRC_URI[sha256sum] = "403d67aabf1c05157855ea2b1d9950263fb6316536c8c333f5b9ab1eb2f20ecf" +SRC_URI[md5sum] = "6313289e32f1d38a9df4770b014a2ca7" +SRC_URI[sha256sum] = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056" UPSTREAM_CHECK_URI = "https://github.com/libffi/libffi/releases/" UPSTREAM_CHECK_REGEX = "libffi-(?P<pver>\d+(\.\d+)+)\.tar" -UPSTREAM_VERSION_UNKNOWN = "1" EXTRA_OECONF += "--disable-builddir" EXTRA_OEMAKE_class-target = "LIBTOOLFLAGS='--tag=CC'" inherit autotools texinfo multilib_header -S = "${WORKDIR}/${BPN}-3.3-rc0" - do_install_append() { oe_multilib_header ffi.h }
Signature · 1 line
2.17.1
Re: [PATCH 13/15] libffi: update to 3.3 final
Fails for ppc:
In file included from ../libffi-3.3/src/powerpc/ffi_sysv.c:35:../libffi-3.3/src/powerpc/ffi_powerpc.h:65:9: error: '__int128' is not supported on this target
65 | typedef __int128 float128;
| ^~~~~~~~Ross
Re: [PATCH 13/15] libffi: update to 3.3 final
Quoted 6 lines · Ross Burton
Fails for ppc:
In file included from
../libffi-3.3/src/powerpc/ffi_sysv.c:35:../libffi-3.3/src/powerpc/ffi_powerpc.h:65:9: error: '__int128' is not supported on this target
65 | typedef__int128float128;
| ^~~~~~~~
https://github.com/libffi/libffi/commit/01a75ed76ea7e57f1b7a5c183e2b1e890e6aa0fd
Ross
Re: [PATCH 13/15] libffi: update to 3.3 final
Thanks, will add this patch now and test.
Alex
Quoted 14 lines · Ross Burton
Quoted 7 lines · Ross Burton
Fails for ppc:
In file included from
../libffi-3.3/src/powerpc/ffi_sysv.c:35:../libffi-3.3/src/powerpc/ffi_powerpc.h:65:9: error: '__int128' is not supported on this target65 | typedef __int128 float128; | ^~~~~~~~https://github.com/libffi/libffi/commit/01a75ed76ea7e57f1b7a5c183e2b1e890e6aa0fd
Ross
Re: [PATCH 13/15] libffi: update to 3.3 final
In reply to Ross BurtonQuoted 10 lines · Ross Burton
Quoted 7 lines · Ross Burton
Fails for ppc:
In file included from
../libffi-3.3/src/powerpc/ffi_sysv.c:35:../libffi-3.3/src/powerpc/ffi_powerpc.h:65:9: error: '__int128' is not supported on this target
65 | typedef__int128float128;
| ^~~~~~~~https://github.com/libffi/libffi/commit/01a75ed76ea7e57f1b7a5c183e2b1e890e6aa0fd
Debian also uses this one for powerpc.
On powerpc64 additionally
https://github.com/libffi/libffi/commit/6663047f56c2932a6b10a790f4ac6666dd181326
Quoted 1 line
Ross
cu
Adrian
PATCH 14/15 libcomps: update to 0.1.12
In reply to Alexander Kanavin--- ...PYTHON_INSTALL_DIR-by-running-python.patch | 50 +++++++------------ .../recipes-devtools/libcomps/libcomps_git.bb | 4 +- 2 files changed, 19 insertions(+), 35 deletions(-)
meta/recipes-devtools/libcomps/libcomps/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch +17 -33
@@ -1,41 +1,25 @@ -From ff4aae4c8beaf17cb8e7a3431f6c541eccfae244 Mon Sep 17 00:00:00 2001 +From b28859ea93110d52d8a87d7b5a6c8796d0d523ed Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 30 Dec 2016 18:22:09 +0200 -Subject: [PATCH 1/2] Do not set PYTHON_INSTALL_DIR by running python. +Subject: [PATCH] Do not set PYTHON_INSTALL_DIR by running python. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <[email protected]> + --- - libcomps/src/python/src/python2/CMakeLists.txt | 2 +- - libcomps/src/python/src/python3/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + libcomps/src/python/src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/libcomps/src/python/src/python2/CMakeLists.txt b/libcomps/src/python/src/python2/CMakeLists.txt -index 3ad9e18..0e7dd4b 100644 ---- a/libcomps/src/python/src/python2/CMakeLists.txt -+++ b/libcomps/src/python/src/python2/CMakeLists.txt -@@ -1,7 +1,7 @@ - find_package (PythonLibs 2.6) - find_package (PythonInterp 2.6 REQUIRED) - --execute_process (COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) -+#execute_process (COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) - - include_directories(${PYTHON_INCLUDE_PATH}) - include_directories(${LIBCOMPS_INCLUDE_PATH}) -diff --git a/libcomps/src/python/src/python3/CMakeLists.txt b/libcomps/src/python/src/python3/CMakeLists.txt -index 7fafa9f..ed82d3d 100644 ---- a/libcomps/src/python/src/python3/CMakeLists.txt -+++ b/libcomps/src/python/src/python3/CMakeLists.txt -@@ -2,7 +2,7 @@ find_package (PythonLibs 3.0) - find_package (PythonInterp 3.0) - #add_custom_target(py3-copy) +diff --git a/libcomps/src/python/src/CMakeLists.txt b/libcomps/src/python/src/CMakeLists.txt +index fa590ae..6913214 100644 +--- a/libcomps/src/python/src/CMakeLists.txt ++++ b/libcomps/src/python/src/CMakeLists.txt +@@ -117,7 +117,7 @@ IF (SKBUILD) + INSTALL(FILES libcomps/__init__.py DESTINATION libcomps/src/python/src/libcomps) + INSTALL(TARGETS pycomps LIBRARY DESTINATION libcomps/src/python/src/libcomps) + ELSE () +- EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) ++ #EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) --execute_process (COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) -+#execute_process (COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) - - include_directories(${PYTHON_INCLUDE_PATH}) - include_directories(${LIBCOMPS_INCLUDE_PATH}) --- -2.11.0 - + INSTALL(FILES ${pycomps_SRCDIR}/libcomps/__init__.py DESTINATION ${PYTHON_INSTALL_DIR}/libcomps) + #INSTALL(FILES ${pycomps_SRCDIR}/tests/__test.py DESTINATION
meta/recipes-devtools/libcomps/libcomps_git.bb +2 -2
@@ -8,8 +8,8 @@ SRC_URI = "git://github.com/rpm-software-management/libcomps.git \ file://0001-Add-crc32.c-to-sources-list.patch \ " -PV = "0.1.11" -SRCREV = "d868a79b76fb980d1371c28124ae07f00d2b63a9" +PV = "0.1.12" +SRCREV = "d0c8aa312dcab75c265ed6123f8afe0d7c8e91db" S = "${WORKDIR}/git"
Signature · 1 line
2.17.1
PATCH 15/15 python3: update to 3.8.0
In reply to Alexander KanavinDrop backports, rebase other patches.
One patch I wasn't able to rebase as upstream code changed too much:
0003-setup.py-pass-missing-libraries-to-Extension-for-mul.patch Please determine if it is still needed, produce a new version, and work with upstream to get it merged.
0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch is removed as the use case (allowing python 2 and 3 to coexist in SDKs) is no longer relevant with Python 2.x reaching end of line and upstream has refactored the code making a rebase difficult. If needed, please re-add the patch to py2, rather than py3.
---
meta/classes/python3-dir.bbclass | 2 +-
...ib-termcap-to-linker-flags-to-avoid-.patch | 14 +-
...lib-as-location-for-site-packages-an.patch | 156 ++++++++------
...-detection-of-mips-architecture-for-.patch | 16 +-
...fig-append-STAGING_LIBDIR-python-sys.patch | 2 +-
...ON3HOME-is-set-use-instead-of-PYTHON.patch | 47 -----
...asename-to-replace-CC-for-checking-c.patch | 37 ++--
...runtime-test-to-get-float-byte-order.patch | 199 ------------------
...ssing-libraries-to-Extension-for-mul.patch | 80 -------
...report-missing-dependencies-for-disa.patch | 11 +-
...tutils-prefix-is-inside-staging-area.patch | 2 +-
.../python3/avoid_warning_about_tkinter.patch | 33 ++-
.../python/python3/python-config.patch | 24 ++-
.../{python3_3.7.5.bb => python3_3.8.0.bb} | 28 ++-
14 files changed, 173 insertions(+), 478 deletions(-)
delete mode 100644 meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch
delete mode 100644 meta/recipes-devtools/python/python3/0002-Don-t-do-runtime-test-to-get-float-byte-order.patch
delete mode 100644 meta/recipes-devtools/python/python3/0003-setup.py-pass-missing-libraries-to-Extension-for-mul.patch
rename meta/recipes-devtools/python/{python3_3.7.5.bb => python3_3.8.0.bb} (92%)meta/classes/python3-dir.bbclass +1 -1
@@ -1,4 +1,4 @@ -PYTHON_BASEVERSION = "3.7" +PYTHON_BASEVERSION = "3.8" PYTHON_ABI = "m" PYTHON_DIR = "python${PYTHON_BASEVERSION}" PYTHON_PN = "python3"
meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch +7 -7
@@ -1,4 +1,4 @@ -From 23294c6ba6896115828293fdb7e67b47b38ba675 Mon Sep 17 00:00:00 2001 +From 039c53dd5baddec3359a05be0bff46a3b32bbb84 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 25 Jan 2019 19:04:13 +0100 Subject: [PATCH] Do not add /usr/lib/termcap to linker flags to avoid host
@@ -12,14 +12,14 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py -index b4357e3..fbec00d 100644 +index 20d7f35..ab18ff0 100644 --- a/setup.py +++ b/setup.py -@@ -856,7 +856,6 @@ class PyBuildExt(build_ext): +@@ -957,7 +957,6 @@ class PyBuildExt(build_ext): 'termcap'): readline_libs.append('termcap') - exts.append( Extension('readline', ['readline.c'], -- library_dirs=['/usr/lib/termcap'], - extra_link_args=readline_extra_link_args, - libraries=readline_libs) ) + self.add(Extension('readline', ['readline.c'], +- library_dirs=['/usr/lib/termcap'], + extra_link_args=readline_extra_link_args, + libraries=readline_libs)) else:
meta/recipes-devtools/python/python3/0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patch +87 -69
232 lines not on this page · raw message
meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch +8 -8
@@ -1,4 +1,4 @@ -From 7535c39951b9d15dd64c4669092a8582ba555466 Mon Sep 17 00:00:00 2001 +From 2581ebe3cd9686089aed223651e1b8bf0b862b48 Mon Sep 17 00:00:00 2001 From: Matthias Schoepfer <[email protected]> Date: Fri, 31 May 2019 15:34:34 +0200 Subject: [PATCH] bpo-36852: proper detection of mips architecture for soft
@@ -12,15 +12,16 @@ to do this in a more autoconf/autotools manner. Upstream-Status: Submitted [https://github.com/python/cpython/pull/13196] Signed-off-by: Matthias Schoepfer <[email protected]> + --- - configure.ac | 169 ++++++--------------------------------------------- - 1 file changed, 17 insertions(+), 152 deletions(-) + configure.ac | 171 +++++---------------------------------------------- + 1 file changed, 17 insertions(+), 154 deletions(-) diff --git a/configure.ac b/configure.ac -index a7de901e08..a73e2de51b 100644 +index 0f85486..0ca7e24 100644 --- a/configure.ac +++ b/configure.ac -@@ -727,158 +727,23 @@ fi +@@ -704,160 +704,23 @@ fi MULTIARCH=$($CC --print-multiarch 2>/dev/null) AC_SUBST(MULTIARCH)
@@ -163,6 +164,8 @@ index a7de901e08..a73e2de51b 100644 - i386-gnu -#elif defined(__APPLE__) - darwin +-#elif defined(__VXWORKS__) +- vxworks -#else -# error unknown platform triplet -#endif
@@ -196,6 +199,3 @@ index a7de901e08..a73e2de51b 100644 if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then if test x$PLATFORM_TRIPLET != x$MULTIARCH; then --- -2.21.0 -
meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch +1 -1
@@ -1,4 +1,4 @@ -From eff903c600f4c40f5753e95ab1557126fc6e0c9c Mon Sep 17 00:00:00 2001 +From cf676775109c0a7fb38058bb60b453ff8f1a166b Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Thu, 31 Jan 2019 16:46:30 +0100 Subject: [PATCH] distutils/sysconfig: append
meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch deleted +0 -47
47 lines not on this page · raw message
meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch +19 -18
@@ -1,4 +1,4 @@ -From 2645317fef09afe31b01bb2c1d4fe5b9afdbb11a Mon Sep 17 00:00:00 2001 +From 994783da5c21cab81b6589ed2d4275e665a946f9 Mon Sep 17 00:00:00 2001 From: Changqing Li <[email protected]> Date: Mon, 22 Oct 2018 15:19:51 +0800 Subject: [PATCH] python3: use cc_basename to replace CC for checking compiler
@@ -21,12 +21,13 @@ Signed-off-by: Li Zhou <[email protected]> patch originally from Li Zhou, I just rework it to new version Signed-off-by: Changqing Li <[email protected]> + --- configure.ac | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac -index a7de901..4a3681f 100644 +index a189d42..0f85486 100644 --- a/configure.ac +++ b/configure.ac @@ -54,6 +54,7 @@ AC_CONFIG_HEADER(pyconfig.h)
@@ -37,7 +38,7 @@ index a7de901..4a3681f 100644 # pybuilddir.txt will be created by --generate-posix-vars in the Makefile rm -f pybuilddir.txt -@@ -695,7 +696,7 @@ AC_MSG_RESULT($with_cxx_main) +@@ -671,7 +672,7 @@ AC_MSG_RESULT($with_cxx_main) preset_cxx="$CXX" if test -z "$CXX" then
@@ -46,7 +47,7 @@ index a7de901..4a3681f 100644 gcc) AC_PATH_TOOL(CXX, [g++], [g++], [notfound]) ;; cc) AC_PATH_TOOL(CXX, [c++], [c++], [notfound]) ;; clang|*/clang) AC_PATH_TOOL(CXX, [clang++], [clang++], [notfound]) ;; -@@ -979,7 +980,7 @@ rmdir CaseSensitiveTestDir +@@ -957,7 +958,7 @@ rmdir CaseSensitiveTestDir case $ac_sys_system in hp*|HP*)
@@ -55,7 +56,7 @@ index a7de901..4a3681f 100644 cc|*/cc) CC="$CC -Ae";; esac;; esac -@@ -1336,7 +1337,7 @@ else +@@ -1335,7 +1336,7 @@ else fi], [AC_MSG_RESULT(no)]) if test "$Py_LTO" = 'true' ; then
@@ -64,7 +65,7 @@ index a7de901..4a3681f 100644 *clang*) AC_SUBST(LLVM_AR) AC_PATH_TOOL(LLVM_AR, llvm-ar, '', ${llvm_path}) -@@ -1426,7 +1427,7 @@ then +@@ -1425,7 +1426,7 @@ then fi fi LLVM_PROF_ERR=no
@@ -73,16 +74,16 @@ index a7de901..4a3681f 100644 *clang*) # Any changes made here should be reflected in the GCC+Darwin case below PGO_PROF_GEN_FLAG="-fprofile-instr-generate" -@@ -1500,7 +1501,7 @@ then - WRAP="-fwrapv" - fi +@@ -1486,7 +1487,7 @@ esac + # compiler and platform. BASECFLAGS tweaks need to be made even if the + # user set OPT. -- case $CC in -+ case $cc_basename in - *clang*) - cc_is_clang=1 - ;; -@@ -1623,7 +1624,7 @@ yes) +-case $CC in ++case $cc_basename in + *clang*) + cc_is_clang=1 + ;; +@@ -1622,7 +1623,7 @@ yes) # ICC doesn't recognize the option, but only emits a warning ## XXX does it emit an unused result warning and can it be disabled?
@@ -91,7 +92,7 @@ index a7de901..4a3681f 100644 *icc*) ac_cv_disable_unused_result_warning=no ;; -@@ -1965,7 +1966,7 @@ yes) +@@ -1943,7 +1944,7 @@ yes) esac # ICC needs -fp-model strict or floats behave badly
@@ -100,7 +101,7 @@ index a7de901..4a3681f 100644 *icc*) CFLAGS_NODIST="$CFLAGS_NODIST -fp-model strict" ;; -@@ -2727,7 +2728,7 @@ then +@@ -2711,7 +2712,7 @@ then then LINKFORSHARED="-Wl,--export-dynamic" fi;;
@@ -109,7 +110,7 @@ index a7de901..4a3681f 100644 *gcc*) if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null then -@@ -5429,7 +5430,7 @@ if test "$have_gcc_asm_for_x87" = yes; then +@@ -5362,7 +5363,7 @@ if test "$have_gcc_asm_for_x87" = yes; then # Some versions of gcc miscompile inline asm: # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491 # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html
meta/recipes-devtools/python/python3/0002-Don-t-do-runtime-test-to-get-float-byte-order.patch deleted +0 -199
199 lines not on this page · raw message
meta/recipes-devtools/python/python3/0003-setup.py-pass-missing-libraries-to-Extension-for-mul.patch deleted +0 -80
80 lines not on this page · raw message
meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch +6 -5
@@ -1,4 +1,4 @@ -From e3b59cb9658e1d3efa3535840939a0fa92a70a5a Mon Sep 17 00:00:00 2001 +From a2dd127b4163aff6cc35af0d0251321964232ad4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Mon, 7 Oct 2019 13:22:14 +0200 Subject: [PATCH] setup.py: do not report missing dependencies for disabled
@@ -10,22 +10,23 @@ build completeness checker which relies on the report. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <[email protected]> + --- setup.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/setup.py b/setup.py -index 4b53668..0097643 100644 +index 7691258..ec3f2a4 100644 --- a/setup.py +++ b/setup.py -@@ -365,6 +365,10 @@ class PyBuildExt(build_ext): +@@ -408,6 +408,10 @@ class PyBuildExt(build_ext): print("%-*s %-*s %-*s" % (longest, e, longest, f, longest, g)) + # There is no need to report missing module dependencies, + # if the modules have been disabled in the first place. -+ missing = list(set(missing) - set(sysconf_dis)) ++ self.missing = list(set(self.missing) - set(sysconf_dis)) + - if missing: + if self.missing: print() print("Python build finished successfully!")
meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch +1 -1
@@ -1,4 +1,4 @@ -From a274ba778838824efcacaba57c415b7262f779ec Mon Sep 17 00:00:00 2001 +From 93b2c26467b0ea9a18c178e4e1371d52e917a68b Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Tue, 14 May 2013 15:00:26 -0700 Subject: [PATCH] python3: Add target and native recipes
meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch +14 -19
@@ -1,4 +1,4 @@ -From fead48c8b501a8d7c3db21df2e599f90f38f11d3 Mon Sep 17 00:00:00 2001 +From ba7202700578d435b07cfdfb7b57e83185752800 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan <[email protected]> Date: Mon, 28 Jan 2019 15:57:54 +0000 Subject: [PATCH] _tkinter module needs tk module along with tcl. tk is not yet
@@ -11,26 +11,21 @@ Also simply disable the tk module since its not in DEPENDS. Signed-off-by: Andrei Gherzan <[email protected]> --- - setup.py | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index fbec00d..b7a36a6 100644 +index ab18ff0..7691258 100644 --- a/setup.py +++ b/setup.py -@@ -1623,10 +1623,12 @@ class PyBuildExt(build_ext): - self.extensions.extend(exts) +@@ -1706,8 +1706,8 @@ class PyBuildExt(build_ext): + self.detect_decimal() + self.detect_ctypes() + self.detect_multiprocessing() +- if not self.detect_tkinter(): +- self.missing.append('_tkinter') ++# if not self.detect_tkinter(): ++# self.missing.append('_tkinter') + self.detect_uuid() - # Call the method for detecting whether _tkinter can be compiled -- self.detect_tkinter(inc_dirs, lib_dirs) -+ # self.detect_tkinter(inc_dirs, lib_dirs) - -- if '_tkinter' not in [e.name for e in self.extensions]: -- missing.append('_tkinter') -+ # tkinter module will not be avalaible as yocto -+ # doesn't have tk integrated (yet) -+ #if '_tkinter' not in [e.name for e in self.extensions]: -+ # missing.append('_tkinter') - - # Build the _uuid module if possible - uuid_incs = find_file("uuid.h", inc_dirs, ["/usr/include/uuid"]) + ## # Uncomment these lines if you want to play with xxmodule.c
meta/recipes-devtools/python/python3/python-config.patch +16 -8
@@ -1,4 +1,7 @@ -python-config: Revert to using distutils.sysconfig +From 07df0ae0d70cba6d1847fe1c24a71063930bec60 Mon Sep 17 00:00:00 2001 +From: Tyler Hall <[email protected]> +Date: Sun, 4 May 2014 20:06:43 -0400 +Subject: [PATCH] python-config: Revert to using distutils.sysconfig The newer sysconfig module shares some code with distutils.sysconfig, but the same modifications as in
@@ -12,11 +15,16 @@ Upstream-Status: Inappropriate [Embedded Specific] Signed-off-by: Tyler Hall <[email protected]> : -Index: Python-3.3.3/Misc/python-config.in -=================================================================== ---- Python-3.3.3.orig/Misc/python-config.in -+++ Python-3.3.3/Misc/python-config.in -@@ -4,7 +4,7 @@ + +--- + Misc/python-config.in | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Misc/python-config.in b/Misc/python-config.in +index 727c4a8..c702829 100644 +--- a/Misc/python-config.in ++++ b/Misc/python-config.in +@@ -6,7 +6,7 @@ import getopt import os import sys
@@ -24,8 +32,8 @@ Index: Python-3.3.3/Misc/python-config.in +from distutils import sysconfig valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags', - 'ldflags', 'extension-suffix', 'help', 'abiflags', 'configdir'] -@@ -32,14 +32,14 @@ if '--help' in opt_flags: + 'ldflags', 'extension-suffix', 'help', 'abiflags', 'configdir', +@@ -35,14 +35,14 @@ if '--help' in opt_flags: for opt in opt_flags: if opt == '--prefix':
meta/recipes-devtools/python/python3_3.8.0.bb renamed from meta/recipes-devtools/python/python3_3.7.5.bb +13 -15
@@ -19,8 +19,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch \ file://0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patch \ file://0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch \ - file://0002-Don-t-do-runtime-test-to-get-float-byte-order.patch \ - file://0003-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \ file://0001-Lib-sysconfig.py-fix-another-place-where-lib-is-hard.patch \ file://0001-Makefile-fix-Issue36464-parallel-build-race-problem.patch \ file://0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch \
@@ -35,19 +33,16 @@ SRC_URI_append_class-native = " \ file://0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch \ file://12-distutils-prefix-is-inside-staging-area.patch \ " -SRC_URI_append_class-nativesdk = " \ - file://0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch \ - " -SRC_URI[md5sum] = "08ed8030b1183107c48f2092e79a87e2" -SRC_URI[sha256sum] = "e85a76ea9f3d6c485ec1780fca4e500725a4a7bbc63c78ebc44170de9b619d94" +SRC_URI[md5sum] = "dbac8df9d8b9edc678d0f4cacdb7dbb0" +SRC_URI[sha256sum] = "b356244e13fb5491da890b35b13b2118c3122977c2cd825e3eb6e7d462030d84" # exclude pre-releases for both python 2.x and 3.x UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" CVE_PRODUCT = "python" -PYTHON_MAJMIN = "3.7" +PYTHON_MAJMIN = "3.8" PYTHON_BINABI = "${PYTHON_MAJMIN}m" S = "${WORKDIR}/Python-${PV}"
@@ -59,8 +54,8 @@ inherit autotools pkgconfig qemu ptest multilib_header update-alternatives MULTILIB_SUFFIX = "${@d.getVar('base_libdir',1).split('/')[-1]}" ALTERNATIVE_${PN}-dev = "python3-config" -ALTERNATIVE_LINK_NAME[python3-config] = "${bindir}/python${PYTHON_BINABI}-config" -ALTERNATIVE_TARGET[python3-config] = "${bindir}/python${PYTHON_BINABI}-config-${MULTILIB_SUFFIX}" +ALTERNATIVE_LINK_NAME[python3-config] = "${bindir}/python${PYTHON_MAJMIN}-config" +ALTERNATIVE_TARGET[python3-config] = "${bindir}/python${PYTHON_MAJMIN}-config-${MULTILIB_SUFFIX}" DEPENDS = "bzip2-replacement-native libffi bzip2 openssl sqlite3 zlib virtual/libintl xz virtual/crypt util-linux libtirpc libnsl2"
@@ -131,7 +126,7 @@ do_install_prepend() { } do_install_append_class-target() { - oe_multilib_header python${PYTHON_BINABI}/pyconfig.h + oe_multilib_header python${PYTHON_MAJMIN}/pyconfig.h } do_install_append_class-native() {
@@ -161,7 +156,7 @@ do_install_append() { } do_install_append_class-nativesdk () { - create_wrapper ${D}${bindir}/python${PYTHON_MAJMIN} OEPYTHON3HOME='${prefix}' TERMINFO_DIRS='${sysconfdir}/terminfo:/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo' PYTHONNOUSERSITE='1' + create_wrapper ${D}${bindir}/python${PYTHON_MAJMIN} TERMINFO_DIRS='${sysconfdir}/terminfo:/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo' PYTHONNOUSERSITE='1' } SSTATE_SCAN_FILES += "Makefile _sysconfigdata.py"
@@ -177,7 +172,7 @@ py_package_preprocess () { -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ ${PKGD}/${prefix}/lib/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}${PYTHON_ABI}*/Makefile \ ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata*.py \ - ${PKGD}/${bindir}/python${PYTHON_BINABI}-config + ${PKGD}/${bindir}/python${PYTHON_MAJMIN}-config # Reformat _sysconfigdata after modifying it so that it remains # reproducible
@@ -196,7 +191,7 @@ py_package_preprocess () { -c "from py_compile import compile; compile('$sysconfigfile', optimize=2)" cd - - mv ${PKGD}/${bindir}/python${PYTHON_BINABI}-config ${PKGD}/${bindir}/python${PYTHON_BINABI}-config-${MULTILIB_SUFFIX} + mv ${PKGD}/${bindir}/python${PYTHON_MAJMIN}-config ${PKGD}/${bindir}/python${PYTHON_MAJMIN}-config-${MULTILIB_SUFFIX} #Remove the unneeded copy of target sysconfig data rm -rf ${PKGD}/${libdir}/python-sysconfigdata
@@ -319,7 +314,7 @@ RPROVIDES_${PN}-venv += "python3-pyvenv" # package libpython3 PACKAGES =+ "libpython3 libpython3-staticdev" FILES_libpython3 = "${libdir}/libpython*.so.*" -FILES_libpython3-staticdev += "${prefix}/lib/python${PYTHON_MAJMIN}/config-${PYTHON_BINABI}-*/libpython${PYTHON_BINABI}.a" +FILES_libpython3-staticdev += "${prefix}/lib/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}-*/libpython${PYTHON_MAJMIN}.a" INSANE_SKIP_${PN}-dev += "dev-elf" # catch all the rest (unsorted)
@@ -338,3 +333,6 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = " locale-base-tr-tr.iso-8859-9" RDEPENDS_${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', 'tk tk-lib', '', d)}" RDEPENDS_${PN}-dev = "" +RDEPENDS_${PN}-tests_append_class-target = " bash" +RDEPENDS_${PN}-tests_append_class-nativesdk = " bash" +
Signature · 1 line
2.17.1
Re: [PATCH 15/15] python3: update to 3.8.0
Not sure what is going on but with this when btrfs-tools is rebuild:
packages/corei7-64-poky-linux/btrfs-tools/btrfs-tools: FILELIST: directory renamed /usr/lib/python3.7/site-packages/btrfsutil-1.1.1-py3.7.egg-info -> /usr/lib/python3.8/site-packages/btrfsutil-1.1.1-py3.8.egg-info, removed "/usr/lib/python3.7/site-packages/btrfsutil.cpython-37m-x86_64-linux-gnu.so", added "/usr/lib/python3.8/site-packages/btrfsutil.cpython-38-x86_64-linux-gnu.so"
Basically, all the 3.7 references are now 3.8. That's fine.
packages/corei7-64-poky-linux/btrfs-tools/btrfs-tools: RDEPENDS: removed "libpython3 (['>= 3.7.5'])"
Python 3.7 is removed but no Python 3.8 added. Weird!
Ross
Re: [PATCH 15/15] python3: update to 3.8.0
Quoted 9 lines · Ross Burton
Not sure what is going on but with this when btrfs-tools is rebuild:
packages/corei7-64-poky-linux/btrfs-tools/btrfs-tools: FILELIST: directory renamed
/usr/lib/python3.7/site-packages/btrfsutil-1.1.1-py3.7.egg-info->/usr/lib/python3.8/site-packages/btrfsutil-1.1.1-py3.8.egg-info, removed "/usr/lib/python3.7/site-packages/btrfsutil.cpython-37m-x86_64-linux-gnu.so", added "/usr/lib/python3.8/site-packages/btrfsutil.cpython-38-x86_64-linux-gnu.so"Basically, all the 3.7 references are now 3.8. That's fine.
packages/corei7-64-poky-linux/btrfs-tools/btrfs-tools: RDEPENDS: removed "libpython3 (['>= 3.7.5'])"
Python 3.7 is removed but no Python 3.8 added. Weird!
Same happened to gpgme:
packages/corei7-64-poky-linux/gpgme/python3-gpg: RDEPENDS: removed "libpython3 (['>= 3.7.5'])"
Ross
Re: [PATCH 15/15] python3: update to 3.8.0
Ah,
packages/corei7-64-poky-linux/python3/libpython3: PKG changed from libpython3.7m1.0 to libpython3.8-1.0
Maybe remove the m from python3dir.bbclass?
Ross
Re: [PATCH 15/15] python3: update to 3.8.0
Quoted 7 lines · Ross Burton
Ah,
packages/corei7-64-poky-linux/python3/libpython3: PKG changed from libpython3.7m1.0 to libpython3.8-1.0
Maybe remove the m from python3dir.bbclass?
Yes, I've done this in the newer version of the patch.
Alex
Re: [PATCH 15/15] python3: update to 3.8.0
In reply to Ross BurtonQuoted 15 lines · Ross Burton
Quoted 14 lines · Ross Burton
Not sure what is going on but with this when btrfs-tools is rebuild:
packages/corei7-64-poky-linux/btrfs-tools/btrfs-tools: FILELIST:
directory renamed/usr/lib/python3.7/site-packages/btrfsutil-1.1.1-py3.7.egg-info->/usr/lib/python3.8/site-packages/btrfsutil-1.1.1-py3.8.egg-info, removed "/usr/lib/python3.7/site-packages/btrfsutil.cpython-37m-x86_64-linux-gnu.so", added
"/usr/lib/python3.8/site-packages/btrfsutil.cpython-38-x86_64-linux-gnu.so"Basically, all the 3.7 references are now 3.8. That's fine.
packages/corei7-64-poky-linux/btrfs-tools/btrfs-tools: RDEPENDS: removed "libpython3 (['>= 3.7.5'])"
Quoted 6 lines
Quoted 1 line
Python 3.7 is removed but no Python 3.8 added. Weird!
Same happened to gpgme:
packages/corei7-64-poky-linux/gpgme/python3-gpg: RDEPENDS: removed "libpython3 (['>= 3.7.5'])"
That's expected, C extensions are no longer linked with libpython by default.
Quoted 1 line
Ross
cu
Adrian
Re: [PATCH 15/15] python3: update to 3.8.0
Quoted 1 line · Adrian Bunk
That's expected, C extensions are no longer linked with libpython by default.
Great, thanks Adrian.
Ross
Re: [PATCH 15/15] python3: update to 3.8.0
In reply to Alexander KanavinNew warning on some of the builders:
WARNING: python3-3.8.0-r0 do_package_qa: QA Issue: python3: /usr/lib/python3.8/__pycache__/_bootlocale.cpython-38.opt-2.pyc is owned by uid 6000, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]
Ross
✗ patchtest: failure for "rpm: upgrade to 4.15.1..." and 14 more
In reply to Alexander Kanavin== Series Details ==
Series: "rpm: upgrade to 4.15.1..." and 14 more
Revision: 1
URL : https://patchwork.openembedded.org/series/21407/
State : failure
== Summary ==
Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:
* Patch [11/15] flex: update to 2.6.4 Issue Missing or incorrectly formatted CVE tag in included patch file [test_cve_tag_format] Suggested fix Correct or include the CVE tag on cve patch with format: "CVE: CVE-YYYY-XXXX"
* Issue Upstream-Status is Inappropriate, but no reason was provided [test_upstream_status_presence_format]
Suggested fix Include a brief reason why use-pkgconfig.patch is inappropriate Current Upstream-Status: Inappropriate (upstream still refuse to consider pkg-config) Standard format Upstream-Status: Inappropriate [reason]
If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).
---
Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
This is reliably crashing for me when running rpmdeps:
Exception: bb.process.ExecutionError: Execution of '/data/poky-tmp/master/work/corei7-64-poky-linux/systemd-compat-units/1.0-r29/temp/run.BUILDSPEC.1481' failed with exit code 139:
Building target platforms: corei7_64-poky-linux
Building for target corei7_64-poky-linux
Processing files: systemd-compat-units-1.0-r29.corei7_64
Processing files: systemd-compat-units-dbg-1.0-r29.corei7_64
Processing files: systemd-compat-units-dev-1.0-r29.corei7_64
Checking for unpackaged file(s): /data/poky-tmp/master/work/corei7-64-poky-linux/systemd-compat-units/1.0-r29/recipe-sysroot-native/usr/bin/../../usr/lib/rpm/check-files /data/poky-tmp/master/work/corei7-64-poky-linux/systemd-compat-units/1.0-r29/package Segmentation fault (core dumped)
WARNING: exit code 139 from a shell command.
Ross
Quoted 15 lines · Ross Burton
This is reliably crashing for me when running rpmdeps:
Exception: bb.process.ExecutionError: Execution of '/data/poky-tmp/master/work/corei7-64-poky-linux/systemd-compat-units/1.0-r29/temp/run.BUILDSPEC.1481'
failed with exit code 139:
Building target platforms: corei7_64-poky-linux
Building for target corei7_64-poky-linux
Processing files: systemd-compat-units-1.0-r29.corei7_64
Processing files: systemd-compat-units-dbg-1.0-r29.corei7_64
Processing files: systemd-compat-units-dev-1.0-r29.corei7_64
Checking for unpackaged file(s):
/data/poky-tmp/master/work/corei7-64-poky-linux/systemd-compat-units/1.0-r29/recipe-sysroot-native/usr/bin/../../usr/lib/rpm/check-files
Quoted 4 lines
/data/poky-tmp/master/work/corei7-64-poky-linux/systemd-compat-units/1.0-r29/package Segmentation fault (core dumped)
WARNING: exit code 139 from a shell command.
Here it's been robust. Can you produce a backtrace?
Alex
Quoted 1 line · Alexander Kanavin
Here it's been robust. Can you produce a backtrace?
I was hoping you wouldn't say that. ;)
Yes, on Monday.
Ross
Quoted 16 lines · Alexander Kanavin
On Fri, 29 Nov 2019 at 21:52, Ross Burton <[email protected] <mailto:[email protected]>> wrote:
This is reliably crashing for me when running rpmdeps:
Exception: bb.process.ExecutionError: Execution of '/data/poky-tmp/master/work/corei7-64-poky-linux/systemd-compat-units/1.0-r29/temp/run.BUILDSPEC.1481'
failed with exit code 139:
Building target platforms: corei7_64-poky-linux
Building for target corei7_64-poky-linux
Processing files: systemd-compat-units-1.0-r29.corei7_64
Processing files: systemd-compat-units-dbg-1.0-r29.corei7_64
Processing files: systemd-compat-units-dev-1.0-r29.corei7_64
Checking for unpackaged file(s):
/data/poky-tmp/master/work/corei7-64-poky-linux/systemd-compat-units/1.0-r29/recipe-sysroot-native/usr/bin/../../usr/lib/rpm/check-files
Quoted 6 lines
/data/poky-tmp/master/work/corei7-64-poky-linux/systemd-compat-units/1.0-r29/package Segmentation fault (core dumped)
WARNING: exit code 139 from a shell command.Here it's been robust. Can you produce a backtrace?
Reliably crashes here with systemd-compat-units.
Program terminated with signal SIGSEGV, Segmentation fault.
#0 0x00007fd087a2414a in dataLength (type=type@entry=8, p=p@entry=0x7fd07ec22c08, count=0,
count@entry=1, onDisk=onDisk@entry=0, pend=pend@entry=0x0) at
../../git/lib/header.c:462
462 ../../git/lib/header.c: No such file or directory.
[Current thread is 1 (LWP 19382)]
(gdb) bt
#0 0x00007fd087a2414a in dataLength (type=type@entry=8, p=p@entry=0x7fd07ec22c08, count=0,
count@entry=1, onDisk=onDisk@entry=0, pend=pend@entry=0x0) at
../../git/lib/header.c:462
#1 0x00007fd087a247fb in grabData (type=8, p=0x7fd07ec22c08, c=1,
lengthPtr=lengthPtr@entry=0x7fd07ec22b3c) at
../../git/lib/header.c:1406
#2 0x00007fd087a24891 in intAddEntry (h=h@entry=0x55d2e872e9b0, td=td@entry=0x7fd07ec22b90)
at ../../git/lib/header.c:1432
#3 0x00007fd087a258e7 in headerPut (h=h@entry=0x55d2e872e9b0, td=td@entry=0x7fd07ec22b90,
flags=flags@entry=1) at ../../git/lib/header.c:1499
#4 0x00007fd087a23034 in headerPutType (h=h@entry=0x55d2e872e9b0, tag=tag@entry=5092,
reqtype=<optimized out>, data=0x7fd07ec22c08, size=size@entry=1) at
../../git/lib/headerutil.c:135
#5 0x00007fd087a232fc in headerPutString (h=0x55d2e872e9b0, tag=tag@entry=5092, val=<optimized out>)
at ../../git/lib/headerutil.c:155
#6 0x00007fd087a93fe9 in writeRPM (pkg=pkg@entry=0x55d2e872e870, pkgidp=pkgidp@entry=0x0,
fileName=0x7fd068004cf0
"/data/poky-tmp/master/work/corei7-64-poky-linux/systemd-compat-units/1.0-r29/deploy-rpms/corei7_64/systemd-compat-units-dev-1.0-r29.corei7_64.rpm", cookie=cookie@entry=0x0,
buildTime=1575413653, buildHost=0x55d2e87ebc20 "reproducible") at
../../git/build/pack.c:499
#7 0x00007fd087a945e1 in packageBinary (spec=0x55d2e87195c0, pkg=pkg@entry=0x55d2e872e870, cookie=0x0,
cheating=<optimized out>, filename=filename@entry=0x55d2e872e990) at ../../git/build/pack.c:730
#8 0x00007fd087a94659 in packageBinaries._omp_fn.1 () at ../../git/build/pack.c:753 #9 0x00007fd087627769 in ?? () from /usr/lib/x86_64-linux-gnu/libgomp.so.1 #10 0x00007fd08762ff00 in ?? () from /usr/lib/x86_64-linux-gnu/libgomp.so.1 #11 0x00007fd087a92f4c in packageBinaries._omp_fn.0 () at ../../git/build/pack.c:749 #12 0x00007fd08762d79e in ?? () from /usr/lib/x86_64-linux-gnu/libgomp.so.1 #13 0x00007fd08765eed4 in ?? ()
from
/data/poky-tmp/master/sysroots-uninative/x86_64-linux/lib/libpthread.so.0 #14 0x00007fd08754deff in clone ()
from /data/poky-tmp/master/sysroots-uninative/x86_64-linux/lib/libc.so.6
Ross
Quoted 65 lines · Ross Burton
Quoted 21 lines · Alexander Kanavin
On Fri, 29 Nov 2019 at 21:52, Ross Burton <[email protected] <mailto:[email protected]>> wrote:
This is reliably crashing for me when running rpmdeps:
Exception: bb.process.ExecutionError: Execution of
'/data/poky-tmp/master/work/corei7-64-poky-linux/systemd-compat-units/1.0-r29/temp/run.BUILDSPEC.1481'
failed with exit code 139:
Building target platforms: corei7_64-poky-linux Building for target corei7_64-poky-linux Processing files: systemd-compat-units-1.0-r29.corei7_64 Processing files: systemd-compat-units-dbg-1.0-r29.corei7_64 Processing files: systemd-compat-units-dev-1.0-r29.corei7_64 Checking for unpackaged file(s):/data/poky-tmp/master/work/corei7-64-poky-linux/systemd-compat-units/1.0-r29/recipe-sysroot-native/usr/bin/../../usr/lib/rpm/check-files
Quoted 7 lines
/data/poky-tmp/master/work/corei7-64-poky-linux/systemd-compat-units/1.0-r29/package
Segmentation fault (core dumped)
WARNING: exit code 139 from a shell command.Here it's been robust. Can you produce a backtrace?
Reliably crashes here with systemd-compat-units.
Program terminated with signal SIGSEGV, Segmentation fault.
#00x00007fd087a2414ain dataLength (type=type@entry=8, p=p@entry=0x7fd07ec22c08, count=0,
count@entry=1, onDisk=onDisk@entry=0, pend=pend@entry=0x0) at../../git/lib/header.c:462
462../../git/lib/header.c: No such file or directory.
[Current thread is 1 (LWP 19382)]
(gdb) bt
#00x00007fd087a2414ain dataLength (type=type@entry=8, p=p@entry=0x7fd07ec22c08, count=0,
count@entry=1, onDisk=onDisk@entry=0, pend=pend@entry=0x0) at../../git/lib/header.c:462
#10x00007fd087a247fbin grabData (type=8, p=0x7fd07ec22c08, c=1,
lengthPtr=lengthPtr@entry=0x7fd07ec22b3c) at../../git/lib/header.c:1406
#20x00007fd087a24891in intAddEntry (h=h@entry=0x55d2e872e9b0, td=td@entry=0x7fd07ec22b90)
at../../git/lib/header.c:1432
#30x00007fd087a258e7in headerPut (h=h@entry=0x55d2e872e9b0, td=td@entry=0x7fd07ec22b90,
flags=flags@entry=1) at../../git/lib/header.c:1499
#40x00007fd087a23034in headerPutType (h=h@entry=0x55d2e872e9b0, tag=tag@entry=5092,
reqtype=<optimized out>, data=0x7fd07ec22c08, size=size@entry=1) at../../git/lib/headerutil.c:135
#50x00007fd087a232fcin headerPutString (h=0x55d2e872e9b0, tag=tag@entry=5092, val=<optimized out>)
at../../git/lib/headerutil.c:155
#60x00007fd087a93fe9in writeRPM (pkg=pkg@entry=0x55d2e872e870, pkgidp=pkgidp@entry=0x0,
fileName=0x7fd068004cf0
"/data/poky-tmp/master/work/corei7-64-poky-linux/systemd-compat-units/1.0-r29/deploy-rpms/corei7_64/systemd-compat-units-dev-1.0-r29.corei7_64.rpm", cookie=cookie@entry=0x0,
buildTime=1575413653, buildHost=0x55d2e87ebc20 "reproducible") at../../git/build/pack.c:499
#70x00007fd087a945e1in packageBinary (spec=0x55d2e87195c0, pkg=pkg@entry=0x55d2e872e870, cookie=0x0,
cheating=<optimized out>, filename=filename@entry=0x55d2e872e990)
at../../git/build/pack.c:730
#80x00007fd087a94659in packageBinaries._omp_fn.1 () at../../git/build/pack.c:753
#90x00007fd087627769in ?? () from/usr/lib/x86_64-linux-gnu/libgomp.so.1
#100x00007fd08762ff00in ?? () from/usr/lib/x86_64-linux-gnu/libgomp.so.1
Quoted 8 lines
#11
0x00007fd087a92f4cin packageBinaries._omp_fn.0 () at../../git/build/pack.c:749#120x00007fd08762d79ein ?? () from/usr/lib/x86_64-linux-gnu/libgomp.so.1#130x00007fd08765eed4in ?? ()
from
/data/poky-tmp/master/sysroots-uninative/x86_64-linux/lib/libpthread.so.0 #140x00007fd08754deffin clone ()
from
/data/poky-tmp/master/sysroots-uninative/x86_64-linux/lib/libc.so.6
Okay, maybe this is actually due to my gcrypt-using patch...
Ross
Quoted 3 lines · Ross Burton
Okay, maybe this is actually due to my gcrypt-using patch...
This implies rpm's usage of gcrypt is somehow not thread-safe :( as the backtrace includes those openmp routines that we use to write packages in parallel.
Alex