rpm: upgrade to 4.15.1
PATCH 1/24 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/24 gettext-minimal-native: update to 0.20.1
Rather 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 3/24 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
Re: [PATCH 03/24] gettext: update to 0.20.1
bunch of fails due to this
https://errors.yoctoproject.org/Errors/Build/94021/
needs fixes like
https://github.com/YoeDistro/meta-openembedded/commit/5b5a7a23e34242cb94fe2fdd89f2b060fefba5c5
Quoted 1,484 lines · Alexander Kanavin
License-Update: URLs changed from http to https
Signed-off-by Alexander Kanavin <[email protected]>--- .../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@@ -1,321 +0,0 @@ -For reasons which I just can't fathom gnulib doesn't use the expected tools to -find libraries but badly reinvents the wheel. This will trivially lead to host -contamination (explicit searches of /usr/lib) or incorrect RPATHs (bad -canonicalisation resulting in relative paths). - -Simply delete all the crazy, and replace with a single call to pkg-config. - -Upstream-Status: Inappropriate (upstream still refuse to consider pkg-config) -Signed-off-by: Ross Burton <[email protected]> - -diff --git a/gnulib-local/m4/libcroco.m4 b/gnulib-local/m4/libcroco.m4 -index f79ea82f1..1f67274db 100644 ---- a/gettext-tools/gnulib-m4/libcroco.m4 -+++ b/gettext-tools/gnulib-m4/libcroco.m4 -@@ -8,6 +8,7 @@ dnl From Bruno Haible. - - AC_DEFUN([gl_LIBCROCO], - [ -+ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) - dnl libcroco depends on libglib. - AC_REQUIRE([gl_LIBGLIB]) - -@@ -23,65 +24,10 @@ AC_DEFUN([gl_LIBCROCO], - LTLIBCROCO= - INCCROCO= - if test "$gl_cv_libcroco_use_included" != yes; then -- dnl Figure out whether we can use a preinstalled libcroco-0.6, or have to -- dnl use the included one. -- AC_CACHE_VAL([gl_cv_libcroco], [ -- gl_cv_libcroco=no -- gl_cv_LIBCROCO= -- gl_cv_LTLIBCROCO= -- gl_cv_INCCROCO= -- gl_save_LIBS="$LIBS" -- dnl Search for libcroco and define LIBCROCO_0_6, LTLIBCROCO_0_6 and -- dnl INCCROCO_0_6 accordingly. -- dnl Don't use croco-0.6-config nor pkg-config, since it doesn't work when -- dnl cross-compiling or when the C compiler in use is different from the -- dnl one that built the library. -- AC_LIB_LINKFLAGS_BODY([croco-0.6], [glib-2.0]) -- LIBS="$gl_save_LIBS $LIBCROCO_0_6" -- AC_TRY_LINK([#include <libcroco-config.h>], -- [const char *version = LIBCROCO_VERSION; return !version;], -- [gl_cv_libcroco=yes -- gl_cv_LIBCROCO="$LIBCROCO_0_6" -- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6" -- ]) -- if test "$gl_cv_libcroco" != yes; then -- gl_save_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS $INCCROCO_0_6" -- AC_TRY_LINK([#include <libcroco-config.h>], -- [const char *version = LIBCROCO_VERSION; return !version;], -- [gl_cv_libcroco=yes -- gl_cv_LIBCROCO="$LIBCROCO_0_6" -- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6" -- gl_cv_INCCROCO="$INCCROCO_0_6" -- ]) -- if test "$gl_cv_libcroco" != yes; then -- dnl Often the include files are installed in -- dnl /usr/include/libcroco-0.6/libcroco. -- AC_TRY_LINK([#include <libcroco-0.6/libcroco/libcroco-config.h>], -- [const char *version = LIBCROCO_VERSION; return !version;], -- [gl_ABSOLUTE_HEADER([libcroco-0.6/libcroco/libcroco-config.h]) -- libcroco_include_dir=`echo "$gl_cv_absolute_libcroco_0_6_libcroco_libcroco_config_h" | sed -e 's,.libcroco-config\.h$,,'` -- if test -d "$libcroco_include_dir"; then -- gl_cv_libcroco=yes -- gl_cv_LIBCROCO="$LIBCROCO_0_6" -- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6" -- gl_cv_INCCROCO="-I$libcroco_include_dir" -- fi -- ]) -- fi -- CPPFLAGS="$gl_save_CPPFLAGS" -- fi -- LIBS="$gl_save_LIBS" -- ]) -- AC_MSG_CHECKING([for libcroco]) -- AC_MSG_RESULT([$gl_cv_libcroco]) -- if test $gl_cv_libcroco = yes; then -- LIBCROCO="$gl_cv_LIBCROCO" -- LTLIBCROCO="$gl_cv_LTLIBCROCO" -- INCCROCO="$gl_cv_INCCROCO" -- else -- gl_cv_libcroco_use_included=yes -- fi -+ PKG_CHECK_MODULES([CROCO], [libcroco-0.6]) -+ LIBCROCO=$CROCO_LIBS -+ LTLIBCROCO=$CROCO_LIBS -+ INCCROCO=$CROCO_CFLAGS - fi - AC_SUBST([LIBCROCO]) - AC_SUBST([LTLIBCROCO]) -diff --git a/gnulib-local/m4/libglib.m4 b/gnulib-local/m4/libglib.m4 -index 42e55e6fd..ab25a5b22 100644 ---- a/gettext-tools/gnulib-m4/libglib.m4 -+++ b/gettext-tools/gnulib-m4/libglib.m4 -@@ -8,6 +8,7 @@ dnl From Bruno Haible. - - AC_DEFUN([gl_LIBGLIB], - [ -+ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) - AC_MSG_CHECKING([whether included glib is requested]) - AC_ARG_WITH([included-glib], - [ --with-included-glib use the glib2 included here], -@@ -20,76 +21,10 @@ AC_DEFUN([gl_LIBGLIB], - LTLIBGLIB= - INCGLIB= - if test "$gl_cv_libglib_use_included" != yes; then -- dnl Figure out whether we can use a preinstalled libglib-2.0, or have to use -- dnl the included one. -- AC_CACHE_VAL([gl_cv_libglib], [ -- gl_cv_libglib=no -- gl_cv_LIBGLIB= -- gl_cv_LTLIBGLIB= -- gl_cv_INCGLIB= -- gl_save_LIBS="$LIBS" -- dnl Search for libglib2 and define LIBGLIB_2_0, LTLIBGLIB_2_0 and -- dnl INCGLIB_2_0 accordingly. -- dnl Don't use glib-config nor pkg-config, since it doesn't work when -- dnl cross-compiling or when the C compiler in use is different from the -- dnl one that built the library. -- AC_LIB_LINKFLAGS_BODY([glib-2.0]) -- LIBS="$gl_save_LIBS $LIBGLIB_2_0" -- AC_TRY_LINK([#include <glib.h> --#ifndef G_BEGIN_DECLS --error this glib.h includes a glibconfig.h from a glib version 1.x --#endif --], -- [g_string_new ("foo");], -- [gl_cv_libglib=yes -- gl_cv_LIBGLIB="$LIBGLIB_2_0" -- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0" -- ]) -- if test "$gl_cv_libglib" != yes; then -- gl_save_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS $INCGLIB_2_0" -- AC_TRY_LINK([#include <glib.h> --#ifndef G_BEGIN_DECLS --error this glib.h includes a glibconfig.h from a glib version 1.x --#endif --], -- [g_string_new ("foo");], -- [gl_cv_libglib=yes -- gl_cv_LIBGLIB="$LIBGLIB_2_0" -- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0" -- gl_cv_INCGLIB="$INCGLIB_2_0" -- ]) -- if test "$gl_cv_libglib" != yes; then -- dnl Often the include files are installed in /usr/include/glib-2.0 -- dnl and /usr/lib/glib-2.0/include. -- if test -n "$LIBGLIB_2_0_PREFIX"; then -- CPPFLAGS="$gl_save_CPPFLAGS -I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include" -- AC_TRY_LINK([#include <glib.h> --#ifndef G_BEGIN_DECLS --error this glib.h includes a glibconfig.h from a glib version 1.x --#endif --], -- [g_string_new ("foo");], -- [gl_cv_libglib=yes -- gl_cv_LIBGLIB="$LIBGLIB_2_0" -- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0" -- gl_cv_INCGLIB="-I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include" -- ]) -- fi -- fi -- CPPFLAGS="$gl_save_CPPFLAGS" -- fi -- LIBS="$gl_save_LIBS" -- ]) -- AC_MSG_CHECKING([for glib]) -- AC_MSG_RESULT([$gl_cv_libglib]) -- if test $gl_cv_libglib = yes; then -- LIBGLIB="$gl_cv_LIBGLIB" -- LTLIBGLIB="$gl_cv_LTLIBGLIB" -- INCGLIB="$gl_cv_INCGLIB" -- else -- gl_cv_libglib_use_included=yes -- fi -+ PKG_CHECK_MODULES([GLIB], [glib-2.0]) -+ LIBGLIB="$GLIB_LIBS" -+ LTLIBGLIB="$GLIB_LIBS" -+ INCGLIB="$GLIB_CFLAGS" - fi - AC_SUBST([LIBGLIB]) - AC_SUBST([LTLIBGLIB]) -diff --git a/gnulib-local/m4/libxml.m4 b/gnulib-local/m4/libxml.m4 -index 480c700d2..cb39309d5 100644 ---- a/gettext-tools/gnulib-m4/libxml.m4 -+++ b/gettext-tools/gnulib-m4/libxml.m4 -@@ -8,6 +8,7 @@ dnl From Bruno Haible. - - AC_DEFUN([gl_LIBXML], - [ -+ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) - AC_REQUIRE([AM_ICONV_LINK]) - - AC_MSG_CHECKING([whether included libxml is requested]) -@@ -22,100 +22,10 @@ AC_DEFUN([gl_LIBXML], - LTLIBXML= - INCXML= - if test "$gl_cv_libxml_use_included" != yes; then -- dnl Figure out whether we can use a preinstalled libxml2, or have to use -- dnl the included one. -- AC_CACHE_VAL([gl_cv_libxml], [ -- gl_cv_libxml=no -- gl_cv_LIBXML= -- gl_cv_LTLIBXML= -- gl_cv_INCXML= -- gl_save_LIBS="$LIBS" -- LIBS="$LIBS $LIBICONV" -- dnl Search for libxml2 and define LIBXML2, LTLIBXML2 and INCXML2 -- dnl accordingly. -- dnl Don't use xml2-config nor pkg-config, since it doesn't work when -- dnl cross-compiling or when the C compiler in use is different from the -- dnl one that built the library. -- dnl Use a test program that tries to invoke xmlFree. On Cygwin 1.7.x, -- dnl libxml2 is built in such a way that uses of xmlFree work fine with -- dnl -Wl,--enable-auto-import but lead to a link error with -- dnl -Wl,--disable-auto-import. -- AC_LIB_LINKFLAGS_BODY([xml2]) -- LIBS="$gl_save_LIBS $LIBXML2 $LIBICONV" -- AC_TRY_LINK([#include <libxml/xmlversion.h> -- #include <libxml/xmlmemory.h> -- #include <libxml/xpath.h> -- ], -- [xmlCheckVersion (0); -- xmlFree ((void *) 0); -- xmlXPathSetContextNode ((void *)0, (void *)0); -- ], -- [gl_cv_libxml=yes -- gl_cv_LIBXML="$LIBXML2 $LIBICONV" -- gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV" -- ]) -- if test "$gl_cv_libxml" != yes; then -- gl_save_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS $INCXML2" -- AC_TRY_LINK([#include <libxml/xmlversion.h> -- #include <libxml/xmlmemory.h> -- #include <libxml/xpath.h> -- ], -- [xmlCheckVersion (0); -- xmlFree ((void *) 0); -- xmlXPathSetContextNode ((void *)0, (void *)0); -- ], -- [gl_cv_libxml=yes -- gl_cv_LIBXML="$LIBXML2 $LIBICONV" -- gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV" -- gl_cv_INCXML="$INCXML2" -- ]) -- if test "$gl_cv_libxml" != yes; then -- dnl Often the include files are installed in /usr/include/libxml2. -- dnl In libxml2-2.5, <libxml/xmlversion.h> is self-contained. -- dnl In libxml2-2.6, it includes <libxml/xmlexports.h> which is -- dnl self-contained. -- libxml2_include_dir= -- AC_TRY_CPP([#include <libxml2/libxml/xmlexports.h>], -- [gl_ABSOLUTE_HEADER([libxml2/libxml/xmlexports.h]) -- libxml2_include_dir=`echo "$gl_cv_absolute_libxml2_libxml_xmlexports_h" | sed -e 's,.libxml.xmlexports\.h$,,'` -- ]) -- if test -z "$libxml2_include_dir"; then -- AC_TRY_CPP([#include <libxml2/libxml/xmlversion.h>], -- [gl_ABSOLUTE_HEADER([libxml2/libxml/xmlversion.h]) -- libxml2_include_dir=`echo "$gl_cv_absolute_libxml2_libxml_xmlversion_h" | sed -e 's,.libxml.xmlversion\.h$,,'` -- ]) -- fi -- if test -n "$libxml2_include_dir" && test -d "$libxml2_include_dir"; then -- CPPFLAGS="$gl_save_CPPFLAGS -I$libxml2_include_dir" -- AC_TRY_LINK([#include <libxml/xmlversion.h> -- #include <libxml/xmlmemory.h> -- #include <libxml/xpath.h> -- ], -- [xmlCheckVersion (0); -- xmlFree ((void *) 0); -- xmlXPathSetContextNode ((void *)0, (void *)0); -- ], -- [gl_cv_libxml=yes -- gl_cv_LIBXML="$LIBXML2 $LIBICONV" -- gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV" -- gl_cv_INCXML="-I$libxml2_include_dir" -- ]) -- fi -- fi -- CPPFLAGS="$gl_save_CPPFLAGS" -- fi -- LIBS="$gl_save_LIBS" -- ]) -- AC_MSG_CHECKING([for libxml]) -- AC_MSG_RESULT([$gl_cv_libxml]) -- if test $gl_cv_libxml = yes; then -- LIBXML="$gl_cv_LIBXML" -- LTLIBXML="$gl_cv_LTLIBXML" -- INCXML="$gl_cv_INCXML" -- else -- gl_cv_libxml_use_included=yes -- fi -+ PKG_CHECK_MODULES([XML], [libxml-2.0]) -+ LIBXML=$XML_LIBS -+ LTLIBXML=$XML_LIBS -+ INCXML=$XML_CFLAGS - fi - AC_SUBST([LIBXML]) - AC_SUBST([LTLIBXML]) -diff --git a/gnulib-local/lib/term-styled-ostream.oo.c b/gnulib-local/lib/term-styled-ostream.oo.c -index 81a407467..218565329 100644 ---- a/gettext-tools/gnulib-lib/term-styled-ostream.oo.c -+++ b/gettext-tools/gnulib-lib/term-styled-ostream.oo.c -@@ -25,4 +25,4 @@ --#include <cr-om-parser.h> --#include <cr-sel-eng.h> --#include <cr-style.h> --#include <cr-rgb.h> -+#include <libcroco/cr-om-parser.h> -+#include <libcroco/cr-sel-eng.h> -+#include <libcroco/cr-style.h> -+#include <libcroco/cr-rgb.h> -@@ -31 +31 @@ --# include <cr-fonts.h> -+# include <libcroco/cr-fonts.h> -@@ -33 +33 @@ --#include <cr-string.h> -+#include <libcroco/cr-string.h>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
-0meta/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 gtlibmeta/recipes-core/gettext/gettext-0.20.1/run-ptest renamed from meta/recipes-core/gettext/gettext-0.19.8.1/run-ptest +0
-0meta/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@@ -0,0 +1,713 @@ +From ef414b06be80c6f605731abc9e674e396b80ec9e Mon Sep 17 00:00:00 2001 +From: Ross Burton <[email protected]> +Date: Tue, 23 Jan 2018 00:54:13 +0000 +Subject: [PATCH] gettext: beat library detection into shape + +For reasons which I just can't fathom gnulib doesn't use the expected tools to +find libraries but badly reinvents the wheel. This will trivially lead to host +contamination (explicit searches of /usr/lib) or incorrect RPATHs (bad +canonicalisation resulting in relative paths). + +Simply delete all the crazy, and replace with a single call to pkg-config. + +Upstream-Status: Inappropriate (upstream still refuse to consider pkg-config) +Signed-off-by: Ross Burton <[email protected]> + +--- + gettext-tools/gnulib-m4/libxml.m4 | 99 +---------------- + .../gnulib-local/lib/term-styled-ostream.oo.c | 12 +- + libtextstyle/gnulib-local/m4/libcroco.m4 | 99 +++-------------- + libtextstyle/gnulib-local/m4/libglib.m4 | 104 +++--------------- + libtextstyle/gnulib-m4/libcroco.m4 | 99 +++-------------- + libtextstyle/gnulib-m4/libglib.m4 | 104 +++--------------- + libtextstyle/lib/term-styled-ostream.c | 12 +- + libtextstyle/lib/term-styled-ostream.oo.c | 12 +- + 8 files changed, 87 insertions(+), 454 deletions(-) + +diff --git a/gettext-tools/gnulib-m4/libxml.m4 b/gettext-tools/gnulib-m4/libxml.m4 +index 05b9550..031ee65 100644 +--- a/gettext-tools/gnulib-m4/libxml.m4 ++++ b/gettext-tools/gnulib-m4/libxml.m4 +@@ -13,6 +13,7 @@ dnl gl_LIBXML(FORCE-INCLUDED) + dnl forces the use of the included or an external libxml. + AC_DEFUN([gl_LIBXML], + [ ++ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + AC_REQUIRE([AM_ICONV_LINK]) + + ifelse([$1], , [ +@@ -30,100 +31,10 @@ AC_DEFUN([gl_LIBXML], + INCXML= + ifelse([$1], [yes], , [ + if test "$gl_cv_libxml_use_included" != yes; then +- dnl Figure out whether we can use a preinstalled libxml2, or have to use +- dnl the included one. +- AC_CACHE_VAL([gl_cv_libxml], [ +- gl_cv_libxml=no +- gl_cv_LIBXML= +- gl_cv_LTLIBXML= +- gl_cv_INCXML= +- gl_save_LIBS="$LIBS" +- LIBS="$LIBS $LIBICONV" +- dnl Search for libxml2 and define LIBXML2, LTLIBXML2 and INCXML2 +- dnl accordingly. +- dnl Don't use xml2-config nor pkg-config, since it doesn't work when +- dnl cross-compiling or when the C compiler in use is different from the +- dnl one that built the library. +- dnl Use a test program that tries to invoke xmlFree. On Cygwin 1.7.x, +- dnl libxml2 is built in such a way that uses of xmlFree work fine with +- dnl -Wl,--enable-auto-import but lead to a link error with +- dnl -Wl,--disable-auto-import. +- AC_LIB_LINKFLAGS_BODY([xml2]) +- LIBS="$gl_save_LIBS $LIBXML2 $LIBICONV" +- AC_TRY_LINK([#include <libxml/xmlversion.h> +- #include <libxml/xmlmemory.h> +- #include <libxml/xpath.h> +- ], +- [xmlCheckVersion (0); +- xmlFree ((void *) 0); +- xmlXPathSetContextNode ((void *)0, (void *)0); +- ], +- [gl_cv_libxml=yes +- gl_cv_LIBXML="$LIBXML2 $LIBICONV" +- gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV" +- ]) +- if test "$gl_cv_libxml" != yes; then +- gl_save_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $INCXML2" +- AC_TRY_LINK([#include <libxml/xmlversion.h> +- #include <libxml/xmlmemory.h> +- #include <libxml/xpath.h> +- ], +- [xmlCheckVersion (0); +- xmlFree ((void *) 0); +- xmlXPathSetContextNode ((void *)0, (void *)0); +- ], +- [gl_cv_libxml=yes +- gl_cv_LIBXML="$LIBXML2 $LIBICONV" +- gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV" +- gl_cv_INCXML="$INCXML2" +- ]) +- if test "$gl_cv_libxml" != yes; then +- dnl Often the include files are installed in /usr/include/libxml2. +- dnl In libxml2-2.5, <libxml/xmlversion.h> is self-contained. +- dnl In libxml2-2.6, it includes <libxml/xmlexports.h> which is +- dnl self-contained. +- libxml2_include_dir= +- AC_TRY_CPP([#include <libxml2/libxml/xmlexports.h>], +- [gl_ABSOLUTE_HEADER([libxml2/libxml/xmlexports.h]) +- libxml2_include_dir=`echo "$gl_cv_absolute_libxml2_libxml_xmlexports_h" | sed -e 's,.libxml.xmlexports\.h$,,'` +- ]) +- if test -z "$libxml2_include_dir"; then +- AC_TRY_CPP([#include <libxml2/libxml/xmlversion.h>], +- [gl_ABSOLUTE_HEADER([libxml2/libxml/xmlversion.h]) +- libxml2_include_dir=`echo "$gl_cv_absolute_libxml2_libxml_xmlversion_h" | sed -e 's,.libxml.xmlversion\.h$,,'` +- ]) +- fi +- if test -n "$libxml2_include_dir" && test -d "$libxml2_include_dir"; then +- CPPFLAGS="$gl_save_CPPFLAGS -I$libxml2_include_dir" +- AC_TRY_LINK([#include <libxml/xmlversion.h> +- #include <libxml/xmlmemory.h> +- #include <libxml/xpath.h> +- ], +- [xmlCheckVersion (0); +- xmlFree ((void *) 0); +- xmlXPathSetContextNode ((void *)0, (void *)0); +- ], +- [gl_cv_libxml=yes +- gl_cv_LIBXML="$LIBXML2 $LIBICONV" +- gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV" +- gl_cv_INCXML="-I$libxml2_include_dir" +- ]) +- fi +- fi +- CPPFLAGS="$gl_save_CPPFLAGS" +- fi +- LIBS="$gl_save_LIBS" +- ]) +- AC_MSG_CHECKING([for libxml]) +- AC_MSG_RESULT([$gl_cv_libxml]) +- if test $gl_cv_libxml = yes; then +- LIBXML="$gl_cv_LIBXML" +- LTLIBXML="$gl_cv_LTLIBXML" +- INCXML="$gl_cv_INCXML" +- else +- gl_cv_libxml_use_included=yes +- fi ++ PKG_CHECK_MODULES([XML], [libxml-2.0]) ++ LIBXML=$XML_LIBS ++ LTLIBXML=$XML_LIBS ++ INCXML=$XML_CFLAGS + fi + ]) + AC_SUBST([LIBXML]) +diff --git a/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c b/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c +index 2cfd4a8..d42c8b4 100644 +--- a/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c ++++ b/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c +@@ -22,15 +22,15 @@ + + #include <stdlib.h> + +-#include <cr-om-parser.h> +-#include <cr-sel-eng.h> +-#include <cr-style.h> +-#include <cr-rgb.h> ++#include <libcroco/cr-om-parser.h> ++#include <libcroco/cr-sel-eng.h> ++#include <libcroco/cr-style.h> ++#include <libcroco/cr-rgb.h> + /* <cr-fonts.h> has a broken double-inclusion guard in libcroco-0.6.1. */ + #ifndef __CR_FONTS_H__ +-# include <cr-fonts.h> ++# include <libcroco/cr-fonts.h> + #endif +-#include <cr-string.h> ++#include <libcroco/cr-string.h> + + #include "term-ostream.h" + #include "hash.h" +diff --git a/libtextstyle/gnulib-local/m4/libcroco.m4 b/libtextstyle/gnulib-local/m4/libcroco.m4 +index bc53cc6..10b2455 100644 +--- a/libtextstyle/gnulib-local/m4/libcroco.m4 ++++ b/libtextstyle/gnulib-local/m4/libcroco.m4 +@@ -1,99 +1,34 @@ +-# libcroco.m4 serial 3 +-dnl Copyright (C) 2006-2007, 2019 Free Software Foundation, Inc. ++# libcroco.m4 serial 2 (gettext-0.17) ++dnl Copyright (C) 2006, 2015-2016 Free Software 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 From Bruno Haible. + +-dnl gl_LIBCROCO +-dnl gives the user the option to decide whether to use the included or +-dnl an external libcroco. +-dnl gl_LIBCROCO(FORCE-INCLUDED) +-dnl forces the use of the included or an external libcroco. + AC_DEFUN([gl_LIBCROCO], + [ +- ifelse([$1], [yes], , [ +- dnl libcroco depends on libglib. +- AC_REQUIRE([gl_LIBGLIB]) +- ]) ++ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++ dnl libcroco depends on libglib. ++ AC_REQUIRE([gl_LIBGLIB]) + +- ifelse([$1], , [ +- AC_MSG_CHECKING([whether included libcroco is requested]) +- AC_ARG_WITH([included-libcroco], +- [ --with-included-libcroco use the libcroco included here], +- [gl_cv_libcroco_force_included=$withval], +- [gl_cv_libcroco_force_included=no]) +- AC_MSG_RESULT([$gl_cv_libcroco_force_included]) +- ], [gl_cv_libcroco_force_included=$1]) ++ AC_MSG_CHECKING([whether included libcroco is requested]) ++ AC_ARG_WITH([included-libcroco], ++ [ --with-included-libcroco use the libcroco included here], ++ [gl_cv_libcroco_force_included=$withval], ++ [gl_cv_libcroco_force_included=no]) ++ AC_MSG_RESULT([$gl_cv_libcroco_force_included]) + + gl_cv_libcroco_use_included="$gl_cv_libcroco_force_included" + LIBCROCO= + LTLIBCROCO= + INCCROCO= +- ifelse([$1], [yes], , [ +- if test "$gl_cv_libcroco_use_included" != yes; then +- dnl Figure out whether we can use a preinstalled libcroco-0.6, or have to +- dnl use the included one. +- AC_CACHE_VAL([gl_cv_libcroco], [ +- gl_cv_libcroco=no +- gl_cv_LIBCROCO= +- gl_cv_LTLIBCROCO= +- gl_cv_INCCROCO= +- gl_save_LIBS="$LIBS" +- dnl Search for libcroco and define LIBCROCO_0_6, LTLIBCROCO_0_6 and +- dnl INCCROCO_0_6 accordingly. +- dnl Don't use croco-0.6-config nor pkg-config, since it doesn't work when +- dnl cross-compiling or when the C compiler in use is different from the +- dnl one that built the library. +- AC_LIB_LINKFLAGS_BODY([croco-0.6], [glib-2.0]) +- LIBS="$gl_save_LIBS $LIBCROCO_0_6" +- AC_TRY_LINK([#include <libcroco-config.h>], +- [const char *version = LIBCROCO_VERSION; return !version;], +- [gl_cv_libcroco=yes +- gl_cv_LIBCROCO="$LIBCROCO_0_6" +- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6" +- ]) +- if test "$gl_cv_libcroco" != yes; then +- gl_save_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $INCCROCO_0_6" +- AC_TRY_LINK([#include <libcroco-config.h>], +- [const char *version = LIBCROCO_VERSION; return !version;], +- [gl_cv_libcroco=yes +- gl_cv_LIBCROCO="$LIBCROCO_0_6" +- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6" +- gl_cv_INCCROCO="$INCCROCO_0_6" +- ]) +- if test "$gl_cv_libcroco" != yes; then +- dnl Often the include files are installed in +- dnl /usr/include/libcroco-0.6/libcroco. +- AC_TRY_LINK([#include <libcroco-0.6/libcroco/libcroco-config.h>], +- [const char *version = LIBCROCO_VERSION; return !version;], +- [gl_ABSOLUTE_HEADER([libcroco-0.6/libcroco/libcroco-config.h]) +- libcroco_include_dir=`echo "$gl_cv_absolute_libcroco_0_6_libcroco_libcroco_config_h" | sed -e 's,.libcroco-config\.h$,,'` +- if test -d "$libcroco_include_dir"; then +- gl_cv_libcroco=yes +- gl_cv_LIBCROCO="$LIBCROCO_0_6" +- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6" +- gl_cv_INCCROCO="-I$libcroco_include_dir" +- fi +- ]) +- fi +- CPPFLAGS="$gl_save_CPPFLAGS" +- fi +- LIBS="$gl_save_LIBS" +- ]) +- AC_MSG_CHECKING([for libcroco]) +- AC_MSG_RESULT([$gl_cv_libcroco]) +- if test $gl_cv_libcroco = yes; then +- LIBCROCO="$gl_cv_LIBCROCO" +- LTLIBCROCO="$gl_cv_LTLIBCROCO" +- INCCROCO="$gl_cv_INCCROCO" +- else +- gl_cv_libcroco_use_included=yes +- fi +- fi +- ]) ++ if test "$gl_cv_libcroco_use_included" != yes; then ++ PKG_CHECK_MODULES([CROCO], [libcroco-0.6]) ++ LIBCROCO=$CROCO_LIBS ++ LTLIBCROCO=$CROCO_LIBS ++ INCCROCO=$CROCO_CFLAGS ++ fi + AC_SUBST([LIBCROCO]) + AC_SUBST([LTLIBCROCO]) + AC_SUBST([INCCROCO]) +diff --git a/libtextstyle/gnulib-local/m4/libglib.m4 b/libtextstyle/gnulib-local/m4/libglib.m4 +index bef6fa3..8841755 100644 +--- a/libtextstyle/gnulib-local/m4/libglib.m4 ++++ b/libtextstyle/gnulib-local/m4/libglib.m4 +@@ -1,105 +1,31 @@ +-# libglib.m4 serial 4 +-dnl Copyright (C) 2006-2007, 2019 Free Software Foundation, Inc. ++# libglib.m4 serial 3 (gettext-0.17) ++dnl Copyright (C) 2006-2007, 2015-2016 Free Software 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 From Bruno Haible. + +-dnl gl_LIBGLIB +-dnl gives the user the option to decide whether to use the included or +-dnl an external libglib. +-dnl gl_LIBGLIB(FORCE-INCLUDED) +-dnl forces the use of the included or an external libglib. + AC_DEFUN([gl_LIBGLIB], + [ +- ifelse([$1], , [ +- AC_MSG_CHECKING([whether included glib is requested]) +- AC_ARG_WITH([included-glib], +- [ --with-included-glib use the glib2 included here], +- [gl_cv_libglib_force_included=$withval], +- [gl_cv_libglib_force_included=no]) +- AC_MSG_RESULT([$gl_cv_libglib_force_included]) +- ], [gl_cv_libglib_force_included=$1]) ++ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++ AC_MSG_CHECKING([whether included glib is requested]) ++ AC_ARG_WITH([included-glib], ++ [ --with-included-glib use the glib2 included here], ++ [gl_cv_libglib_force_included=$withval], ++ [gl_cv_libglib_force_included=no]) ++ AC_MSG_RESULT([$gl_cv_libglib_force_included]) + + gl_cv_libglib_use_included="$gl_cv_libglib_force_included" + LIBGLIB= + LTLIBGLIB= + INCGLIB= +- ifelse([$1], [yes], , [ +- if test "$gl_cv_libglib_use_included" != yes; then +- dnl Figure out whether we can use a preinstalled libglib-2.0, or have to use +- dnl the included one. +- AC_CACHE_VAL([gl_cv_libglib], [ +- gl_cv_libglib=no +- gl_cv_LIBGLIB= +- gl_cv_LTLIBGLIB= +- gl_cv_INCGLIB= +- gl_save_LIBS="$LIBS" +- dnl Search for libglib2 and define LIBGLIB_2_0, LTLIBGLIB_2_0 and +- dnl INCGLIB_2_0 accordingly. +- dnl Don't use glib-config nor pkg-config, since it doesn't work when +- dnl cross-compiling or when the C compiler in use is different from the +- dnl one that built the library. +- AC_LIB_LINKFLAGS_BODY([glib-2.0]) +- LIBS="$gl_save_LIBS $LIBGLIB_2_0" +- AC_TRY_LINK([#include <glib.h> +-#ifndef G_BEGIN_DECLS +-error this glib.h includes a glibconfig.h from a glib version 1.x +-#endif +-], +- [g_string_new ("foo");], +- [gl_cv_libglib=yes +- gl_cv_LIBGLIB="$LIBGLIB_2_0" +- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0" +- ]) +- if test "$gl_cv_libglib" != yes; then +- gl_save_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $INCGLIB_2_0" +- AC_TRY_LINK([#include <glib.h> +-#ifndef G_BEGIN_DECLS +-error this glib.h includes a glibconfig.h from a glib version 1.x +-#endif +-], +- [g_string_new ("foo");], +- [gl_cv_libglib=yes +- gl_cv_LIBGLIB="$LIBGLIB_2_0" +- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0" +- gl_cv_INCGLIB="$INCGLIB_2_0" +- ]) +- if test "$gl_cv_libglib" != yes; then +- dnl Often the include files are installed in /usr/include/glib-2.0 +- dnl and /usr/lib/glib-2.0/include. +- if test -n "$LIBGLIB_2_0_PREFIX"; then +- CPPFLAGS="$gl_save_CPPFLAGS -I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include" +- AC_TRY_LINK([#include <glib.h> +-#ifndef G_BEGIN_DECLS +-error this glib.h includes a glibconfig.h from a glib version 1.x +-#endif +-], +- [g_string_new ("foo");], +- [gl_cv_libglib=yes +- gl_cv_LIBGLIB="$LIBGLIB_2_0" +- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0" +- gl_cv_INCGLIB="-I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include" +- ]) +- fi +- fi +- CPPFLAGS="$gl_save_CPPFLAGS" +- fi +- LIBS="$gl_save_LIBS" +- ]) +- AC_MSG_CHECKING([for glib]) +- AC_MSG_RESULT([$gl_cv_libglib]) +- if test $gl_cv_libglib = yes; then +- LIBGLIB="$gl_cv_LIBGLIB" +- LTLIBGLIB="$gl_cv_LTLIBGLIB" +- INCGLIB="$gl_cv_INCGLIB" +- else +- gl_cv_libglib_use_included=yes +- fi +- fi +- ]) ++ if test "$gl_cv_libglib_use_included" != yes; then ++ PKG_CHECK_MODULES([GLIB], [glib-2.0]) ++ LIBGLIB="$GLIB_LIBS" ++ LTLIBGLIB="$GLIB_LIBS" ++ INCGLIB="$GLIB_CFLAGS" ++ fi + AC_SUBST([LIBGLIB]) + AC_SUBST([LTLIBGLIB]) + AC_SUBST([INCGLIB]) +diff --git a/libtextstyle/gnulib-m4/libcroco.m4 b/libtextstyle/gnulib-m4/libcroco.m4 +index bc53cc6..10b2455 100644 +--- a/libtextstyle/gnulib-m4/libcroco.m4 ++++ b/libtextstyle/gnulib-m4/libcroco.m4 +@@ -1,99 +1,34 @@ +-# libcroco.m4 serial 3 +-dnl Copyright (C) 2006-2007, 2019 Free Software Foundation, Inc. ++# libcroco.m4 serial 2 (gettext-0.17) ++dnl Copyright (C) 2006, 2015-2016 Free Software 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 From Bruno Haible. + +-dnl gl_LIBCROCO +-dnl gives the user the option to decide whether to use the included or +-dnl an external libcroco. +-dnl gl_LIBCROCO(FORCE-INCLUDED) +-dnl forces the use of the included or an external libcroco. + AC_DEFUN([gl_LIBCROCO], + [ +- ifelse([$1], [yes], , [ +- dnl libcroco depends on libglib. +- AC_REQUIRE([gl_LIBGLIB]) +- ]) ++ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++ dnl libcroco depends on libglib. ++ AC_REQUIRE([gl_LIBGLIB]) + +- ifelse([$1], , [ +- AC_MSG_CHECKING([whether included libcroco is requested]) +- AC_ARG_WITH([included-libcroco], +- [ --with-included-libcroco use the libcroco included here], +- [gl_cv_libcroco_force_included=$withval], +- [gl_cv_libcroco_force_included=no]) +- AC_MSG_RESULT([$gl_cv_libcroco_force_included]) +- ], [gl_cv_libcroco_force_included=$1]) ++ AC_MSG_CHECKING([whether included libcroco is requested]) ++ AC_ARG_WITH([included-libcroco], ++ [ --with-included-libcroco use the libcroco included here], ++ [gl_cv_libcroco_force_included=$withval], ++ [gl_cv_libcroco_force_included=no]) ++ AC_MSG_RESULT([$gl_cv_libcroco_force_included]) + + gl_cv_libcroco_use_included="$gl_cv_libcroco_force_included" + LIBCROCO= + LTLIBCROCO= + INCCROCO= +- ifelse([$1], [yes], , [ +- if test "$gl_cv_libcroco_use_included" != yes; then +- dnl Figure out whether we can use a preinstalled libcroco-0.6, or have to +- dnl use the included one. +- AC_CACHE_VAL([gl_cv_libcroco], [ +- gl_cv_libcroco=no +- gl_cv_LIBCROCO= +- gl_cv_LTLIBCROCO= +- gl_cv_INCCROCO= +- gl_save_LIBS="$LIBS" +- dnl Search for libcroco and define LIBCROCO_0_6, LTLIBCROCO_0_6 and +- dnl INCCROCO_0_6 accordingly. +- dnl Don't use croco-0.6-config nor pkg-config, since it doesn't work when +- dnl cross-compiling or when the C compiler in use is different from the +- dnl one that built the library. +- AC_LIB_LINKFLAGS_BODY([croco-0.6], [glib-2.0]) +- LIBS="$gl_save_LIBS $LIBCROCO_0_6" +- AC_TRY_LINK([#include <libcroco-config.h>], +- [const char *version = LIBCROCO_VERSION; return !version;], +- [gl_cv_libcroco=yes +- gl_cv_LIBCROCO="$LIBCROCO_0_6" +- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6" +- ]) +- if test "$gl_cv_libcroco" != yes; then +- gl_save_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $INCCROCO_0_6" +- AC_TRY_LINK([#include <libcroco-config.h>], +- [const char *version = LIBCROCO_VERSION; return !version;], +- [gl_cv_libcroco=yes +- gl_cv_LIBCROCO="$LIBCROCO_0_6" +- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6" +- gl_cv_INCCROCO="$INCCROCO_0_6" +- ]) +- if test "$gl_cv_libcroco" != yes; then +- dnl Often the include files are installed in +- dnl /usr/include/libcroco-0.6/libcroco. +- AC_TRY_LINK([#include <libcroco-0.6/libcroco/libcroco-config.h>], +- [const char *version = LIBCROCO_VERSION; return !version;], +- [gl_ABSOLUTE_HEADER([libcroco-0.6/libcroco/libcroco-config.h]) +- libcroco_include_dir=`echo "$gl_cv_absolute_libcroco_0_6_libcroco_libcroco_config_h" | sed -e 's,.libcroco-config\.h$,,'` +- if test -d "$libcroco_include_dir"; then +- gl_cv_libcroco=yes +- gl_cv_LIBCROCO="$LIBCROCO_0_6" +- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6" +- gl_cv_INCCROCO="-I$libcroco_include_dir" +- fi +- ]) +- fi +- CPPFLAGS="$gl_save_CPPFLAGS" +- fi +- LIBS="$gl_save_LIBS" +- ]) +- AC_MSG_CHECKING([for libcroco]) +- AC_MSG_RESULT([$gl_cv_libcroco]) +- if test $gl_cv_libcroco = yes; then +- LIBCROCO="$gl_cv_LIBCROCO" +- LTLIBCROCO="$gl_cv_LTLIBCROCO" +- INCCROCO="$gl_cv_INCCROCO" +- else +- gl_cv_libcroco_use_included=yes +- fi +- fi +- ]) ++ if test "$gl_cv_libcroco_use_included" != yes; then ++ PKG_CHECK_MODULES([CROCO], [libcroco-0.6]) ++ LIBCROCO=$CROCO_LIBS ++ LTLIBCROCO=$CROCO_LIBS ++ INCCROCO=$CROCO_CFLAGS ++ fi + AC_SUBST([LIBCROCO]) + AC_SUBST([LTLIBCROCO]) + AC_SUBST([INCCROCO]) +diff --git a/libtextstyle/gnulib-m4/libglib.m4 b/libtextstyle/gnulib-m4/libglib.m4 +index bef6fa3..8841755 100644 +--- a/libtextstyle/gnulib-m4/libglib.m4 ++++ b/libtextstyle/gnulib-m4/libglib.m4 +@@ -1,105 +1,31 @@ +-# libglib.m4 serial 4 +-dnl Copyright (C) 2006-2007, 2019 Free Software Foundation, Inc. ++# libglib.m4 serial 3 (gettext-0.17) ++dnl Copyright (C) 2006-2007, 2015-2016 Free Software 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 From Bruno Haible. + +-dnl gl_LIBGLIB +-dnl gives the user the option to decide whether to use the included or +-dnl an external libglib. +-dnl gl_LIBGLIB(FORCE-INCLUDED) +-dnl forces the use of the included or an external libglib. + AC_DEFUN([gl_LIBGLIB], + [ +- ifelse([$1], , [ +- AC_MSG_CHECKING([whether included glib is requested]) +- AC_ARG_WITH([included-glib], +- [ --with-included-glib use the glib2 included here], +- [gl_cv_libglib_force_included=$withval], +- [gl_cv_libglib_force_included=no]) +- AC_MSG_RESULT([$gl_cv_libglib_force_included]) +- ], [gl_cv_libglib_force_included=$1]) ++ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++ AC_MSG_CHECKING([whether included glib is requested]) ++ AC_ARG_WITH([included-glib], ++ [ --with-included-glib use the glib2 included here], ++ [gl_cv_libglib_force_included=$withval], ++ [gl_cv_libglib_force_included=no]) ++ AC_MSG_RESULT([$gl_cv_libglib_force_included]) + + gl_cv_libglib_use_included="$gl_cv_libglib_force_included" + LIBGLIB= + LTLIBGLIB= + INCGLIB= +- ifelse([$1], [yes], , [ +- if test "$gl_cv_libglib_use_included" != yes; then +- dnl Figure out whether we can use a preinstalled libglib-2.0, or have to use +- dnl the included one. +- AC_CACHE_VAL([gl_cv_libglib], [ +- gl_cv_libglib=no +- gl_cv_LIBGLIB= +- gl_cv_LTLIBGLIB= +- gl_cv_INCGLIB= +- gl_save_LIBS="$LIBS" +- dnl Search for libglib2 and define LIBGLIB_2_0, LTLIBGLIB_2_0 and +- dnl INCGLIB_2_0 accordingly. +- dnl Don't use glib-config nor pkg-config, since it doesn't work when +- dnl cross-compiling or when the C compiler in use is different from the +- dnl one that built the library. +- AC_LIB_LINKFLAGS_BODY([glib-2.0]) +- LIBS="$gl_save_LIBS $LIBGLIB_2_0" +- AC_TRY_LINK([#include <glib.h> +-#ifndef G_BEGIN_DECLS +-error this glib.h includes a glibconfig.h from a glib version 1.x +-#endif +-], +- [g_string_new ("foo");], +- [gl_cv_libglib=yes +- gl_cv_LIBGLIB="$LIBGLIB_2_0" +- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0" +- ]) +- if test "$gl_cv_libglib" != yes; then +- gl_save_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $INCGLIB_2_0" +- AC_TRY_LINK([#include <glib.h> +-#ifndef G_BEGIN_DECLS +-error this glib.h includes a glibconfig.h from a glib version 1.x +-#endif +-], +- [g_string_new ("foo");], +- [gl_cv_libglib=yes +- gl_cv_LIBGLIB="$LIBGLIB_2_0" +- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0" +- gl_cv_INCGLIB="$INCGLIB_2_0" +- ]) +- if test "$gl_cv_libglib" != yes; then +- dnl Often the include files are installed in /usr/include/glib-2.0 +- dnl and /usr/lib/glib-2.0/include. +- if test -n "$LIBGLIB_2_0_PREFIX"; then +- CPPFLAGS="$gl_save_CPPFLAGS -I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include" +- AC_TRY_LINK([#include <glib.h> +-#ifndef G_BEGIN_DECLS +-error this glib.h includes a glibconfig.h from a glib version 1.x +-#endif +-], +- [g_string_new ("foo");], +- [gl_cv_libglib=yes +- gl_cv_LIBGLIB="$LIBGLIB_2_0" +- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0" +- gl_cv_INCGLIB="-I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include" +- ]) +- fi +- fi +- CPPFLAGS="$gl_save_CPPFLAGS" +- fi +- LIBS="$gl_save_LIBS" +- ]) +- AC_MSG_CHECKING([for glib]) +- AC_MSG_RESULT([$gl_cv_libglib]) +- if test $gl_cv_libglib = yes; then +- LIBGLIB="$gl_cv_LIBGLIB" +- LTLIBGLIB="$gl_cv_LTLIBGLIB" +- INCGLIB="$gl_cv_INCGLIB" +- else +- gl_cv_libglib_use_included=yes +- fi +- fi +- ]) ++ if test "$gl_cv_libglib_use_included" != yes; then ++ PKG_CHECK_MODULES([GLIB], [glib-2.0]) ++ LIBGLIB="$GLIB_LIBS" ++ LTLIBGLIB="$GLIB_LIBS" ++ INCGLIB="$GLIB_CFLAGS" ++ fi + AC_SUBST([LIBGLIB]) + AC_SUBST([LTLIBGLIB]) + AC_SUBST([INCGLIB]) +diff --git a/libtextstyle/lib/term-styled-ostream.c b/libtextstyle/lib/term-styled-ostream.c +index 3675b5f..811e546 100644 +--- a/libtextstyle/lib/term-styled-ostream.c ++++ b/libtextstyle/lib/term-styled-ostream.c +@@ -28,15 +28,15 @@ + + #include <stdlib.h> + +-#include <cr-om-parser.h> +-#include <cr-sel-eng.h> +-#include <cr-style.h> +-#include <cr-rgb.h> ++#include <libcroco/cr-om-parser.h> ++#include <libcroco/cr-sel-eng.h> ++#include <libcroco/cr-style.h> ++#include <libcroco/cr-rgb.h> + /* <cr-fonts.h> has a broken double-inclusion guard in libcroco-0.6.1. */ + #ifndef __CR_FONTS_H__ +-# include <cr-fonts.h> ++# include <libcroco/cr-fonts.h> + #endif +-#include <cr-string.h> ++#include <libcroco/cr-string.h> + + #include "term-ostream.h" + #include "hash.h" +diff --git a/libtextstyle/lib/term-styled-ostream.oo.c b/libtextstyle/lib/term-styled-ostream.oo.c +index 2cfd4a8..d42c8b4 100644 +--- a/libtextstyle/lib/term-styled-ostream.oo.c ++++ b/libtextstyle/lib/term-styled-ostream.oo.c +@@ -22,15 +22,15 @@ + + #include <stdlib.h> + +-#include <cr-om-parser.h> +-#include <cr-sel-eng.h> +-#include <cr-style.h> +-#include <cr-rgb.h> ++#include <libcroco/cr-om-parser.h> ++#include <libcroco/cr-sel-eng.h> ++#include <libcroco/cr-style.h> ++#include <libcroco/cr-rgb.h> + /* <cr-fonts.h> has a broken double-inclusion guard in libcroco-0.6.1. */ + #ifndef __CR_FONTS_H__ +-# include <cr-fonts.h> ++# include <libcroco/cr-fonts.h> + #endif +-#include <cr-string.h> ++#include <libcroco/cr-string.h> + + #include "term-ostream.h" + #include "hash.h"meta/recipes-core/gettext/gettext_0.20.1.bb renamed from meta/recipes-core/gettext/gettext_0.19.8.1.bb +11
-13@@ -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/" } --2.17.1
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
PATCH 4/24 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 5/24 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 6/24 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.
Python 3.8 no longer adds "m" to "3.8" in paths, so adjust the recipes and classes accordingly.
---
meta/classes/python3-dir.bbclass | 4 +-
...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 ++-
.../python/python3/python3-manifest.json | 4 +-
.../{python3_3.7.5.bb => python3_3.8.0.bb} | 28 ++-
15 files changed, 175 insertions(+), 482 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} (91%)meta/classes/python3-dir.bbclass +2 -2
@@ -1,5 +1,5 @@ -PYTHON_BASEVERSION = "3.7" -PYTHON_ABI = "m" +PYTHON_BASEVERSION = "3.8" +PYTHON_ABI = "" PYTHON_DIR = "python${PYTHON_BASEVERSION}" PYTHON_PN = "python3" PYTHON_SITEPACKAGES_DIR = "${libdir}/${PYTHON_DIR}/site-packages"
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/python3-manifest.json +2 -2
@@ -213,8 +213,8 @@ "${bindir}/python3", "${bindir}/python${PYTHON_MAJMIN}", "${bindir}/python${PYTHON_MAJMIN}.real", - "${bindir}/python${PYTHON_BINABI}", - "${includedir}/python${PYTHON_BINABI}/pyconfig*.h", + "${bindir}/python${PYTHON_MAJMIN}", + "${includedir}/python${PYTHON_MAJMIN}/pyconfig*.h", "${prefix}/lib/python${PYTHON_MAJMIN}/config*/*[!.a]", "${libdir}/python${PYTHON_MAJMIN}/UserDict.py", "${libdir}/python${PYTHON_MAJMIN}/UserList.py",
meta/recipes-devtools/python/python3_3.8.0.bb renamed from meta/recipes-devtools/python/python3_3.7.5.bb +12 -16
@@ -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,20 +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_BINABI = "${PYTHON_MAJMIN}m" +PYTHON_MAJMIN = "3.8" S = "${WORKDIR}/Python-${PV}"
@@ -59,8 +53,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 +125,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 +155,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 +171,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 +190,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
@@ -322,7 +316,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)
@@ -341,3 +335,5 @@ 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 06/24] python3: update to 3.8.0
besides gettext this is another reason I suppose causing a few more failures see
http://errors.yoctoproject.org/Errors/Build/94077/
all do_prepare_recipe_sysroot seems to be failing in python snippets. and do_configure aree also related to native python missing modules do_compile are mostly related to gettext.
Quoted 1,112 lines · Alexander Kanavin
Drop 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.
Python 3.8 no longer adds "m" to "3.8" in paths, so adjust the recipes and classes accordingly.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/classes/python3-dir.bbclass | 4 +- ...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 ++- .../python/python3/python3-manifest.json | 4 +- .../{python3_3.7.5.bb => python3_3.8.0.bb} | 28 ++- 15 files changed, 175 insertions(+), 482 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} (91%)meta/classes/python3-dir.bbclass +2
-2@@ -1,5 +1,5 @@ -PYTHON_BASEVERSION = "3.7" -PYTHON_ABI = "m" +PYTHON_BASEVERSION = "3.8" +PYTHON_ABI = "" PYTHON_DIR = "python${PYTHON_BASEVERSION}" PYTHON_PN = "python3" PYTHON_SITEPACKAGES_DIR = "${libdir}/${PYTHON_DIR}/site-packages"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@@ -1,4 +1,4 @@ -From 0fbdad1eaf541a8e92be81f39514cd249b3b0801 Mon Sep 17 00:00:00 2001 +From a078b6ff1492e848ad1055764fb9a414abaf3e12 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Tue, 5 Feb 2019 15:52:02 +0100 Subject: [PATCH] Do not hardcode "lib" as location for modules, site-packages@@ -11,13 +11,13 @@ Signed-off-by: Alexander Kanavin <[email protected]> Include/pythonrun.h | 2 ++ Lib/site.py | 4 ++-- Makefile.pre.in | 5 +++-- - Modules/getpath.c | 18 ++++++++++++------ + Modules/getpath.c | 22 ++++++++++++++-------- Python/getplatform.c | 10 ++++++++++ Python/sysmodule.c | 2 ++ - 6 files changed, 31 insertions(+), 10 deletions(-) + 6 files changed, 33 insertions(+), 12 deletions(-) diff --git a/Include/pythonrun.h b/Include/pythonrun.h -index 6f0c6fc..0a17edd 100644 +index 46091e0..61b2e15 100644 --- a/Include/pythonrun.h +++ b/Include/pythonrun.h @@ -7,6 +7,8 @@@@ -28,12 +28,12 @@ index 6f0c6fc..0a17edd 100644 + #ifndef Py_LIMITED_API PyAPI_FUNC(int) PyRun_SimpleStringFlags(const char *, PyCompilerFlags *); - PyAPI_FUNC(int) PyRun_AnyFileFlags(FILE *, const char *, PyCompilerFlags *); + PyAPI_FUNC(int) PyRun_AnyFileExFlags( diff --git a/Lib/site.py b/Lib/site.py -index ffd132b..b55f6d8 100644 +index a065ab0..1d720ef 100644 --- a/Lib/site.py +++ b/Lib/site.py -@@ -334,12 +334,12 @@ def getsitepackages(prefixes=None): +@@ -335,12 +335,12 @@ def getsitepackages(prefixes=None): seen.add(prefix) if os.sep == '/':@@ -49,10 +49,10 @@ index ffd132b..b55f6d8 100644 def addsitepackages(known_paths, prefixes=None): diff --git a/Makefile.pre.in b/Makefile.pre.in -index 6e81b2f..671a20e 100644 +index 65665df..be49140 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -142,7 +142,7 @@ LIBDIR= @libdir@ +@@ -143,7 +143,7 @@ LIBDIR= @libdir@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include@@ -61,7 +61,7 @@ index 6e81b2f..671a20e 100644 ABIFLAGS= @ABIFLAGS@ # Detailed destination directories -@@ -768,6 +768,7 @@ Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile +@@ -753,6 +753,7 @@ Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile -DEXEC_PREFIX='"$(exec_prefix)"' \ -DVERSION='"$(VERSION)"' \ -DVPATH='"$(VPATH)"' \@@ -69,7 +69,7 @@ index 6e81b2f..671a20e 100644 -o $@ $(srcdir)/Modules/getpath.c Programs/python.o: $(srcdir)/Programs/python.c -@@ -856,7 +857,7 @@ regen-opcode: +@@ -868,7 +869,7 @@ regen-symbol: $(srcdir)/Include/graminit.h Python/compile.o Python/symtable.o Python/ast_unparse.o Python/ast.o Python/future.o Parser/parsetok.o: $(srcdir)/Include/graminit.h $(srcdir)/Include/Python-ast.h Python/getplatform.o: $(srcdir)/Python/getplatform.c@@ -79,72 +79,90 @@ index 6e81b2f..671a20e 100644 Python/importdl.o: $(srcdir)/Python/importdl.c $(CC) -c $(PY_CORE_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c diff --git a/Modules/getpath.c b/Modules/getpath.c -index e6a3e8e..0c62af6 100644 +index b727f66..c003e46 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c -@@ -123,6 +123,7 @@ typedef struct { - wchar_t *exec_prefix; /* EXEC_PREFIX define */ +@@ -128,6 +128,7 @@ typedef struct { + wchar_t *exec_prefix; /* EXEC_PREFIX macro */ wchar_t *lib_python; /* "lib/pythonX.Y" */ + wchar_t *multilib_python; /* "lib[suffix]/pythonX.Y" */ - wchar_t argv0_path[MAXPATHLEN+1]; - wchar_t zip_path[MAXPATHLEN+1]; /* ".../lib/pythonXY.zip" */ -@@ -314,7 +315,7 @@ search_for_prefix(const _PyCoreConfig *core_config, + int prefix_found; /* found platform independent libraries? */ + int exec_prefix_found; /* found the platform dependent libraries? */ +@@ -386,7 +387,7 @@ search_for_prefix(PyCalculatePath *calculate, _PyPathConfig *pathconfig, if (delim) { *delim = L'\0'; } -- joinpath(prefix, calculate->lib_python); -+ joinpath(prefix, calculate->multilib_python); - joinpath(prefix, LANDMARK); - return 1; - } -@@ -343,7 +344,7 @@ search_for_prefix(const _PyCoreConfig *core_config, - copy_absolute(prefix, calculate->argv0_path, MAXPATHLEN+1); +- status = joinpath(prefix, calculate->lib_python, prefix_len); ++ status = joinpath(prefix, calculate->multilib_python, prefix_len); + if (_PyStatus_EXCEPTION(status)) { + return status; + } +@@ -444,7 +445,7 @@ search_for_prefix(PyCalculatePath *calculate, _PyPathConfig *pathconfig, do { - n = wcslen(prefix); -- joinpath(prefix, calculate->lib_python); -+ joinpath(prefix, calculate->multilib_python); - joinpath(prefix, LANDMARK); - if (ismodule(prefix)) { - return 1; -@@ -355,7 +356,7 @@ search_for_prefix(const _PyCoreConfig *core_config, - /* Look at configure's PREFIX */ - wcsncpy(prefix, calculate->prefix, MAXPATHLEN); - prefix[MAXPATHLEN] = L'\0'; -- joinpath(prefix, calculate->lib_python); -+ joinpath(prefix, calculate->multilib_python); - joinpath(prefix, LANDMARK); - if (ismodule(prefix)) { - return 1; -@@ -427,7 +428,7 @@ search_for_exec_prefix(const _PyCoreConfig *core_config, - wcsncpy(exec_prefix, core_config->home, MAXPATHLEN); + /* Path: <argv0_path or substring> / <lib_python> / LANDMARK */ + size_t n = wcslen(prefix); +- status = joinpath(prefix, calculate->lib_python, prefix_len); ++ status = joinpath(prefix, calculate->multilib_python, prefix_len); + if (_PyStatus_EXCEPTION(status)) { + return status; } - exec_prefix[MAXPATHLEN] = L'\0'; -- joinpath(exec_prefix, calculate->lib_python); -+ joinpath(exec_prefix, calculate->multilib_python); - joinpath(exec_prefix, L"lib-dynload"); - return 1; +@@ -467,7 +468,7 @@ search_for_prefix(PyCalculatePath *calculate, _PyPathConfig *pathconfig, + if (safe_wcscpy(prefix, calculate->prefix, prefix_len) < 0) { + return PATHLEN_ERR(); + } +- status = joinpath(prefix, calculate->lib_python, prefix_len); ++ status = joinpath(prefix, calculate->multilib_python, prefix_len); + if (_PyStatus_EXCEPTION(status)) { + return status; } -@@ -464,7 +465,7 @@ search_for_exec_prefix(const _PyCoreConfig *core_config, - copy_absolute(exec_prefix, calculate->argv0_path, MAXPATHLEN+1); +@@ -510,7 +511,7 @@ calculate_prefix(PyCalculatePath *calculate, _PyPathConfig *pathconfig, + if (safe_wcscpy(prefix, calculate->prefix, prefix_len) < 0) { + return PATHLEN_ERR(); + } +- status = joinpath(prefix, calculate->lib_python, prefix_len); ++ status = joinpath(prefix, calculate->multilib_python, prefix_len); + if (_PyStatus_EXCEPTION(status)) { + return status; + } +@@ -635,7 +636,7 @@ search_for_exec_prefix(PyCalculatePath *calculate, _PyPathConfig *pathconfig, + return PATHLEN_ERR(); + } + } +- status = joinpath(exec_prefix, calculate->lib_python, exec_prefix_len); ++ status = joinpath(exec_prefix, calculate->multilib_python, exec_prefix_len); + if (_PyStatus_EXCEPTION(status)) { + return status; + } +@@ -667,7 +668,7 @@ search_for_exec_prefix(PyCalculatePath *calculate, _PyPathConfig *pathconfig, do { - n = wcslen(exec_prefix); -- joinpath(exec_prefix, calculate->lib_python); -+ joinpath(exec_prefix, calculate->multilib_python); - joinpath(exec_prefix, L"lib-dynload"); - if (isdir(exec_prefix)) { - return 1; -@@ -476,7 +477,7 @@ search_for_exec_prefix(const _PyCoreConfig *core_config, - /* Look at configure's EXEC_PREFIX */ - wcsncpy(exec_prefix, calculate->exec_prefix, MAXPATHLEN); - exec_prefix[MAXPATHLEN] = L'\0'; -- joinpath(exec_prefix, calculate->lib_python); -+ joinpath(exec_prefix, calculate->multilib_python); - joinpath(exec_prefix, L"lib-dynload"); - if (isdir(exec_prefix)) { - return 1; -@@ -871,6 +872,10 @@ calculate_init(PyCalculatePath *calculate, + /* Path: <argv0_path or substring> / <lib_python> / "lib-dynload" */ + size_t n = wcslen(exec_prefix); +- status = joinpath(exec_prefix, calculate->lib_python, exec_prefix_len); ++ status = joinpath(exec_prefix, calculate->multilib_python, exec_prefix_len); + if (_PyStatus_EXCEPTION(status)) { + return status; + } +@@ -689,7 +690,7 @@ search_for_exec_prefix(PyCalculatePath *calculate, _PyPathConfig *pathconfig, + if (safe_wcscpy(exec_prefix, calculate->exec_prefix, exec_prefix_len) < 0) { + return PATHLEN_ERR(); + } +- status = joinpath(exec_prefix, calculate->lib_python, exec_prefix_len); ++ status = joinpath(exec_prefix, calculate->multilib_python, exec_prefix_len); + if (_PyStatus_EXCEPTION(status)) { + return status; + } +@@ -928,7 +929,7 @@ calculate_argv0_path(PyCalculatePath *calculate, const wchar_t *program_full_pat + return PATHLEN_ERR(); + } + reduce(argv0_path); +- status = joinpath(argv0_path, calculate->lib_python, argv0_path_len); ++ status = joinpath(argv0_path, calculate->multilib_python, argv0_path_len); + if (_PyStatus_EXCEPTION(status)) { + PyMem_RawFree(wbuf); + return status; +@@ -1201,6 +1202,10 @@ calculate_init(PyCalculatePath *calculate, const PyConfig *config) if (!calculate->lib_python) { return DECODE_LOCALE_ERR("EXEC_PREFIX define", len); }@@ -152,10 +170,10 @@ index e6a3e8e..0c62af6 100644 + if (!calculate->multilib_python) { + return DECODE_LOCALE_ERR("EXEC_PREFIX define", len); + } - return _Py_INIT_OK(); - } -@@ -882,6 +887,7 @@ calculate_free(PyCalculatePath *calculate) + calculate->warnings = config->pathconfig_warnings; + calculate->pythonpath_env = config->pythonpath_env; +@@ -1216,6 +1221,7 @@ calculate_free(PyCalculatePath *calculate) PyMem_RawFree(calculate->prefix); PyMem_RawFree(calculate->exec_prefix); PyMem_RawFree(calculate->lib_python);@@ -182,10 +200,10 @@ index 81a0f7a..d55396b 100644 + return LIB; +} diff --git a/Python/sysmodule.c b/Python/sysmodule.c -index efe5b29..de77b17 100644 +index 5b0fb81..0dce754 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c -@@ -2319,6 +2319,8 @@ _PySys_BeginInit(PyObject **sysmod) +@@ -2668,6 +2668,8 @@ _PySys_InitCore(_PyRuntimeState *runtime, PyInterpreterState *interp, PyUnicode_FromString(Py_GetCopyright())); SET_SYS_FROM_STRING("platform", PyUnicode_FromString(Py_GetPlatform()));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: appendmeta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch deleted +0
-47@@ -1,47 +0,0 @@ -From 5ce3ac59531828ff682646fbba59b2126b28a8aa Mon Sep 17 00:00:00 2001 -From: Jaewon Lee <[email protected]> -Date: Thu, 25 Apr 2019 15:34:26 -0700 -Subject: [PATCH] main.c: if OEPYTHON3HOME is set use instead of PYTHONHOME - -There is one variable PYTHONHOME to determine where libraries are coming -from for both python2 and python3. This becomes an issue if only one has -libraries in the specified PYTHONHOME path, but they are using the same -PYTHONHOME. Creating another variable OEPYTHON3HOME to allow for a way -to set a different path for python3 - -Signed-off-by: Jaewon Lee <[email protected]> - -Upstream-Status: Inappropriate [OE specific configuration] - ---- - Modules/main.c | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) - -diff --git a/Modules/main.c b/Modules/main.c -index acc59c6..407085a 100644 ---- a/Modules/main.c -+++ b/Modules/main.c -@@ -1834,10 +1834,19 @@ config_init_home(_PyCoreConfig *config) - } - return _Py_INIT_OK(); - } -- -- int res = config_get_env_var_dup(&home, L"PYTHONHOME", "PYTHONHOME"); -- if (res < 0) { -- return DECODE_LOCALE_ERR("PYTHONHOME", res); -+ int res; -+ const char *oepython3home = config_get_env_var("OEPYTHON3HOME"); -+ if (oepython3home) { -+ res = config_get_env_var_dup(&home, L"OEPYTHON3HOME", "OEPYTHON3HOME"); -+ if (res < 0) { -+ return DECODE_LOCALE_ERR("OEPYTHON3HOME", res); -+ } -+ } -+ else { -+ res = config_get_env_var_dup(&home, L"PYTHONHOME", "PYTHONHOME"); -+ if (res < 0) { -+ return DECODE_LOCALE_ERR("PYTHONHOME", res); -+ } - } - config->home = home; - return _Py_INIT_OK();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.htmlmeta/recipes-devtools/python/python3/0002-Don-t-do-runtime-test-to-get-float-byte-order.patch deleted +0
-199@@ -1,199 +0,0 @@ -From fa96a7fd19e17b9c6b4dd01c3c3774fb382dddc6 Mon Sep 17 00:00:00 2001 -From: Ross Burton <[email protected]> -Date: Wed, 5 Sep 2018 11:45:52 +0100 -Subject: [PATCH] Don't do runtime test to get float byte order - -Python uses AC_RUN_IFELSE to determine the byte order for floats and doubles, -and falls back onto "I don't know" if it can't run code. This results in -crippled floating point numbers in Python, and the regression tests fail. - -Instead of running code, take a macro from autoconf-archive which compiles C -with a special double in which has an ASCII representation, and then greps the -binary to identify the format. - -Upstream-Status: Backport [2a9c3805ddedf282881ef7811a561c70b74f80b1] -Signed-off-by: Ross Burton <[email protected]> ---- - configure.ac | 72 +++------------------------ - m4/ax_c_float_words_bigendian.m4 | 83 ++++++++++++++++++++++++++++++++ - 2 files changed, 90 insertions(+), 65 deletions(-) - create mode 100644 m4/ax_c_float_words_bigendian.m4 - -diff --git a/configure.ac b/configure.ac -index 4a3681f..4ab19a6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4328,77 +4328,19 @@ fi - # * Check for various properties of floating point * - # ************************************************** - --AC_MSG_CHECKING(whether C doubles are little-endian IEEE 754 binary64) --AC_CACHE_VAL(ac_cv_little_endian_double, [ --AC_RUN_IFELSE([AC_LANG_SOURCE([[ --#include <string.h> --int main() { -- double x = 9006104071832581.0; -- if (memcmp(&x, "\x05\x04\x03\x02\x01\xff\x3f\x43", 8) == 0) -- return 0; -- else -- return 1; --} --]])], --[ac_cv_little_endian_double=yes], --[ac_cv_little_endian_double=no], --[ac_cv_little_endian_double=no])]) --AC_MSG_RESULT($ac_cv_little_endian_double) --if test "$ac_cv_little_endian_double" = yes --then -- AC_DEFINE(DOUBLE_IS_LITTLE_ENDIAN_IEEE754, 1, -- [Define if C doubles are 64-bit IEEE 754 binary format, stored -- with the least significant byte first]) --fi -- --AC_MSG_CHECKING(whether C doubles are big-endian IEEE 754 binary64) --AC_CACHE_VAL(ac_cv_big_endian_double, [ --AC_RUN_IFELSE([AC_LANG_SOURCE([[ --#include <string.h> --int main() { -- double x = 9006104071832581.0; -- if (memcmp(&x, "\x43\x3f\xff\x01\x02\x03\x04\x05", 8) == 0) -- return 0; -- else -- return 1; --} --]])], --[ac_cv_big_endian_double=yes], --[ac_cv_big_endian_double=no], --[ac_cv_big_endian_double=no])]) --AC_MSG_RESULT($ac_cv_big_endian_double) --if test "$ac_cv_big_endian_double" = yes -+AX_C_FLOAT_WORDS_BIGENDIAN -+if test "$ax_cv_c_float_words_bigendian" = "yes" - then - AC_DEFINE(DOUBLE_IS_BIG_ENDIAN_IEEE754, 1, - [Define if C doubles are 64-bit IEEE 754 binary format, stored - with the most significant byte first]) --fi -- --# Some ARM platforms use a mixed-endian representation for doubles. --# While Python doesn't currently have full support for these platforms --# (see e.g., issue 1762561), we can at least make sure that float <-> string --# conversions work. --AC_MSG_CHECKING(whether C doubles are ARM mixed-endian IEEE 754 binary64) --AC_CACHE_VAL(ac_cv_mixed_endian_double, [ --AC_RUN_IFELSE([AC_LANG_SOURCE([[ --#include <string.h> --int main() { -- double x = 9006104071832581.0; -- if (memcmp(&x, "\x01\xff\x3f\x43\x05\x04\x03\x02", 8) == 0) -- return 0; -- else -- return 1; --} --]])], --[ac_cv_mixed_endian_double=yes], --[ac_cv_mixed_endian_double=no], --[ac_cv_mixed_endian_double=no])]) --AC_MSG_RESULT($ac_cv_mixed_endian_double) --if test "$ac_cv_mixed_endian_double" = yes -+elif test "$ax_cv_c_float_words_bigendian" = "no" - then -- AC_DEFINE(DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754, 1, -+ AC_DEFINE(DOUBLE_IS_LITTLE_ENDIAN_IEEE754, 1, - [Define if C doubles are 64-bit IEEE 754 binary format, stored -- in ARM mixed-endian order (byte order 45670123)]) -+ with the least significant byte first]) -+else -+ AC_MSG_ERROR([Cannot identify floating point byte order]) - fi - - # The short float repr introduced in Python 3.1 requires the -diff --git a/m4/ax_c_float_words_bigendian.m4 b/m4/ax_c_float_words_bigendian.m4 -new file mode 100644 -index 0000000..216b90d ---- /dev/null -+++ b/m4/ax_c_float_words_bigendian.m4 -@@ -0,0 +1,83 @@ -+# =============================================================================== -+# https://www.gnu.org/software/autoconf-archive/ax_c_float_words_bigendian.html -+# =============================================================================== -+# -+# SYNOPSIS -+# -+# AX_C_FLOAT_WORDS_BIGENDIAN([ACTION-IF-TRUE], [ACTION-IF-FALSE], [ACTION-IF-UNKNOWN]) -+# -+# DESCRIPTION -+# -+# Checks the ordering of words within a multi-word float. This check is -+# necessary because on some systems (e.g. certain ARM systems), the float -+# word ordering can be different from the byte ordering. In a multi-word -+# float context, "big-endian" implies that the word containing the sign -+# bit is found in the memory location with the lowest address. This -+# implementation was inspired by the AC_C_BIGENDIAN macro in autoconf. -+# -+# The endianness is detected by first compiling C code that contains a -+# special double float value, then grepping the resulting object file for -+# certain strings of ASCII values. The double is specially crafted to have -+# a binary representation that corresponds with a simple string. In this -+# implementation, the string "noonsees" was selected because the -+# individual word values ("noon" and "sees") are palindromes, thus making -+# this test byte-order agnostic. If grep finds the string "noonsees" in -+# the object file, the target platform stores float words in big-endian -+# order. If grep finds "seesnoon", float words are in little-endian order. -+# If neither value is found, the user is instructed to specify the -+# ordering. -+# -+# LICENSE -+# -+# Copyright (c) 2008 Daniel Amelang <[email protected]> -+# -+# Copying and distribution of this file, with or without modification, are -+# permitted in any medium without royalty provided the copyright notice -+# and this notice are preserved. This file is offered as-is, without any -+# warranty. -+ -+#serial 11 -+ -+AC_DEFUN([AX_C_FLOAT_WORDS_BIGENDIAN], -+ [AC_CACHE_CHECK(whether float word ordering is bigendian, -+ ax_cv_c_float_words_bigendian, [ -+ -+ax_cv_c_float_words_bigendian=unknown -+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ -+ -+double d = 90904234967036810337470478905505011476211692735615632014797120844053488865816695273723469097858056257517020191247487429516932130503560650002327564517570778480236724525140520121371739201496540132640109977779420565776568942592.0; -+ -+]])], [ -+ -+if grep noonsees conftest.$ac_objext >/dev/null ; then -+ ax_cv_c_float_words_bigendian=yes -+fi -+if grep seesnoon conftest.$ac_objext >/dev/null ; then -+ if test "$ax_cv_c_float_words_bigendian" = unknown; then -+ ax_cv_c_float_words_bigendian=no -+ else -+ ax_cv_c_float_words_bigendian=unknown -+ fi -+fi -+ -+])]) -+ -+case $ax_cv_c_float_words_bigendian in -+ yes) -+ m4_default([$1], -+ [AC_DEFINE([FLOAT_WORDS_BIGENDIAN], 1, -+ [Define to 1 if your system stores words within floats -+ with the most significant word first])]) ;; -+ no) -+ $2 ;; -+ *) -+ m4_default([$3], -+ [AC_MSG_ERROR([ -+ -+Unknown float word ordering. You need to manually preset -+ax_cv_c_float_words_bigendian=no (or yes) according to your system. -+ -+ ])]) ;; -+esac -+ -+])# AX_C_FLOAT_WORDS_BIGENDIANmeta/recipes-devtools/python/python3/0003-setup.py-pass-missing-libraries-to-Extension-for-mul.patch deleted +0
-80@@ -1,80 +0,0 @@ -From b881a79adcd4ae5ac8fe4f49d0fc77c47f777919 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <[email protected]> -Date: Fri, 4 Aug 2017 11:16:14 +0800 -Subject: [PATCH] setup.py: pass missing libraries to Extension for - multiprocessing module - -In the following commit: -... -commit e711cafab13efc9c1fe6c5cd75826401445eb585 -Author: Benjamin Peterson <[email protected]> -Date: Wed Jun 11 16:44:04 2008 +0000 - - Merged revisions 64104,64117 via svnmerge from - svn+ssh://[email protected]/python/trunk -... -(see diff in setup.py) -It assigned libraries for multiprocessing module according -the host_platform, but not pass it to Extension. - -In glibc, the following commit caused two definition of -sem_getvalue are different. -https://sourceware.org/git/?p=glibc.git;a=commit;h=042e1521c794a945edc43b5bfa7e69ad70420524 -(see diff in nptl/sem_getvalue.c for detail) -`__new_sem_getvalue' is the latest sem_getvalue@@GLIBC_2.1 -and `__old_sem_getvalue' is to compat the old version -sem_getvalue@GLIBC_2.0. - -To build python for embedded Linux systems: -http://www.yoctoproject.org/docs/2.3.1/yocto-project-qs/yocto-project-qs.html -If not explicitly link to library pthread (-lpthread), it will -load glibc's sem_getvalue randomly at runtime. - -Such as build python on linux x86_64 host and run the python -on linux x86_32 target. If not link library pthread, it caused -multiprocessing bounded semaphore could not work correctly. -... ->>> import multiprocessing ->>> pool_sema = multiprocessing.BoundedSemaphore(value=1) ->>> pool_sema.acquire() -True ->>> pool_sema.release() -Traceback (most recent call last): - File "<stdin>", line 1, in <module> -ValueError: semaphore or lock released too many times -... - -And the semaphore issue also caused multiprocessing.Queue().put() hung. - -Upstream-Status: Submitted [https://github.com/python/cpython/pull/2999] - -Signed-off-by: Hongxu Jia <[email protected]> ---- - setup.py | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index b7a36a6..658ead3 100644 ---- a/setup.py -+++ b/setup.py -@@ -1584,8 +1584,10 @@ class PyBuildExt(build_ext): - elif host_platform.startswith('netbsd'): - macros = dict() - libraries = [] -- -- else: # Linux and other unices -+ elif host_platform.startswith(('linux')): -+ macros = dict() -+ libraries = ['pthread'] -+ else: # Other unices - macros = dict() - libraries = ['rt'] - -@@ -1603,6 +1605,7 @@ class PyBuildExt(build_ext): - - exts.append ( Extension('_multiprocessing', multiprocessing_srcs, - define_macros=list(macros.items()), -+ libraries=libraries, - include_dirs=["Modules/_multiprocessing"])) - # End multiprocessing -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 recipesmeta/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.cmeta/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/python3-manifest.json +2
-2@@ -213,8 +213,8 @@ "${bindir}/python3", "${bindir}/python${PYTHON_MAJMIN}", "${bindir}/python${PYTHON_MAJMIN}.real", - "${bindir}/python${PYTHON_BINABI}", - "${includedir}/python${PYTHON_BINABI}/pyconfig*.h", + "${bindir}/python${PYTHON_MAJMIN}", + "${includedir}/python${PYTHON_MAJMIN}/pyconfig*.h", "${prefix}/lib/python${PYTHON_MAJMIN}/config*/*[!.a]", "${libdir}/python${PYTHON_MAJMIN}/UserDict.py", "${libdir}/python${PYTHON_MAJMIN}/UserList.py",meta/recipes-devtools/python/python3_3.8.0.bb renamed from meta/recipes-devtools/python/python3_3.7.5.bb +12
-17@@ -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,20 +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_BINABI = "${PYTHON_MAJMIN}m" +PYTHON_MAJMIN = "3.8" S = "${WORKDIR}/Python-${PV}"@@ -59,8 +53,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 +125,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 +155,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 +171,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 +190,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@@ -322,7 +316,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)@@ -341,3 +335,5 @@ 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" --2.17.1
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [PATCH 06/24] python3: update to 3.8.0
As RP said, the problematic pieces will be tested and fixed one by one, I guess I was too optimistic about this patchset's maturity.
Alex
Quoted 1,306 lines · Khem Raj
besides gettext this is another reason I suppose causing a few more failures see
http://errors.yoctoproject.org/Errors/Build/94077/
all
do_prepare_recipe_sysrootseems to be failing in python snippets. anddo_configurearee also related to native python missing modulesdo_compileare mostly related to gettext.Quoted 28 lines · Alexander Kanavin
Drop 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.
Python 3.8 no longer adds "m" to "3.8" in paths, so adjust the recipes and classes accordingly.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/classes/python3-dir.bbclass | 4 +- ...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 -------Quoted 8 lines
...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 ++- .../python/python3/python3-manifest.json | 4 +- .../{python3_3.7.5.bb => python3_3.8.0.bb} | 28 ++- 15 files changed, 175 insertions(+), 482 deletions(-) delete mode 100644
meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patchQuoted 1 line
delete mode 100644
meta/recipes-devtools/python/python3/0002-Don-t-do-runtime-test-to-get-float-byte-order.patchQuoted 1 line
delete mode 100644
meta/recipes-devtools/python/python3/0003-setup.py-pass-missing-libraries-to-Extension-for-mul.patchQuoted 1 line
rename meta/recipes-devtools/python/{python3_3.7.5.bb =>python3_3.8.0.bb} (91%)
Review
Quoted 2 lines
(quoted diff) +0
-0b/meta/classes/python3-dir.bbclass
Quoted 11 lines
index
7dd130bad99..036d7140d99100644meta/classes/python3-dir.bbclass +2
-2@@ -1,5 +1,5 @@ -PYTHON_BASEVERSION = "3.7" -PYTHON_ABI = "m" +PYTHON_BASEVERSION = "3.8" +PYTHON_ABI = "" PYTHON_DIR = "python${PYTHON_BASEVERSION}" PYTHON_PN = "python3" PYTHON_SITEPACKAGES_DIR = "${libdir}/${PYTHON_DIR}/site-packages"Quoted 1 line
diff --git
a/meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patchb/meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patchQuoted 2 lines
index
09f279ba1d7..59592821d7f100644
---
a/meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patchQuoted 1 line
+++
b/meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patchmeta/classes/python3-dir.bbclass line 4
Quoted 6 lines
meta/classes/python3-dir.bbclass +1
-1@@ -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 avoidhost
meta/classes/python3-dir.bbclass Signed-off-by: Alexander Kanavin <
Quoted 1 line
meta/classes/python3-dir.bbclass +0
-0@@ -12,14 +12,14 @@ Signed-off-by: Alexander Kanavin <Quoted 4 lines
meta/classes/python3-dir.bbclass +0
-11 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py -index b4357e3..fbec00d 100644meta/classes/python3-dir.bbclass Signed-off-by: Alexander Kanavin < · line 23
Quoted 10 lines
meta/classes/python3-dir.bbclass +2
-4+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,
meta/classes/python3-dir.bbclass Signed-off-by: Alexander Kanavin < · line 23
Quoted 4 lines
meta/classes/python3-dir.bbclass +3
-1- libraries=readline_libs) ) + self.add(Extension('readline', ['readline.c'], +- library_dirs=['/usr/lib/termcap'], +extra_link_args=readline_extra_link_args,
Quoted 3 lines
meta/classes/python3-dir.bbclass +1
-0+ libraries=readline_libs)) else:diff --git
a/meta/recipes-devtools/python/python3/0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patchb/meta/recipes-devtools/python/python3/0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patchQuoted 2 lines
index
ea75262c4f6..112c979441f100644
---
a/meta/recipes-devtools/python/python3/0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patchQuoted 1 line
+++
b/meta/recipes-devtools/python/python3/0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patchmeta/classes/python3-dir.bbclass line 4
Quoted 6 lines
meta/classes/python3-dir.bbclass +1
-1@@ -1,4 +1,4 @@ -From 0fbdad1eaf541a8e92be81f39514cd249b3b0801 Mon Sep 17 00:00:00 2001 +From a078b6ff1492e848ad1055764fb9a414abaf3e12 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Tue, 5 Feb 2019 15:52:02 +0100 Subject: [PATCH] Do not hardcode "lib" as location for modules,site-packages
meta/classes/python3-dir.bbclass Signed-off-by: Alexander Kanavin <
Quoted 1 line
meta/classes/python3-dir.bbclass +0
-0@@ -11,13 +11,13 @@ Signed-off-by: Alexander Kanavin <Quoted 17 lines
meta/classes/python3-dir.bbclass +3
-3Include/pythonrun.h | 2 ++ Lib/site.py | 4 ++-- Makefile.pre.in | 5 +++-- - Modules/getpath.c | 18 ++++++++++++------ + Modules/getpath.c | 22 ++++++++++++++-------- Python/getplatform.c | 10 ++++++++++ Python/sysmodule.c | 2 ++ - 6 files changed, 31 insertions(+), 10 deletions(-) + 6 files changed, 33 insertions(+), 12 deletions(-) diff --git a/Include/pythonrun.h b/Include/pythonrun.h -index 6f0c6fc..0a17edd 100644 +index 46091e0..61b2e15 100644 --- a/Include/pythonrun.h +++ b/Include/pythonrun.h @@ -7,6 +7,8 @@meta/classes/python3-dir.bbclass index 6f0c6fc..0a17edd 100644 · line 30
Quoted 3 lines
meta/classes/python3-dir.bbclass +0
-0@@ -28,12 +28,12 @@ index 6f0c6fc..0a17edd 100644 + #ifndef Py_LIMITED_API PyAPI_FUNC(int) PyRun_SimpleStringFlags(const char *, PyCompilerFlags*);
meta/classes/python3-dir.bbclass index 6f0c6fc..0a17edd 100644 · line 31
Quoted 1 line
meta/classes/python3-dir.bbclass +0
-1- PyAPI_FUNC(int) PyRun_AnyFileFlags(FILE *, const char *,PyCompilerFlags *);
Quoted 25 lines
meta/classes/python3-dir.bbclass +5
-4+ PyAPI_FUNC(int) PyRun_AnyFileExFlags( diff --git a/Lib/site.py b/Lib/site.py -index ffd132b..b55f6d8 100644 +index a065ab0..1d720ef 100644 --- a/Lib/site.py +++ b/Lib/site.py -@@ -334,12 +334,12 @@ def getsitepackages(prefixes=None): +@@ -335,12 +335,12 @@ def getsitepackages(prefixes=None): seen.add(prefix) if os.sep == '/':@@ -49,10 +49,10 @@ index ffd132b..b55f6d8 100644 def addsitepackages(known_paths, prefixes=None): diff --git a/Makefile.pre.in b/Makefile.pre.in -index 6e81b2f..671a20e 100644 +index 65665df..be49140 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -142,7 +142,7 @@ LIBDIR= @libdir@ +@@ -143,7 +143,7 @@ LIBDIR= @libdir@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/includemeta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 64
Quoted 4 lines
meta/classes/python3-dir.bbclass +0
-1@@ -61,7 +61,7 @@ index 6e81b2f..671a20e 100644 ABIFLAGS= @ABIFLAGS@ # Detailed destination directories -@@ -768,6 +768,7 @@ Modules/getpath.o: $(srcdir)/Modules/getpath.c
Makefilemeta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 64
Quoted 1 line
meta/classes/python3-dir.bbclass +1
-0+@@ -753,6 +753,7 @@ Modules/getpath.o: $(srcdir)/Modules/getpath.c
Makefilemeta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 73
Quoted 10 lines
meta/classes/python3-dir.bbclass +1
-1-DEXEC_PREFIX='"$(exec_prefix)"' \ -DVERSION='"$(VERSION)"' \ -DVPATH='"$(VPATH)"' \@@ -69,7 +69,7 @@ index 6e81b2f..671a20e 100644 -o $@ $(srcdir)/Modules/getpath.c Programs/python.o: $(srcdir)/Programs/python.c -@@ -856,7 +857,7 @@ regen-opcode: +@@ -868,7 +869,7 @@ regen-symbol: $(srcdir)/Include/graminit.h Python/compile.o Python/symtable.o Python/ast_unparse.o Python/ast.o
Python/future.oParser/parsetok.o: $(srcdir)/Include/graminit.h $(srcdir)/Include/Python-ast.hmeta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 80
Quoted 5 lines
meta/classes/python3-dir.bbclass +0
-0Python/getplatform.o: $(srcdir)/Python/getplatform.c@@ -79,72 +79,90 @@ index 6e81b2f..671a20e 100644 Python/importdl.o: $(srcdir)/Python/importdl.c $(CC) -c $(PY_CORE_CFLAGS) -I$(DLINCLDIR) -o $@$(srcdir)/Python/importdl.c
meta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 89
Quoted 12 lines
meta/classes/python3-dir.bbclass +3
-3diff --git a/Modules/getpath.c b/Modules/getpath.c -index e6a3e8e..0c62af6 100644 +index b727f66..c003e46 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c -@@ -123,6 +123,7 @@ typedef struct { - wchar_t *exec_prefix; /* EXEC_PREFIX define */ +@@ -128,6 +128,7 @@ typedef struct { + wchar_t *exec_prefix; /* EXEC_PREFIX macro */ wchar_t *lib_python; /* "lib/pythonX.Y" */ + wchar_t *multilib_python; /* "lib[suffix]/pythonX.Y"*/
meta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 91
Quoted 5 lines
meta/classes/python3-dir.bbclass +1
-3- wchar_t argv0_path[MAXPATHLEN+1]; - wchar_t zip_path[MAXPATHLEN+1]; /* ".../lib/pythonXY.zip" */ -@@ -314,7 +315,7 @@ search_for_prefix(const _PyCoreConfig *core_config, + int prefix_found; /* found platform independent libraries?*/
meta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 92
Quoted 1 line
meta/classes/python3-dir.bbclass +1
-0+ int exec_prefix_found; /* found the platform dependentlibraries? */
meta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 93
Quoted 1 line
meta/classes/python3-dir.bbclass +1
-0+@@ -386,7 +387,7 @@ search_for_prefix(PyCalculatePath *calculate,
_PyPathConfig*pathconfig,meta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 98
Quoted 12 lines
meta/classes/python3-dir.bbclass +2
-7if (delim) { *delim = L'\0'; } -- joinpath(prefix, calculate->lib_python); -+ joinpath(prefix, calculate->multilib_python); - joinpath(prefix, LANDMARK); - return 1; - } -@@ -343,7 +344,7 @@ search_for_prefix(const _PyCoreConfig *core_config, - copy_absolute(prefix, calculate->argv0_path, MAXPATHLEN+1); +- status = joinpath(prefix, calculate->lib_python, prefix_len); ++ status = joinpath(prefix, calculate->multilib_python,
prefix_len);meta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 102
Quoted 4 lines
meta/classes/python3-dir.bbclass +4
-0+ if (_PyStatus_EXCEPTION(status)) { + return status; + } +@@ -444,7 +445,7 @@ search_for_prefix(PyCalculatePath *calculate,
_PyPathConfig*pathconfig,Quoted 7 lines
meta/classes/python3-dir.bbclass +0
-6do { - n = wcslen(prefix); -- joinpath(prefix, calculate->lib_python); -+ joinpath(prefix, calculate->multilib_python); - joinpath(prefix, LANDMARK); - if (ismodule(prefix)) { - return 1;meta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 120
Quoted 10 lines
meta/classes/python3-dir.bbclass +0
-10-@@ -355,7 +356,7 @@ search_for_prefix(const _PyCoreConfig *core_config, - /* Look at configure's PREFIX */ - wcsncpy(prefix, calculate->prefix, MAXPATHLEN); - prefix[MAXPATHLEN] = L'\0'; -- joinpath(prefix, calculate->lib_python); -+ joinpath(prefix, calculate->multilib_python); - joinpath(prefix, LANDMARK); - if (ismodule(prefix)) { - return 1; -@@ -427,7 +428,7 @@ search_for_exec_prefix(const _PyCoreConfig
*core_config,meta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 107
Quoted 5 lines
meta/classes/python3-dir.bbclass +4
-1- wcsncpy(exec_prefix, core_config->home, MAXPATHLEN); + /* Path: <argv0_path or substring> / <lib_python> / LANDMARK */ + size_t n = wcslen(prefix); +- status = joinpath(prefix, calculate->lib_python, prefix_len); ++ status = joinpath(prefix, calculate->multilib_python,
prefix_len);meta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 111
Quoted 9 lines
meta/classes/python3-dir.bbclass +3
-5+ if (_PyStatus_EXCEPTION(status)) { + return status; } - exec_prefix[MAXPATHLEN] = L'\0'; -- joinpath(exec_prefix, calculate->lib_python); -+ joinpath(exec_prefix, calculate->multilib_python); - joinpath(exec_prefix, L"lib-dynload"); - return 1; +@@ -467,7 +468,7 @@ search_for_prefix(PyCalculatePath *calculate,
_PyPathConfig*pathconfig,meta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 129
Quoted 9 lines
meta/classes/python3-dir.bbclass +7
-1+ if (safe_wcscpy(prefix, calculate->prefix, prefix_len) < 0) { + return PATHLEN_ERR(); + } +- status = joinpath(prefix, calculate->lib_python, prefix_len); ++ status = joinpath(prefix, calculate->multilib_python, prefix_len); + if (_PyStatus_EXCEPTION(status)) { + return status; } -@@ -464,7 +465,7 @@ search_for_exec_prefix(const _PyCoreConfig
*core_config,meta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 120
Quoted 2 lines
meta/classes/python3-dir.bbclass +1
-1- copy_absolute(exec_prefix, calculate->argv0_path, MAXPATHLEN+1); +@@ -510,7 +511,7 @@ calculate_prefix(PyCalculatePath *calculate,
_PyPathConfig*pathconfig,meta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 125
Quoted 5 lines
meta/classes/python3-dir.bbclass +5
-0+ if (safe_wcscpy(prefix, calculate->prefix, prefix_len) < 0) { + return PATHLEN_ERR(); + } +- status = joinpath(prefix, calculate->lib_python, prefix_len); ++ status = joinpath(prefix, calculate->multilib_python,
prefix_len);meta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 129
Quoted 4 lines
meta/classes/python3-dir.bbclass +4
-0+ if (_PyStatus_EXCEPTION(status)) { + return status; + } +@@ -635,7 +636,7 @@ search_for_exec_prefix(PyCalculatePath *calculate,
_PyPathConfig*pathconfig,meta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 133
Quoted 4 lines
meta/classes/python3-dir.bbclass +4
-0+ return PATHLEN_ERR(); + } + } +- status = joinpath(exec_prefix, calculate->lib_python,
exec_prefix_len);meta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 134
Quoted 1 line
meta/classes/python3-dir.bbclass +1
-0++ status = joinpath(exec_prefix, calculate->multilib_python,
exec_prefix_len);meta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 138
Quoted 4 lines
meta/classes/python3-dir.bbclass +4
-0+ if (_PyStatus_EXCEPTION(status)) { + return status; + } +@@ -667,7 +668,7 @@ search_for_exec_prefix(PyCalculatePath *calculate,
_PyPathConfig*pathconfig,meta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 138
Quoted 8 lines
meta/classes/python3-dir.bbclass +0
-7do { - n = wcslen(exec_prefix); -- joinpath(exec_prefix, calculate->lib_python); -+ joinpath(exec_prefix, calculate->multilib_python); - joinpath(exec_prefix, L"lib-dynload"); - if (isdir(exec_prefix)) { - return 1; -@@ -476,7 +477,7 @@ search_for_exec_prefix(const _PyCoreConfig
*core_config,meta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 140
Quoted 10 lines
meta/classes/python3-dir.bbclass +1
-9- /* Look at configure's EXEC_PREFIX */ - wcsncpy(exec_prefix, calculate->exec_prefix, MAXPATHLEN); - exec_prefix[MAXPATHLEN] = L'\0'; -- joinpath(exec_prefix, calculate->lib_python); -+ joinpath(exec_prefix, calculate->multilib_python); - joinpath(exec_prefix, L"lib-dynload"); - if (isdir(exec_prefix)) { - return 1; -@@ -871,6 +872,10 @@ calculate_init(PyCalculatePath *calculate, + /* Path: <argv0_path or substring> / <lib_python> /"lib-dynload" */
meta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 142
Quoted 2 lines
meta/classes/python3-dir.bbclass +2
-0+ size_t n = wcslen(exec_prefix); +- status = joinpath(exec_prefix, calculate->lib_python,
exec_prefix_len);meta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 143
Quoted 1 line
meta/classes/python3-dir.bbclass +1
-0++ status = joinpath(exec_prefix, calculate->multilib_python,
exec_prefix_len);meta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 147
Quoted 4 lines
meta/classes/python3-dir.bbclass +4
-0+ if (_PyStatus_EXCEPTION(status)) { + return status; + } +@@ -689,7 +690,7 @@ search_for_exec_prefix(PyCalculatePath *calculate,
_PyPathConfig*pathconfig,meta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 148
Quoted 1 line
meta/classes/python3-dir.bbclass +1
-0+ if (safe_wcscpy(exec_prefix, calculate->exec_prefix,
exec_prefix_len) < 0) {meta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 151
Quoted 3 lines
meta/classes/python3-dir.bbclass +3
-0+ return PATHLEN_ERR(); + } +- status = joinpath(exec_prefix, calculate->lib_python,
exec_prefix_len);meta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 152
Quoted 1 line
meta/classes/python3-dir.bbclass +1
-0++ status = joinpath(exec_prefix, calculate->multilib_python,
exec_prefix_len);meta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 156
Quoted 4 lines
meta/classes/python3-dir.bbclass +4
-0+ if (_PyStatus_EXCEPTION(status)) { + return status; + } +@@ -928,7 +929,7 @@ calculate_argv0_path(PyCalculatePath *calculate,const
wchar_t*program_full_patmeta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 160
Quoted 4 lines
meta/classes/python3-dir.bbclass +4
-0+ return PATHLEN_ERR(); + } + reduce(argv0_path); +- status = joinpath(argv0_path, calculate->lib_python,
argv0_path_len);meta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 161
Quoted 1 line
meta/classes/python3-dir.bbclass +1
-0++ status = joinpath(argv0_path, calculate->multilib_python,
argv0_path_len);meta/classes/python3-dir.bbclass index 6e81b2f..671a20e 100644 · line 165
Quoted 4 lines
meta/classes/python3-dir.bbclass +4
-0+ if (_PyStatus_EXCEPTION(status)) { + PyMem_RawFree(wbuf); + return status; +@@ -1201,6 +1202,10 @@ calculate_init(PyCalculatePath *calculate, constPyConfig *config)
Quoted 18 lines
meta/classes/python3-dir.bbclass +3
-3if (!calculate->lib_python) { return DECODE_LOCALE_ERR("EXEC_PREFIX define", len); }@@ -152,10 +170,10 @@ index e6a3e8e..0c62af6 100644 + if (!calculate->multilib_python) { + return DECODE_LOCALE_ERR("EXEC_PREFIX define", len); + } - return _Py_INIT_OK(); - } -@@ -882,6 +887,7 @@ calculate_free(PyCalculatePath *calculate) + calculate->warnings = config->pathconfig_warnings; + calculate->pythonpath_env = config->pythonpath_env; +@@ -1216,6 +1221,7 @@ calculate_free(PyCalculatePath *calculate) PyMem_RawFree(calculate->prefix); PyMem_RawFree(calculate->exec_prefix); PyMem_RawFree(calculate->lib_python);meta/classes/python3-dir.bbclass index 81a0f7a..d55396b 100644 · line 206
Quoted 9 lines
meta/classes/python3-dir.bbclass +2
-2@@ -182,10 +200,10 @@ index 81a0f7a..d55396b 100644 + return LIB; +} diff --git a/Python/sysmodule.c b/Python/sysmodule.c -index efe5b29..de77b17 100644 +index 5b0fb81..0dce754 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c -@@ -2319,6 +2319,8 @@ _PySys_BeginInit(PyObject **sysmod) +@@ -2668,6 +2668,8 @@ _PySys_InitCore(_PyRuntimeState *runtime,PyInterpreterState *interp,
Quoted 4 lines
meta/classes/python3-dir.bbclass +0
-0PyUnicode_FromString(Py_GetCopyright())); SET_SYS_FROM_STRING("platform", PyUnicode_FromString(Py_GetPlatform()));diff --git
a/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patchb/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patchQuoted 2 lines
index
e7af88654da..fe0aa8aabed100644
---
a/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patchQuoted 1 line
+++
b/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patchmeta/classes/python3-dir.bbclass line 4
Quoted 6 lines
meta/classes/python3-dir.bbclass +1
-1@@ -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 forsoft
meta/classes/python3-dir.bbclass to do this in a more autoconf/autotools manner. · line 13
Quoted 3 lines
meta/classes/python3-dir.bbclass +0
-0@@ -12,15 +12,16 @@ to do this in a more autoconf/autotools manner. Upstream-Status: Submitted [Quoted 34 lines
meta/classes/python3-dir.bbclass +7
-7Signed-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 -Quoted 1 line
diff --git
a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patchb/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patchQuoted 2 lines
index
1709011be8a..ee37f6bd52d100644
---
a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patchQuoted 1 line
+++
b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patchQuoted 7 lines
meta/classes/python3-dir.bbclass +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: appenddiff --git
a/meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patchb/meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patchQuoted 3 lines
deleted file mode 100644
index a146c747f83..00000000000
---
a/meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patchmeta/classes/python3-dir.bbclass line 4
Quoted 6 lines
+++
/dev/nullmeta/classes/python3-dir.bbclass +0
-4@@ -1,47 +0,0 @@ -From 5ce3ac59531828ff682646fbba59b2126b28a8aa Mon Sep 17 00:00:00 2001 -From: Jaewon Lee <[email protected]> -Date: Thu, 25 Apr 2019 15:34:26 -0700 -Subject: [PATCH] main.c: if OEPYTHON3HOME is set use instead ofPYTHONHOME
Quoted 15 lines
meta/classes/python3-dir.bbclass +0
-15- -There is one variable PYTHONHOME to determine where libraries are coming -from for both python2 and python3. This becomes an issue if only one has -libraries in the specified PYTHONHOME path, but they are using the same -PYTHONHOME. Creating another variable OEPYTHON3HOME to allow for a way -to set a different path for python3 - -Signed-off-by: Jaewon Lee <[email protected]> - -Upstream-Status: Inappropriate [OE specific configuration] - ---- - Modules/main.c | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) -meta/classes/python3-dir.bbclass line 29
Quoted 10 lines
meta/classes/python3-dir.bbclass +0
-10-diff --git a/Modules/main.c b/Modules/main.c -index acc59c6..407085a 100644 ---- a/Modules/main.c -+++ b/Modules/main.c -@@ -1834,10 +1834,19 @@ config_init_home(_PyCoreConfig *config) - } - return _Py_INIT_OK(); - } -- -- int res = config_get_env_var_dup(&home, L"PYTHONHOME","PYTHONHOME");
meta/classes/python3-dir.bbclass line 35
Quoted 6 lines
meta/classes/python3-dir.bbclass +0
-6-- if (res < 0) { -- return DECODE_LOCALE_ERR("PYTHONHOME", res); -+ int res; -+ const char *oepython3home = config_get_env_var("OEPYTHON3HOME"); -+ if (oepython3home) { -+ res = config_get_env_var_dup(&home, L"OEPYTHON3HOME","OEPYTHON3HOME");
meta/classes/python3-dir.bbclass line 41
Quoted 6 lines
meta/classes/python3-dir.bbclass +0
-6-+ if (res < 0) { -+ return DECODE_LOCALE_ERR("OEPYTHON3HOME", res); -+ } -+ } -+ else { -+ res = config_get_env_var_dup(&home, L"PYTHONHOME","PYTHONHOME");
Quoted 7 lines
meta/classes/python3-dir.bbclass +0
-6-+ if (res < 0) { -+ return DECODE_LOCALE_ERR("PYTHONHOME", res); -+ } - } - config->home = home; - return _Py_INIT_OK();diff --git
a/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patchb/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patchQuoted 2 lines
index
a0ea897f4e8..fb10ca94b31100644
---
a/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patchQuoted 1 line
+++
b/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patchmeta/classes/python3-dir.bbclass line 4
Quoted 6 lines
meta/classes/python3-dir.bbclass +1
-1@@ -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 checkingcompiler
Quoted 16 lines
meta/classes/python3-dir.bbclass +2
-1@@ -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)meta/classes/python3-dir.bbclass index a7de901..4a3681f 100644 · line 39
Quoted 2 lines
meta/classes/python3-dir.bbclass +0
-0@@ -37,7 +38,7 @@ index a7de901..4a3681f 100644 # pybuilddir.txt will be created by --generate-posix-vars in the
Makefilemeta/classes/python3-dir.bbclass index a7de901..4a3681f 100644 · line 49
Quoted 10 lines
meta/classes/python3-dir.bbclass +1
-1rm -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]) ;;
Quoted 24 lines
meta/classes/python3-dir.bbclass +3
-3-@@ -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=nometa/classes/python3-dir.bbclass index a7de901..4a3681f 100644 · line 75
Quoted 2 lines
meta/classes/python3-dir.bbclass +0
-0@@ -73,16 +74,16 @@ index a7de901..4a3681f 100644 *clang*) # Any changes made here should be reflected in the GCC+Darwin casebelow
Quoted 13 lines
meta/classes/python3-dir.bbclass +3
-8PGO_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 - ;;meta/classes/python3-dir.bbclass index a7de901..4a3681f 100644 · line 89
Quoted 10 lines
meta/classes/python3-dir.bbclass +6
-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 bedisabled?
Quoted 25 lines
meta/classes/python3-dir.bbclass +2
-2@@ -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; thenQuoted 4 lines
# 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.htmldiff --git
a/meta/recipes-devtools/python/python3/0002-Don-t-do-runtime-test-to-get-float-byte-order.patchb/meta/recipes-devtools/python/python3/0002-Don-t-do-runtime-test-to-get-float-byte-order.patchQuoted 3 lines
deleted file mode 100644
index 58ab709028e..00000000000
---
a/meta/recipes-devtools/python/python3/0002-Don-t-do-runtime-test-to-get-float-byte-order.patchmeta/classes/python3-dir.bbclass line 6
Quoted 8 lines
+++
/dev/nullmeta/classes/python3-dir.bbclass +0
-6@@ -1,199 +0,0 @@ -From fa96a7fd19e17b9c6b4dd01c3c3774fb382dddc6 Mon Sep 17 00:00:00 2001 -From: Ross Burton <[email protected]> -Date: Wed, 5 Sep 2018 11:45:52 +0100 -Subject: [PATCH] Don't do runtime test to get float byte order - -Python uses AC_RUN_IFELSE to determine the byte order for floats anddoubles,
meta/classes/python3-dir.bbclass line 7
Quoted 1 line
meta/classes/python3-dir.bbclass +0
-1-and falls back onto "I don't know" if it can't run code. This resultsin
meta/classes/python3-dir.bbclass line 8
Quoted 1 line
meta/classes/python3-dir.bbclass +0
-1-crippled floating point numbers in Python, and the regression testsfail.
meta/classes/python3-dir.bbclass line 10
Quoted 2 lines
meta/classes/python3-dir.bbclass +0
-2- -Instead of running code, take a macro from autoconf-archive whichcompiles C
meta/classes/python3-dir.bbclass line 11
Quoted 1 line
meta/classes/python3-dir.bbclass +0
-1-with a special double in which has an ASCII representation, and thengreps the
Quoted 59 lines
meta/classes/python3-dir.bbclass +0
-59-binary to identify the format. - -Upstream-Status: Backport [2a9c3805ddedf282881ef7811a561c70b74f80b1] -Signed-off-by: Ross Burton <[email protected]> ---- - configure.ac | 72 +++------------------------ - m4/ax_c_float_words_bigendian.m4 | 83 ++++++++++++++++++++++++++++++++ - 2 files changed, 90 insertions(+), 65 deletions(-) - create mode 100644 m4/ax_c_float_words_bigendian.m4 - -diff --git a/configure.ac b/configure.ac -index 4a3681f..4ab19a6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4328,77 +4328,19 @@ fi - # * Check for various properties of floating point * - # ************************************************** - --AC_MSG_CHECKING(whether C doubles are little-endian IEEE 754 binary64) --AC_CACHE_VAL(ac_cv_little_endian_double, [ --AC_RUN_IFELSE([AC_LANG_SOURCE([[ --#include <string.h> --int main() { -- double x = 9006104071832581.0; -- if (memcmp(&x, "\x05\x04\x03\x02\x01\xff\x3f\x43", 8) == 0) -- return 0; -- else -- return 1; --} --]])], --[ac_cv_little_endian_double=yes], --[ac_cv_little_endian_double=no], --[ac_cv_little_endian_double=no])]) --AC_MSG_RESULT($ac_cv_little_endian_double) --if test "$ac_cv_little_endian_double" = yes --then -- AC_DEFINE(DOUBLE_IS_LITTLE_ENDIAN_IEEE754, 1, -- [Define if C doubles are 64-bit IEEE 754 binary format, stored -- with the least significant byte first]) --fi -- --AC_MSG_CHECKING(whether C doubles are big-endian IEEE 754 binary64) --AC_CACHE_VAL(ac_cv_big_endian_double, [ --AC_RUN_IFELSE([AC_LANG_SOURCE([[ --#include <string.h> --int main() { -- double x = 9006104071832581.0; -- if (memcmp(&x, "\x43\x3f\xff\x01\x02\x03\x04\x05", 8) == 0) -- return 0; -- else -- return 1; --} --]])], --[ac_cv_big_endian_double=yes], --[ac_cv_big_endian_double=no], --[ac_cv_big_endian_double=no])]) --AC_MSG_RESULT($ac_cv_big_endian_double) --if test "$ac_cv_big_endian_double" = yes -+AX_C_FLOAT_WORDS_BIGENDIANmeta/classes/python3-dir.bbclass line 80
Quoted 10 lines
meta/classes/python3-dir.bbclass +0
-10-+if test "$ax_cv_c_float_words_bigendian" = "yes" - then - AC_DEFINE(DOUBLE_IS_BIG_ENDIAN_IEEE754, 1, - [Define if C doubles are 64-bit IEEE 754 binary format, stored - with the most significant byte first]) --fi -- --# Some ARM platforms use a mixed-endian representation for doubles. --# While Python doesn't currently have full support for these platforms --# (see e.g., issue 1762561), we can at least make sure that float <->string
meta/classes/python3-dir.bbclass line 82
Quoted 2 lines
meta/classes/python3-dir.bbclass +0
-2--# conversions work. --AC_MSG_CHECKING(whether C doubles are ARM mixed-endian IEEE 754binary64)
Quoted 19 lines
meta/classes/python3-dir.bbclass +0
-19--AC_CACHE_VAL(ac_cv_mixed_endian_double, [ --AC_RUN_IFELSE([AC_LANG_SOURCE([[ --#include <string.h> --int main() { -- double x = 9006104071832581.0; -- if (memcmp(&x, "\x01\xff\x3f\x43\x05\x04\x03\x02", 8) == 0) -- return 0; -- else -- return 1; --} --]])], --[ac_cv_mixed_endian_double=yes], --[ac_cv_mixed_endian_double=no], --[ac_cv_mixed_endian_double=no])]) --AC_MSG_RESULT($ac_cv_mixed_endian_double) --if test "$ac_cv_mixed_endian_double" = yes -+elif test "$ax_cv_c_float_words_bigendian" = "no" - then -- AC_DEFINE(DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754, 1,meta/classes/python3-dir.bbclass line 111
Quoted 10 lines
meta/classes/python3-dir.bbclass +0
-10-+ AC_DEFINE(DOUBLE_IS_LITTLE_ENDIAN_IEEE754, 1, - [Define if C doubles are 64-bit IEEE 754 binary format, stored -- in ARM mixed-endian order (byte order 45670123)]) -+ with the least significant byte first]) -+else -+ AC_MSG_ERROR([Cannot identify floating point byte order]) - fi - - # The short float repr introduced in Python 3.1 requires the -diff --git a/m4/ax_c_float_words_bigendian.m4b/m4/ax_c_float_words_bigendian.m4
meta/classes/python3-dir.bbclass line 117
Quoted 6 lines
meta/classes/python3-dir.bbclass +0
-6-new file mode 100644 -index 0000000..216b90d ---- /dev/null -+++ b/m4/ax_c_float_words_bigendian.m4 -@@ -0,0 +1,83 @@ -+#===============================================================================
meta/classes/python3-dir.bbclass line 118
Quoted 1 line
meta/classes/python3-dir.bbclass +0
-1-+#https://www.gnu.org/software/autoconf-archive/ax_c_float_words_bigendian.html
meta/classes/python3-dir.bbclass line 119
Quoted 1 line
meta/classes/python3-dir.bbclass +0
-1-+#===============================================================================
meta/classes/python3-dir.bbclass line 123
Quoted 4 lines
meta/classes/python3-dir.bbclass +0
-4-+# -+# SYNOPSIS -+# -+# AX_C_FLOAT_WORDS_BIGENDIAN([ACTION-IF-TRUE], [ACTION-IF-FALSE],[ACTION-IF-UNKNOWN])
meta/classes/python3-dir.bbclass line 127
Quoted 4 lines
meta/classes/python3-dir.bbclass +0
-4-+# -+# DESCRIPTION -+# -+# Checks the ordering of words within a multi-word float. This checkis
meta/classes/python3-dir.bbclass line 128
Quoted 1 line
meta/classes/python3-dir.bbclass +0
-1-+# necessary because on some systems (e.g. certain ARM systems), thefloat
meta/classes/python3-dir.bbclass line 129
Quoted 1 line
meta/classes/python3-dir.bbclass +0
-1-+# word ordering can be different from the byte ordering. In amulti-word
meta/classes/python3-dir.bbclass line 130
Quoted 1 line
meta/classes/python3-dir.bbclass +0
-1-+# float context, "big-endian" implies that the word containing thesign
meta/classes/python3-dir.bbclass line 132
Quoted 2 lines
meta/classes/python3-dir.bbclass +0
-2-+# bit is found in the memory location with the lowest address. This -+# implementation was inspired by the AC_C_BIGENDIAN macro inautoconf.
meta/classes/python3-dir.bbclass line 134
Quoted 2 lines
meta/classes/python3-dir.bbclass +0
-2-+# -+# The endianness is detected by first compiling C code that containsa
meta/classes/python3-dir.bbclass line 135
Quoted 1 line
meta/classes/python3-dir.bbclass +0
-1-+# special double float value, then grepping the resulting objectfile for
meta/classes/python3-dir.bbclass line 136
Quoted 1 line
meta/classes/python3-dir.bbclass +0
-1-+# certain strings of ASCII values. The double is specially craftedto have
meta/classes/python3-dir.bbclass line 137
Quoted 1 line
meta/classes/python3-dir.bbclass +0
-1-+# a binary representation that corresponds with a simple string. Inthis
meta/classes/python3-dir.bbclass line 139
Quoted 2 lines
meta/classes/python3-dir.bbclass +0
-2-+# implementation, the string "noonsees" was selected because the -+# individual word values ("noon" and "sees") are palindromes, thusmaking
meta/classes/python3-dir.bbclass line 140
Quoted 1 line
meta/classes/python3-dir.bbclass +0
-1-+# this test byte-order agnostic. If grep finds the string "noonsees"in
meta/classes/python3-dir.bbclass line 141
Quoted 1 line
meta/classes/python3-dir.bbclass +0
-1-+# the object file, the target platform stores float words inbig-endian
meta/classes/python3-dir.bbclass line 142
Quoted 1 line
meta/classes/python3-dir.bbclass +0
-1-+# order. If grep finds "seesnoon", float words are in little-endianorder.
meta/classes/python3-dir.bbclass line 150
Quoted 8 lines
meta/classes/python3-dir.bbclass +0
-8-+# If neither value is found, the user is instructed to specify the -+# ordering. -+# -+# LICENSE -+# -+# Copyright (c) 2008 Daniel Amelang <[email protected]> -+# -+# Copying and distribution of this file, with or withoutmodification, are
meta/classes/python3-dir.bbclass line 151
Quoted 1 line
meta/classes/python3-dir.bbclass +0
-1-+# permitted in any medium without royalty provided the copyrightnotice
meta/classes/python3-dir.bbclass line 152
Quoted 1 line
meta/classes/python3-dir.bbclass +0
-1-+# and this notice are preserved. This file is offered as-is, withoutany
meta/classes/python3-dir.bbclass line 164
Quoted 12 lines
meta/classes/python3-dir.bbclass +0
-12-+# warranty. -+ -+#serial 11 -+ -+AC_DEFUN([AX_C_FLOAT_WORDS_BIGENDIAN], -+ [AC_CACHE_CHECK(whether float word ordering is bigendian, -+ ax_cv_c_float_words_bigendian, [ -+ -+ax_cv_c_float_words_bigendian=unknown -+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ -+ -+double d =90904234967036810337470478905505011476211692735615632014797120844053488865816695273723469097858056257517020191247487429516932130503560650002327564517570778480236724525140520121371739201496540132640109977779420565776568942592.0;
Quoted 35 lines
meta/classes/python3-dir.bbclass +0
-35-+ -+]])], [ -+ -+if grep noonsees conftest.$ac_objext >/dev/null ; then -+ ax_cv_c_float_words_bigendian=yes -+fi -+if grep seesnoon conftest.$ac_objext >/dev/null ; then -+ if test "$ax_cv_c_float_words_bigendian" = unknown; then -+ ax_cv_c_float_words_bigendian=no -+ else -+ ax_cv_c_float_words_bigendian=unknown -+ fi -+fi -+ -+])]) -+ -+case $ax_cv_c_float_words_bigendian in -+ yes) -+ m4_default([$1], -+ [AC_DEFINE([FLOAT_WORDS_BIGENDIAN], 1, -+ [Define to 1 if your system stores words within floats -+ with the most significant word first])]) ;; -+ no) -+ $2 ;; -+ *) -+ m4_default([$3], -+ [AC_MSG_ERROR([ -+ -+Unknown float word ordering. You need to manually preset -+ax_cv_c_float_words_bigendian=no (or yes) according to your system. -+ -+ ])]) ;; -+esac -+ -+])# AX_C_FLOAT_WORDS_BIGENDIANQuoted 1 line
diff --git
a/meta/recipes-devtools/python/python3/0003-setup.py-pass-missing-libraries-to-Extension-for-mul.patchb/meta/recipes-devtools/python/python3/0003-setup.py-pass-missing-libraries-to-Extension-for-mul.patchQuoted 3 lines
deleted file mode 100644
index b9d5bc9c516..00000000000
---
a/meta/recipes-devtools/python/python3/0003-setup.py-pass-missing-libraries-to-Extension-for-mul.patchQuoted 14 lines
+++
/dev/nullmeta/classes/python3-dir.bbclass +0
-12@@ -1,80 +0,0 @@ -From b881a79adcd4ae5ac8fe4f49d0fc77c47f777919 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <[email protected]> -Date: Fri, 4 Aug 2017 11:16:14 +0800 -Subject: [PATCH] setup.py: pass missing libraries to Extension for - multiprocessing module - -In the following commit: -... -commit e711cafab13efc9c1fe6c5cd75826401445eb585 -Author: Benjamin Peterson <[email protected]> -Date: Wed Jun 11 16:44:04 2008 +0000 -meta/classes/python3-dir.bbclass line 22
Quoted 10 lines
meta/classes/python3-dir.bbclass +0
-10- Merged revisions 64104,64117 via svnmerge from - svn+ssh://[email protected]/python/trunk -... -(see diff in setup.py) -It assigned libraries for multiprocessing module according -the host_platform, but not pass it to Extension. - -In glibc, the following commit caused two definition of -sem_getvalue are different. -https://sourceware.org/git/?p=glibc.git;a=commit;h=042e1521c794a945edc43b5bfa7e69ad70420524
meta/classes/python3-dir.bbclass line 29
Quoted 7 lines
meta/classes/python3-dir.bbclass +0
-7-(see diff in nptl/sem_getvalue.c for detail) -`__new_sem_getvalue' is the latest sem_getvalue@@GLIBC_2.1 -and `__old_sem_getvalue' is to compat the old version -sem_getvalue@GLIBC_2.0. - -To build python for embedded Linux systems: -http://www.yoctoproject.org/docs/2.3.1/yocto-project-qs/yocto-project-qs.html
Quoted 10 lines
meta/classes/python3-dir.bbclass +0
-10-If not explicitly link to library pthread (-lpthread), it will -load glibc's sem_getvalue randomly at runtime. - -Such as build python on linux x86_64 host and run the python -on linux x86_32 target. If not link library pthread, it caused -multiprocessing bounded semaphore could not work correctly. -... ->>> import multiprocessing ->>> pool_sema = multiprocessing.BoundedSemaphore(value=1) ->>> pool_sema.acquire()meta/classes/python3-dir.bbclass line 49
Quoted 10 lines
meta/classes/python3-dir.bbclass +0
-10-True ->>> pool_sema.release() -Traceback (most recent call last): - File "<stdin>", line 1, in <module> -ValueError: semaphore or lock released too many times -... - -And the semaphore issue also caused multiprocessing.Queue().put() hung. - -Upstream-Status: Submitted [https://github.com/python/cpython/pull/2999]
Quoted 6 lines
meta/classes/python3-dir.bbclass +0
-6- -Signed-off-by: Hongxu Jia <[email protected]> ---- - setup.py | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) -meta/classes/python3-dir.bbclass line 65
Quoted 10 lines
meta/classes/python3-dir.bbclass +0
-10-diff --git a/setup.py b/setup.py -index b7a36a6..658ead3 100644 ---- a/setup.py -+++ b/setup.py -@@ -1584,8 +1584,10 @@ class PyBuildExt(build_ext): - elif host_platform.startswith('netbsd'): - macros = dict() - libraries = [] -- -- else: # Linux and otherunices
meta/classes/python3-dir.bbclass line 75
Quoted 10 lines
meta/classes/python3-dir.bbclass +0
-10-+ elif host_platform.startswith(('linux')): -+ macros = dict() -+ libraries = ['pthread'] -+ else: # Other unices - macros = dict() - libraries = ['rt'] - -@@ -1603,6 +1605,7 @@ class PyBuildExt(build_ext): - - exts.append ( Extension('_multiprocessing',
multiprocessing_srcs,meta/classes/python3-dir.bbclass line 78
Quoted 3 lines
meta/classes/python3-dir.bbclass +0
-3- define_macros=list(macros.items()), -+ libraries=libraries, -include_dirs=["Modules/_multiprocessing"]))
Quoted 3 lines
meta/classes/python3-dir.bbclass +0
-2- # End multiprocessing -diff --git
a/meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patchb/meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patchQuoted 2 lines
index
c15295c034c..4bd98f62fd6100644
---
a/meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patchQuoted 1 line
+++
b/meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patchmeta/classes/python3-dir.bbclass line 4
Quoted 6 lines
meta/classes/python3-dir.bbclass +1
-1@@ -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 fordisabled
meta/classes/python3-dir.bbclass build completeness checker which relies on the
Quoted 1 line
meta/classes/python3-dir.bbclass +0
-0@@ -10,22 +10,23 @@ build completeness checker which relies on thereport.
Quoted 27 lines
meta/classes/python3-dir.bbclass +5
-4Upstream-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!")Quoted 1 line
diff --git
a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patchb/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patchQuoted 2 lines
index
d49604ba4d9..219b3551b8b100644
---
a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patchQuoted 1 line
+++
b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patchQuoted 7 lines
meta/classes/python3-dir.bbclass +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 recipesdiff --git
a/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patchb/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patchQuoted 2 lines
index
24e67b4ca14..184540e794c100644
---
a/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patchQuoted 1 line
+++
b/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patchmeta/classes/python3-dir.bbclass line 4
Quoted 6 lines
meta/classes/python3-dir.bbclass +1
-1@@ -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 isnot yet
meta/classes/python3-dir.bbclass Also simply disable the tk module since its not in
Quoted 1 line
meta/classes/python3-dir.bbclass +0
-0@@ -11,26 +11,21 @@ Also simply disable the tk module since its not inDEPENDS.
Quoted 16 lines
meta/classes/python3-dir.bbclass +4
-5Signed-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):meta/classes/python3-dir.bbclass Also simply disable the tk module since its not in · line 24
Quoted 10 lines
meta/classes/python3-dir.bbclass +8
-1+ 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 becompiled
meta/classes/python3-dir.bbclass Also simply disable the tk module since its not in · line 36
Quoted 12 lines
meta/classes/python3-dir.bbclass +0
-12-- 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"])Review
Quoted 2 lines
meta/classes/python3-dir.bbclass +1
-0+ ## # Uncomment these lines if you want to play with xxmodule.c(quoted diff) +0
-0
b/meta/recipes-devtools/python/python3/python-config.patchmeta/recipes-devtools/python/python3/python-config.patch line 6
Quoted 11 lines
index
f23b8b7df06..c8a8f3d4aa3100644meta/recipes-devtools/python/python3/python-config.patch +4
-1@@ -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
Quoted 24 lines
meta/recipes-devtools/python/python3/python-config.patch +10
-5@@ -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 sysmeta/recipes-devtools/python/python3/python-config.patch Index: Python-3.3.3/Misc/python-config.in · line 27
Quoted 4 lines
meta/recipes-devtools/python/python3/python-config.patch +0
-1@@ -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']
meta/recipes-devtools/python/python3/python-config.patch Index: Python-3.3.3/Misc/python-config.in · line 35
Quoted 2 lines
meta/recipes-devtools/python/python3/python-config.patch +1
-1-@@ -32,14 +32,14 @@ if '--help' in opt_flags: + 'ldflags', 'extension-suffix', 'help', 'abiflags','configdir',
Review
Quoted 5 lines
meta/recipes-devtools/python/python3/python-config.patch +1
-0+@@ -35,14 +35,14 @@ if '--help' in opt_flags: for opt in opt_flags: if opt == '--prefix':(quoted diff) +0
-0
b/meta/recipes-devtools/python/python3/python3-manifest.jsonReview
Quoted 15 lines
index
dba92b0e396..ebfc10b4045100644meta/recipes-devtools/python/python3/python3-manifest.json +2
-2@@ -213,8 +213,8 @@ "${bindir}/python3", "${bindir}/python${PYTHON_MAJMIN}", "${bindir}/python${PYTHON_MAJMIN}.real", - "${bindir}/python${PYTHON_BINABI}", - "${includedir}/python${PYTHON_BINABI}/pyconfig*.h", + "${bindir}/python${PYTHON_MAJMIN}", + "${includedir}/python${PYTHON_MAJMIN}/pyconfig*.h", "${prefix}/lib/python${PYTHON_MAJMIN}/config*/*[!.a]", "${libdir}/python${PYTHON_MAJMIN}/UserDict.py", "${libdir}/python${PYTHON_MAJMIN}/UserList.py",(quoted diff) +0
-0b/meta/recipes-devtools/python/python3_3.8.0.bb
meta/recipes-devtools/python/python3_3.8.0.bb SRC_URI = "
Quoted 7 lines
similarity index 91%
rename from meta/recipes-devtools/python/python3_3.7.5.bb rename to meta/recipes-devtools/python/python3_3.8.0.bb index57eaaea5e7c..1feaebea8ee100644meta/recipes-devtools/python/python3_3.8.0.bb renamed from meta/recipes-devtools/python/python3_3.7.5.bb +0
-0@@ -19,8 +19,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
Quoted 1 line
file://0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch \
Quoted 1 line
file://0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patch \
Quoted 1 line
file://0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch \
Quoted 1 line
-
file://0002-Don-t-do-runtime-test-to-get-float-byte-order.patch \
Quoted 1 line
-
file://0003-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \
Quoted 1 line
file://0001-Lib-sysconfig.py-fix-another-place-where-lib-is-hard.patch \
Quoted 1 line
file://0001-Makefile-fix-Issue36464-parallel-build-race-problem.patch \
Quoted 1 line
file://0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch \
meta/recipes-devtools/python/python3_3.8.0.bb SRC_URI_append_class-native = " \ · line 33
Quoted 2 lines
meta/recipes-devtools/python/python3_3.8.0.bb renamed from meta/recipes-devtools/python/python3_3.7.5.bb +0
-0@@ -35,20 +33,16 @@ SRC_URI_append_class-native = " \file://0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch \
meta/recipes-devtools/python/python3_3.8.0.bb SRC_URI_append_class-native = " \
Quoted 4 lines
meta/recipes-devtools/python/python3_3.8.0.bb renamed from meta/recipes-devtools/python/python3_3.7.5.bb +0
-2file://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 \
meta/recipes-devtools/python/python3_3.8.0.bb SRC_URI_append_class-native = " \
Quoted 4 lines
meta/recipes-devtools/python/python3_3.8.0.bb renamed from meta/recipes-devtools/python/python3_3.7.5.bb +0
-3- " -SRC_URI[md5sum] = "08ed8030b1183107c48f2092e79a87e2" -SRC_URI[sha256sum] ="
e85a76ea9f3d6c485ec1780fca4e500725a4a7bbc63c78ebc44170de9b619d94"meta/recipes-devtools/python/python3_3.8.0.bb SRC_URI_append_class-native = " \ · line 38
Quoted 2 lines
meta/recipes-devtools/python/python3_3.8.0.bb renamed from meta/recipes-devtools/python/python3_3.7.5.bb +2
-0+SRC_URI[md5sum] = "dbac8df9d8b9edc678d0f4cacdb7dbb0" +SRC_URI[sha256sum] ="
b356244e13fb5491da890b35b13b2118c3122977c2cd825e3eb6e7d462030d84"meta/recipes-devtools/python/python3_3.8.0.bb inherit autotools pkgconfig qemu ptest multilib_header
Quoted 13 lines
meta/recipes-devtools/python/python3_3.8.0.bb renamed from meta/recipes-devtools/python/python3_3.7.5.bb +1
-2# 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_BINABI = "${PYTHON_MAJMIN}m" +PYTHON_MAJMIN = "3.8" S = "${WORKDIR}/Python-${PV}"@@ -59,8 +53,8 @@ inherit autotools pkgconfig qemu ptest multilib_headerupdate-alternatives
meta/recipes-devtools/python/python3_3.8.0.bb inherit autotools pkgconfig qemu ptest multilib_header update-alternatives
Quoted 4 lines
meta/recipes-devtools/python/python3_3.8.0.bb renamed from meta/recipes-devtools/python/python3_3.7.5.bb +0
-1MULTILIB_SUFFIX = "${@d.getVar('base_libdir',1).split('/')[-1]}" ALTERNATIVE_${PN}-dev = "python3-config" -ALTERNATIVE_LINK_NAME[python3-config] ="${bindir}/python${PYTHON_BINABI}-config"
meta/recipes-devtools/python/python3_3.8.0.bb inherit autotools pkgconfig qemu ptest multilib_header · line 63
Quoted 1 line
meta/recipes-devtools/python/python3_3.8.0.bb renamed from meta/recipes-devtools/python/python3_3.7.5.bb +0
-1-ALTERNATIVE_TARGET[python3-config] ="${bindir}/python${PYTHON_BINABI}-config-${MULTILIB_SUFFIX}"
meta/recipes-devtools/python/python3_3.8.0.bb inherit autotools pkgconfig qemu ptest multilib_header · line 56
Quoted 1 line
meta/recipes-devtools/python/python3_3.8.0.bb renamed from meta/recipes-devtools/python/python3_3.7.5.bb +1
-0+ALTERNATIVE_LINK_NAME[python3-config] ="${bindir}/python${PYTHON_MAJMIN}-config"
meta/recipes-devtools/python/python3_3.8.0.bb inherit autotools pkgconfig qemu ptest multilib_header · line 57
Quoted 1 line
meta/recipes-devtools/python/python3_3.8.0.bb renamed from meta/recipes-devtools/python/python3_3.7.5.bb +1
-0+ALTERNATIVE_TARGET[python3-config] ="${bindir}/python${PYTHON_MAJMIN}-config-${MULTILIB_SUFFIX}"
meta/recipes-devtools/python/python3_3.8.0.bb inherit autotools pkgconfig qemu ptest multilib_header · line 58
Quoted 3 lines
meta/recipes-devtools/python/python3_3.8.0.bb renamed from meta/recipes-devtools/python/python3_3.7.5.bb +0
-0DEPENDS = "bzip2-replacement-native libffi bzip2 openssl sqlite3 zlibvirtual/libintl xz virtual/crypt util-linux libtirpc libnsl2"
Quoted 10 lines
meta/recipes-devtools/python/python3_3.8.0.bb renamed from meta/recipes-devtools/python/python3_3.7.5.bb +1
-1@@ -131,7 +125,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() {meta/recipes-devtools/python/python3_3.8.0.bb do_install_append() { · line 164
Quoted 4 lines
meta/recipes-devtools/python/python3_3.8.0.bb renamed from meta/recipes-devtools/python/python3_3.7.5.bb +0
-1@@ -161,7 +155,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'
meta/recipes-devtools/python/python3_3.8.0.bb do_install_append() { · line 158
Quoted 1 line
meta/recipes-devtools/python/python3_3.8.0.bb renamed from meta/recipes-devtools/python/python3_3.7.5.bb +1
-0+ create_wrapper ${D}${bindir}/python${PYTHON_MAJMIN}TERMINFO_DIRS='${sysconfdir}/terminfo:/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo' PYTHONNOUSERSITE='1'
meta/recipes-devtools/python/python3_3.8.0.bb py_package_preprocess () { · line 172
Quoted 6 lines
meta/recipes-devtools/python/python3_3.8.0.bb renamed from meta/recipes-devtools/python/python3_3.7.5.bb +0
-0} SSTATE_SCAN_FILES += "Makefile _sysconfigdata.py"@@ -177,7 +171,7 @@ py_package_preprocess () { -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \${PKGD}/${prefix}/lib/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}${PYTHON_ABI}*/Makefile \
Quoted 1 line
${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata*.py\meta/recipes-devtools/python/python3_3.8.0.bb py_package_preprocess () { · line 190
Quoted 7 lines
meta/recipes-devtools/python/python3_3.8.0.bb renamed from meta/recipes-devtools/python/python3_3.7.5.bb +1
-1- ${PKGD}/${bindir}/python${PYTHON_BINABI}-config + ${PKGD}/${bindir}/python${PYTHON_MAJMIN}-config # Reformat _sysconfigdata after modifying it so that it remains # reproducible@@ -196,7 +190,7 @@ py_package_preprocess () { -c "from py_compile import compile;
compile('$sysconfigfile', optimize=2)"meta/recipes-devtools/python/python3_3.8.0.bb py_package_preprocess () { · line 199
Quoted 3 lines
meta/recipes-devtools/python/python3_3.8.0.bb renamed from meta/recipes-devtools/python/python3_3.7.5.bb +0
-1cd - - mv ${PKGD}/${bindir}/python${PYTHON_BINABI}-config${PKGD}/${bindir}/python${PYTHON_BINABI}-config-${MULTILIB_SUFFIX}
meta/recipes-devtools/python/python3_3.8.0.bb py_package_preprocess () { · line 193
Quoted 1 line
meta/recipes-devtools/python/python3_3.8.0.bb renamed from meta/recipes-devtools/python/python3_3.7.5.bb +1
-0+ mv ${PKGD}/${bindir}/python${PYTHON_MAJMIN}-config${PKGD}/${bindir}/python${PYTHON_MAJMIN}-config-${MULTILIB_SUFFIX}
meta/recipes-devtools/python/python3_3.8.0.bb RPROVIDES_${PN}-venv += "python3-pyvenv" · line 325
Quoted 8 lines
meta/recipes-devtools/python/python3_3.8.0.bb renamed from meta/recipes-devtools/python/python3_3.7.5.bb +0
-1#Remove the unneeded copy of target sysconfig data rm -rf ${PKGD}/${libdir}/python-sysconfigdata@@ -322,7 +316,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"
meta/recipes-devtools/python/python3_3.8.0.bb RPROVIDES_${PN}-venv += "python3-pyvenv" · line 319
Quoted 1 line
meta/recipes-devtools/python/python3_3.8.0.bb renamed from meta/recipes-devtools/python/python3_3.7.5.bb +1
-0+FILES_libpython3-staticdev +="${prefix}/lib/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}-*/libpython${PYTHON_MAJMIN}.a"
meta/recipes-devtools/python/python3_3.8.0.bb RDEPENDS_${PN}-ptest_append_libc-glibc = "
Quoted 4 lines
meta/recipes-devtools/python/python3_3.8.0.bb renamed from meta/recipes-devtools/python/python3_3.7.5.bb +0
-0INSANE_SKIP_${PN}-dev += "dev-elf" # catch all the rest (unsorted)@@ -341,3 +335,5 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = "locale-base-tr-tr.iso-8859-9"
meta/recipes-devtools/python/python3_3.8.0.bb RDEPENDS_${PN}-ptest_append_libc-glibc = " · line 335
Quoted 1 line
meta/recipes-devtools/python/python3_3.8.0.bb renamed from meta/recipes-devtools/python/python3_3.7.5.bb +0
-0RDEPENDS_${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk','tk tk-lib', '', d)}"
Quoted 12 lines
meta/recipes-devtools/python/python3_3.8.0.bb renamed from meta/recipes-devtools/python/python3_3.7.5.bb +2
-1RDEPENDS_${PN}-dev = "" +RDEPENDS_${PN}-tests_append_class-target = " bash" +RDEPENDS_${PN}-tests_append_class-nativesdk = " bash" --2.17.1
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
PATCH 7/24 gstreamer1.0-python: add a patch to fix python 3.8 builds
In reply to Alexander Kanavin--- ...son.build-fix-builds-with-python-3.8.patch | 24 +++++++++++++++++++ .../gstreamer/gstreamer1.0-python_1.16.1.bb | 4 +++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch
meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch new file +24 -0
@@ -0,0 +1,24 @@ +From 61cfd1b49dc82baf14bb36d88b6c5be7b8c3d23a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Mon, 2 Dec 2019 18:16:41 +0100 +Subject: [PATCH] meson.build: fix builds with python 3.8 + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gst-python/merge_requests/14] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 1da81d5..3e0db38 100644 +--- a/meson.build ++++ b/meson.build +@@ -24,7 +24,7 @@ pygobject_dep = dependency('pygobject-3.0', fallback: ['pygobject', 'pygobject_d + + pymod = import('python') + python = pymod.find_installation(get_option('python')) +-python_dep = python.dependency(required : true) ++python_dep = dependency('python3-embed', required : true) + + python_abi_flags = python.get_variable('ABIFLAGS', '') + pylib_loc = get_option('libpython-dir')
meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb +3 -1
@@ -5,7 +5,9 @@ SECTION = "multimedia" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" -SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" +SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz \ + file://0001-meson.build-fix-builds-with-python-3.8.patch \ + " SRC_URI[md5sum] = "499645fbd1790c5845c02a3998dccc1b" SRC_URI[sha256sum] = "b469c8955126f41b8ce0bf689b7029f182cd305f422b3a8df35b780bd8347489"
Signature · 1 line
2.17.1
PATCH 8/24 selftest: skip virgl gtk/sdl test on opensuse 15.0
In reply to Alexander Kanavin--- meta/lib/oeqa/selftest/cases/runtime_test.py | 2 ++ 1 file changed, 2 insertions(+)
meta/lib/oeqa/selftest/cases/runtime_test.py +2 -0
@@ -181,6 +181,8 @@ class TestImage(OESelftestTestCase): self.skipTest('virgl isn\'t working with Debian 8') if distro and distro == 'centos-7': self.skipTest('virgl isn\'t working with Centos 7') + if distro and distro == 'opensuseleap-15.0': + self.skipTest('virgl isn\'t working with Opensuse 15.0') qemu_packageconfig = get_bb_var('PACKAGECONFIG', 'qemu-system-native') sdl_packageconfig = get_bb_var('PACKAGECONFIG', 'libsdl2-native')
Signature · 1 line
2.17.1
PATCH 9/24 gtk+3: update to 3.24.13
In reply to Alexander Kanavin---
...t-try-to-initialize-GL-without-libGL.patch | 15 +--
...-Add-disable-opengl-configure-option.patch | 103 ++++++++----------
.../{gtk+3_3.24.8.bb => gtk+3_3.24.13.bb} | 4 +-
3 files changed, 56 insertions(+), 66 deletions(-)
rename meta/recipes-gnome/gtk+/{gtk+3_3.24.8.bb => gtk+3_3.24.13.bb} (84%)meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch +6 -9
@@ -1,7 +1,7 @@ -From 23a563155406980dfc8cf6f7c2da6cce0ac310f0 Mon Sep 17 00:00:00 2001 +From 6575ab0f0e8c1bba033ad1616511e37a2ec995ff Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <[email protected]> Date: Fri, 16 Oct 2015 16:35:16 +0300 -Subject: [PATCH 2/4] Do not try to initialize GL without libGL +Subject: [PATCH] Do not try to initialize GL without libGL _gdk_x11_screen_update_visuals_for_gl() will end up calling epoxys GLX api which will exit() if libGL.so.1 is not present. We do not
@@ -22,10 +22,10 @@ Signed-off-by: Jussi Kukkonen <[email protected]> 2 files changed, 11 insertions(+) diff --git a/configure.ac b/configure.ac -index 757fd7c..0a48875 100644 +index e9f5583..bd651bb 100644 --- a/configure.ac +++ b/configure.ac -@@ -351,6 +351,12 @@ AC_ARG_ENABLE(cloudproviders, +@@ -346,6 +346,12 @@ AC_ARG_ENABLE(cloudproviders, [AS_HELP_STRING([--enable-cloudproviders], [enable libcloudproviders integration])], [cloudproviders_set=yes])
@@ -36,8 +36,8 @@ index 757fd7c..0a48875 100644 + AC_DEFINE([HAVE_GLX], [], [GLX will be available at runtime]) +]) - if test -z "$backend_set"; then - if test "$platform_win32" = yes; then + AC_ARG_ENABLE(profiler, + [AS_HELP_STRING([--enable-profiler], diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c index 81479d8..3c8c5c0 100644 --- a/gdk/x11/gdkvisual-x11.c
@@ -55,6 +55,3 @@ index 81479d8..3c8c5c0 100644 } gint --- -2.14.1 -
meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch +48 -55
323 lines not on this page · raw message
meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb renamed from meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb +2 -2
@@ -8,8 +8,8 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar file://0003-Add-disable-opengl-configure-option.patch \ file://link_fribidi.patch \ " -SRC_URI[md5sum] = "eeedde01856238114dcf4df3ebc942a5" -SRC_URI[sha256sum] = "666962de9b9768fe9ca785b0e2f42c8b9db3868a12fa9b356b167238d70ac799" +SRC_URI[md5sum] = "f65515e7bfa2199bd2188e871d69c686" +SRC_URI[sha256sum] = "4c775c38cf1e3c534ef0ca52ca6c7a890fe169981af66141c713e054e68930a9" S = "${WORKDIR}/gtk+-${PV}"
Signature · 1 line
2.17.1
PATCH 10/24 kbd: update to 2.2.0
In reply to Alexander KanavinRebase set-proper-path-of-resources.patch
Add a patch to address a string format error; as it modifies a .l file, add a dependency on flex which is processing that into C source code.
License-Update: file with copyright statements was replaced with original GPLv2 text
---
...-analyze.l-add-missing-string-format.patch | 24 ++++++++
.../kbd/set-proper-path-of-resources.patch | 57 ++++++++++++-------
.../kbd/{kbd_2.0.4.bb => kbd_2.2.0.bb} | 11 ++--
3 files changed, 66 insertions(+), 26 deletions(-)
create mode 100644 meta/recipes-core/kbd/kbd/0001-analyze.l-add-missing-string-format.patch
rename meta/recipes-core/kbd/{kbd_2.0.4.bb => kbd_2.2.0.bb} (86%)meta/recipes-core/kbd/kbd/0001-analyze.l-add-missing-string-format.patch new file +24 -0
@@ -0,0 +1,24 @@ +From dc6bf2ae0835c6569b270e8e1f26a3173f3927d9 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 4 Dec 2019 13:14:01 +0100 +Subject: [PATCH] analyze.l: add missing string format + +Upstream-Status: Submitted [https://github.com/legionus/kbd/pull/35] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + src/libkeymap/analyze.l | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libkeymap/analyze.l b/src/libkeymap/analyze.l +index e32ace6..de62f46 100644 +--- a/src/libkeymap/analyze.l ++++ b/src/libkeymap/analyze.l +@@ -463,7 +463,7 @@ To to|To|TO + + strerror_r(errno, buf, sizeof(buf)); + +- ERR(yyextra, buf); ++ ERR(yyextra, "%s", buf); + return(ERROR); + } +
meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch +35 -22
76 lines not on this page · raw message
meta/recipes-core/kbd/kbd_2.2.0.bb renamed from meta/recipes-core/kbd/kbd_2.0.4.bb +7 -4
@@ -2,10 +2,12 @@ SUMMARY = "Keytable files and keyboard utilities" HOMEPAGE = "http://www.kbd-project.org/" # everything minus console-fonts is GPLv2+ LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=a5fcc36121d93e1f69d96a313078c8b5" +LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" inherit autotools gettext ptest pkgconfig +DEPENDS += "flex-native" + RREPLACES_${PN} = "console-tools" RPROVIDES_${PN} = "console-tools" RCONFLICTS_${PN} = "console-tools"
@@ -13,10 +15,11 @@ RCONFLICTS_${PN} = "console-tools" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ file://run-ptest \ ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://set-proper-path-of-resources.patch', '', d)} \ - " + file://0001-analyze.l-add-missing-string-format.patch \ + " -SRC_URI[md5sum] = "c1635a5a83b63aca7f97a3eab39ebaa6" -SRC_URI[sha256sum] = "5fd90af6beb225a9bb9b9fb414c090fba53c9a55793e172f508cd43652e59a88" +SRC_URI[md5sum] = "d1d7ae0b5fb875dc082731e09cd0c8bc" +SRC_URI[sha256sum] = "21a1bc5f6fb3b18ce9fdd717e4533368060a3182a39c7155eaf7ec0f5f83e9f7" PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests','', d)} \
Signature · 1 line
2.17.1
PATCH 11/24 perl: update to 5.30.1
In reply to Alexander KanavinDrop fix-setgroup.patch as the upstream has fixed the issue.
---
.../perl/files/fix-setgroup.patch | 49 -------------------
.../perl/{perl_5.30.0.bb => perl_5.30.1.bb} | 11 ++---
2 files changed, 5 insertions(+), 55 deletions(-)
delete mode 100644 meta/recipes-devtools/perl/files/fix-setgroup.patch
rename meta/recipes-devtools/perl/{perl_5.30.0.bb => perl_5.30.1.bb} (97%)meta/recipes-devtools/perl/files/fix-setgroup.patch deleted +0 -49
@@ -1,49 +0,0 @@ -Test script to reproduce the problem: - -#!/usr/bin/env perl -$) = "2 2"; -print $!; - -Result from perl 5.28 under strace: - -setgroups(1, [2]) = 0 -setresgid(-1, 2, -1) = 0 - -Result from perl 5.30 under strace: - -setgroups(1, [-1]) = -1 EINVAL (Invalid argument) -setresgid(-1, 2, -1) = 0 - -Patch which broke this upstream: -https://perl5.git.perl.org/perl.git/commitdiff/5d4a52b5c68a11bfc97c2e24806993b84a61eade - -Issue is that the new function changes the endptr to the end of the -scanned number and needs to be reset to the end of the string for -each iteration of the loop. - -[YOCTO #13391] - -RP -2019/6/14 -Upstream-Status: Pending - -Index: perl-5.30.0/mg.c -=================================================================== ---- perl-5.30.0.orig/mg.c -+++ perl-5.30.0/mg.c -@@ -3179,6 +3256,7 @@ Perl_magic_set(pTHX_ SV *sv, MAGIC *mg) - const char *p = SvPV_const(sv, len); - Groups_t *gary = NULL; - const char* endptr = p + len; -+ const char* realend = p + len; - UV uv; - #ifdef _SC_NGROUPS_MAX - int maxgrp = sysconf(_SC_NGROUPS_MAX); -@@ -3209,6 +3287,7 @@ Perl_magic_set(pTHX_ SV *sv, MAGIC *mg) - Newx(gary, i + 1, Groups_t); - else - Renew(gary, i + 1, Groups_t); -+ endptr = realend; - if (grok_atoUV(p, &uv, &endptr)) - gary[i] = (Groups_t)uv; - else {
meta/recipes-devtools/perl/perl_5.30.1.bb renamed from meta/recipes-devtools/perl/perl_5.30.0.bb +5 -6
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ - https://github.com/arsv/perl-cross/releases/download/1.3/perl-cross-1.3.tar.gz;name=perl-cross \ + https://github.com/arsv/perl-cross/releases/download/1.3.1/perl-cross-1.3.1.tar.gz;name=perl-cross \ file://perl-rdepends.txt \ file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \ file://0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch \
@@ -18,7 +18,6 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch \ file://perl-dynloader.patch \ file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \ - file://fix-setgroup.patch \ file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ file://0002-Constant-Fix-up-shebang.patch \ "
@@ -26,10 +25,10 @@ SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ " -SRC_URI[perl.md5sum] = "9770584cdf9b5631c38097645ce33549" -SRC_URI[perl.sha256sum] = "851213c754d98ccff042caa40ba7a796b2cee88c5325f121be5cbb61bbf975f2" -SRC_URI[perl-cross.md5sum] = "4dda3daf9c4fe42b3d6a5dd052852a48" -SRC_URI[perl-cross.sha256sum] = "49edea1ea2cd6c5c47386ca71beda8d150c748835781354dbe7f75b1df27e703" +SRC_URI[perl.md5sum] = "6438eb7b8db9bbde28e01086de376a46" +SRC_URI[perl.sha256sum] = "bf3d25571ff1ee94186177c2cdef87867fd6a14aa5a84f0b1fb7bf798f42f964" +SRC_URI[perl-cross.md5sum] = "1e463b105cfa56d251a86979af23e3a7" +SRC_URI[perl-cross.sha256sum] = "edce0b0c2f725e2db3f203d6d8e9f3f7161256f5d1590551e40694f21200141d" S = "${WORKDIR}/perl-${PV}"
Signature · 1 line
2.17.1
Re: [PATCH 11/24] perl: update to 5.30.1
Quoted 11 lines · Alexander Kanavin
Drop fix-setgroup.patch as the upstream has fixed the issue.
Signed-off-by Alexander Kanavin <[email protected]>--- .../perl/files/fix-setgroup.patch | 49 --------------- ---- .../perl/{perl_5.30.0.bb => perl_5.30.1.bb} | 11 ++--- 2 files changed, 5 insertions(+), 55 deletions(-) delete mode 100644 meta/recipes-devtools/perl/files/fix- setgroup.patch rename meta/recipes-devtools/perl/{perl_5.30.0.bb => perl_5.30.1.bb}
Quoted 1 line
(97%)
I think a build race sneaked in with this upgrade:
https://autobuilder.yoctoproject.org/typhoon/#/builders/103/builds/240
/usr/share/man/man3/TAP::Parser::SourceHandler::Executable.3 /usr/sinstallman: Can't open cpan/podlators/blib/script/pod2text: No such file or directory
ABORTED
hare/man/man3/TAP::Parser::SourceHandler::File.3
/usr/share/man/man3/TAP::Parser::SourceHandler::Handle.3
Cheers,
Richard
Re: [PATCH 11/24] perl: update to 5.30.1
Quoted 16 lines · Richard Purdie
Quoted 11 lines · Alexander Kanavin
Drop fix-setgroup.patch as the upstream has fixed the issue.
Signed-off-by Alexander Kanavin <[email protected]>--- .../perl/files/fix-setgroup.patch | 49 --------------- ---- .../perl/{perl_5.30.0.bb => perl_5.30.1.bb} | 11 ++--- 2 files changed, 5 insertions(+), 55 deletions(-) delete mode 100644 meta/recipes-devtools/perl/files/fix- setgroup.patch rename meta/recipes-devtools/perl/{perl_5.30.0.bb => perl_5.30.1.bb}Quoted 1 line
(97%)
I think a build race sneaked in with this upgrade:
Quoted 9 lines
https://autobuilder.yoctoproject.org/typhoon/#/builders/103/builds/240
/usr/share/man/man3/TAP::Parser::SourceHandler::Executable.3
/usr/sinstallman: Can't open cpan/podlators/blib/script/pod2text: No
such file or directory
ABORTED
hare/man/man3/TAP::Parser::SourceHandler::File.3
/usr/share/man/man3/TAP::Parser::SourceHandler::Handle.3
This is an existing issue that happens very rarely:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=13244
Any chance you might be able to obtain log.do_compile from the failed build?
Alex
PATCH 12/24 bluez: update 5.50 -> 5.52
In reply to Alexander KanavinDrop a big pile of backports.
Disable zsh completions, as they're unlikely to be useful.
---
meta/recipes-connectivity/bluez5/bluez5.inc | 22 +-
...d-without-systemd-in-the-user-sessio.patch | 12 +-
...kefile.am-Fix-a-race-issue-for-tools.patch | 30 --
...x-build-after-y2038-changes-in-glibc.patch | 68 ---
...1-tools-btpclient.c-include-signal.h.patch | 30 --
.../bluez5/bluez5/CVE-2018-10910.patch | 505 ------------------
.../bluez5/bluez5/gcc9-fixes.patch | 301 -----------
.../bluez5/bluez5/out-of-tree.patch | 26 -
.../bluez5/{bluez5_5.50.bb => bluez5_5.52.bb} | 4 +-
9 files changed, 16 insertions(+), 982 deletions(-)
delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/0001-Makefile.am-Fix-a-race-issue-for-tools.patch
delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch
delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/0001-tools-btpclient.c-include-signal.h.patch
delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/CVE-2018-10910.patch
delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/gcc9-fixes.patch
delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/out-of-tree.patch
rename meta/recipes-connectivity/bluez5/{bluez5_5.50.bb => bluez5_5.52.bb} (91%)meta/recipes-connectivity/bluez5/bluez5.inc +8 -14
@@ -46,20 +46,13 @@ PACKAGECONFIG[mesh] = "--enable-mesh,--disable-mesh, json-c ell" PACKAGECONFIG[btpclient] = "--enable-btpclient,--disable-btpclient, ell" PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev" -SRC_URI = "\ - ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ - file://out-of-tree.patch \ - file://init \ - file://run-ptest \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \ - file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ - file://0001-test-gatt-Fix-hung-issue.patch \ - file://0001-Makefile.am-Fix-a-race-issue-for-tools.patch \ - file://CVE-2018-10910.patch \ - file://gcc9-fixes.patch \ - file://0001-tools-Fix-build-after-y2038-changes-in-glibc.patch \ - file://0001-tools-btpclient.c-include-signal.h.patch \ -" +SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ + file://init \ + file://run-ptest \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \ + file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ + file://0001-test-gatt-Fix-hung-issue.patch \ + " S = "${WORKDIR}/bluez-${PV}" CVE_PRODUCT = "bluez"
@@ -70,6 +63,7 @@ EXTRA_OECONF = "\ --enable-test \ --enable-datafiles \ --enable-library \ + --without-zsh-completion-dir \ " # bluez5 builds a large number of useful utilities but does not
meta/recipes-connectivity/bluez5/bluez5/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch +6 -6
@@ -1,4 +1,4 @@ -From 99ccdbe155028c4c789803a429072675b87d0c3a Mon Sep 17 00:00:00 2001 +From f74eb97c9fb3c0ee2895742e773ac6a3c41c999c Mon Sep 17 00:00:00 2001 From: Giovanni Campagna <[email protected]> Date: Sat, 12 Oct 2013 17:45:25 +0200 Subject: [PATCH] Allow using obexd without systemd in the user session
@@ -17,22 +17,22 @@ http://thread.gmane.org/gmane.linux.bluez.kernel/38725/focus=38843 Signed-off-by: Javier Viguera <[email protected]> --- - Makefile.obexd | 4 ++-- - obexd/src/{org.bluez.obex.service => org.bluez.obex.service.in} | 2 +- + Makefile.obexd | 4 ++-- + .../src/{org.bluez.obex.service => org.bluez.obex.service.in} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename obexd/src/{org.bluez.obex.service => org.bluez.obex.service.in} (76%) diff --git a/Makefile.obexd b/Makefile.obexd -index c462692..0325f66 100644 +index de59d29..73004a3 100644 --- a/Makefile.obexd +++ b/Makefile.obexd @@ -1,12 +1,12 @@ if SYSTEMD - systemduserunitdir = @SYSTEMD_USERUNITDIR@ + systemduserunitdir = $(SYSTEMD_USERUNITDIR) systemduserunit_DATA = obexd/src/obex.service +endif - dbussessionbusdir = @DBUS_SESSIONBUSDIR@ + dbussessionbusdir = $(DBUS_SESSIONBUSDIR) dbussessionbus_DATA = obexd/src/org.bluez.obex.service -endif
meta/recipes-connectivity/bluez5/bluez5/0001-Makefile.am-Fix-a-race-issue-for-tools.patch deleted +0 -30
@@ -1,30 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <[email protected]> - -From 117c41242c01e057295aed80ed973c6dc7e35fe2 Mon Sep 17 00:00:00 2001 -From: Ross Burton <[email protected]> -Date: Tue, 8 Oct 2019 11:01:56 +0100 -Subject: [PATCH BlueZ] Makefile.am: add missing mkdir in rules generation - -In parallel out-of-tree builds it's possible that tools/*.rules are -generated before the target directory has been implicitly created. Solve this by -creating the directory before writing into it. ---- - Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Makefile.am b/Makefile.am -index 2ac28b23d..e7bcd2366 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -589,6 +589,7 @@ src/builtin.h: src/genbuiltin $(builtin_sources) - $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@ - - tools/%.rules: -+ $(AM_V_at)$(MKDIR_P) tools - $(AM_V_GEN)cp $(srcdir)/$(subst 97-,,$@) $@ - - $(lib_libbluetooth_la_OBJECTS): $(local_headers) --- -2.20.1 -
meta/recipes-connectivity/bluez5/bluez5/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch deleted +0 -68
68 lines not on this page · raw message
meta/recipes-connectivity/bluez5/bluez5/0001-tools-btpclient.c-include-signal.h.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From 0b1766514f6847c7367fce07f19a750ec74c11a6 Mon Sep 17 00:00:00 2001 -From: Robert Yang <[email protected]> -Date: Thu, 26 Sep 2019 16:19:34 +0800 -Subject: [PATCH] tools/btpclient.c: include signal.h - -Fix compile failure when configure --enable-btpclient: -btpclient.c:2834:7: error: 'SIGINT' undeclared (first use in this function) - -Upstream-Status: Backport [A subset of the full fix that went upstream] - -Signed-off-by: Robert Yang <[email protected]> ---- - tools/btpclient.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/btpclient.c b/tools/btpclient.c -index b217df5..aece7fe 100644 ---- a/tools/btpclient.c -+++ b/tools/btpclient.c -@@ -29,6 +29,7 @@ - #include <stdlib.h> - #include <assert.h> - #include <getopt.h> -+#include <signal.h> - - #include <ell/ell.h> - --- -2.7.4 -
meta/recipes-connectivity/bluez5/bluez5/CVE-2018-10910.patch deleted +0 -505
505 lines not on this page · raw message
meta/recipes-connectivity/bluez5/bluez5/gcc9-fixes.patch deleted +0 -301
301 lines not on this page · raw message
meta/recipes-connectivity/bluez5/bluez5/out-of-tree.patch deleted +0 -26
@@ -1,26 +0,0 @@ -From ed55b49a226ca3909f52416be2ae5ce1c5ca2cb2 Mon Sep 17 00:00:00 2001 -From: Ross Burton <[email protected]> -Date: Fri, 22 Apr 2016 15:40:37 +0100 -Subject: [PATCH] Makefile.obexd: add missing mkdir in builtin.h generation - -In parallel out-of-tree builds it's possible that obexd/src/builtin.h is -generated before the target directory has been implicitly created. Solve this by -creating the directory before writing into it. - -Upstream-Status: Backport -Signed-off-by: Ross Burton <[email protected]> ---- - Makefile.obexd | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Makefile.obexd b/Makefile.obexd -index 2e33cbc..c8286f0 100644 ---- a/Makefile.obexd -+++ b/Makefile.obexd -@@ -105,2 +105,3 @@ obexd/src/plugin.$(OBJEXT): obexd/src/builtin.h - obexd/src/builtin.h: obexd/src/genbuiltin $(obexd_builtin_sources) -+ $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)$(srcdir)/obexd/src/genbuiltin $(obexd_builtin_modules) > $@ --- -2.8.0.rc3 -
meta/recipes-connectivity/bluez5/bluez5_5.52.bb renamed from meta/recipes-connectivity/bluez5/bluez5_5.50.bb +2 -2
@@ -1,7 +1,7 @@ require bluez5.inc -SRC_URI[md5sum] = "8e35c67c81a55d3ad4c9f22280dae178" -SRC_URI[sha256sum] = "5ffcaae18bbb6155f1591be8c24898dc12f062075a40b538b745bfd477481911" +SRC_URI[md5sum] = "a33eb9aadf1dd4153420958709d3ce60" +SRC_URI[sha256sum] = "f7144ce2039202cfac18ccb52426efea11c98e4f6e1bb8041bcb994b8378560a" # noinst programs in Makefile.tools that are conditional on READLINE # support
Signature · 1 line
2.17.1
PATCH 13/24 libsoup-2.4: update to 2.68.3
In reply to Alexander KanavinDrop backported patch.
tls-check merely checks at configure time whether glib-networking has tls support enabled (by running a target executable which doesn't work for us); it does not affect the actual build.
---
...no-introspection-when-cross-building.patch | 28 -------------------
...up-2.4_2.66.4.bb => libsoup-2.4_2.68.3.bb} | 15 +++++-----
2 files changed, 8 insertions(+), 35 deletions(-)
delete mode 100644 meta/recipes-support/libsoup/libsoup-2.4/0001-Do-not-enforce-no-introspection-when-cross-building.patch
rename meta/recipes-support/libsoup/{libsoup-2.4_2.66.4.bb => libsoup-2.4_2.68.3.bb} (78%)meta/recipes-support/libsoup/libsoup-2.4/0001-Do-not-enforce-no-introspection-when-cross-building.patch deleted +0 -28
@@ -1,28 +0,0 @@ -From 85f7b74fc602214297928afe09347c31d696173d Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Fri, 15 Feb 2019 14:21:06 +0100 -Subject: [PATCH] Do not enforce no-introspection when cross-building - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/commit/7ef5ec60c33e254bcd915936bea3f04ba0fe2273] -Signed-off-by: Alexander Kanavin <[email protected]> -Signed-off-by: Alistair Francis <[email protected]> ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 25887f9..6261a7c 100644 ---- a/meson.build -+++ b/meson.build -@@ -281,7 +281,7 @@ enable_gnome = get_option('gnome') and host_machine.system() != 'windows' - # FIXME: once we start to require meson 0.49.0+ and gnome-introspection 1.58.1+ - # the we can enable the introspection even for the static build. See - # https://github.com/mesonbuild/meson/pull/4478. --enable_introspection = get_option('introspection') and find_program('g-ir-scanner', required: false).found() and not meson.is_cross_build() and not is_static_library -+enable_introspection = get_option('introspection') and find_program('g-ir-scanner', required: false).found() and not is_static_library - - ############ - # Vala API # --- -2.20.1 -
meta/recipes-support/libsoup/libsoup-2.4_2.68.3.bb renamed from meta/recipes-support/libsoup/libsoup-2.4_2.66.4.bb +8 -7
@@ -9,11 +9,9 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 intltool-native libpsl" SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" -SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \ - file://0001-Do-not-enforce-no-introspection-when-cross-building.patch \ - " -SRC_URI[md5sum] = "42016d80ecae4cf8eb416631049a273a" -SRC_URI[sha256sum] = "8308984f1eee1c4f8c113a9c1763b2b22d981bd811b0cc82a9f3f1aa63228779" +SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" +SRC_URI[md5sum] = "29ee2ee7017945b64ede063b1396011c" +SRC_URI[sha256sum] = "534bb08e35b0ff3702f3adfde87d3441e27c12f9f5ec351f056fe04cba02bafb" CVE_PRODUCT = "libsoup"
@@ -21,12 +19,15 @@ S = "${WORKDIR}/libsoup-${PV}" inherit meson gettext pkgconfig upstream-version-is-even gobject-introspection gtk-doc +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' + # libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards. Disable by default. PACKAGECONFIG ??= "" PACKAGECONFIG[gnome] = "-Dgnome=true,-Dgnome=false" -PACKAGECONFIG[gssapi] = "-Dgssapi=true,-Dgssapi=false,krb5" +PACKAGECONFIG[gssapi] = "-Dgssapi=enabled,-Dgssapi=disabled,krb5" -EXTRA_OEMESON_append = " -Dvapi=false" +EXTRA_OEMESON_append = " -Dvapi=disabled -Dtls_check=false" GTKDOC_MESON_OPTION = "gtk_doc"
Signature · 1 line
2.17.1
PATCH 14/24 shadow: update 4.6 -> 4.8
In reply to Alexander KanavinDrop two backports.
Refactor 0001-useradd.c-create-parent-directories-when-necessary.patch to make the changes less invasive (and easier to rebase).
Rebase the rest of the paches.
Add a patch to remove the check for validity of login shells which does not work in our environment.
---
...01-Disable-use-of-syslog-for-sysroot.patch | 18 ++-
...eck-for-validity-of-shell-executable.patch | 29 +++++
...chg-shadow-field-reproducible-re.-71.patch | 89 --------------
...ure.ac-fix-configure-error-with-dash.patch | 36 ------
...te-parent-directories-when-necessary.patch | 116 ------------------
...-for-setting-password-in-clear-text.patch} | 101 +++++++--------
...te-parent-directories-when-necessary.patch | 63 ++++++++++
...nexpected-open-failure-in-chroot-env.patch | 15 ++-
.../files/shadow-relaxed-usernames.patch | 51 +++++---
meta/recipes-extended/shadow/shadow.inc | 11 +-
.../shadow/{shadow_4.6.bb => shadow_4.8.bb} | 0
11 files changed, 196 insertions(+), 333 deletions(-)
create mode 100644 meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch
delete mode 100644 meta/recipes-extended/shadow/files/0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patch
delete mode 100644 meta/recipes-extended/shadow/files/0001-configure.ac-fix-configure-error-with-dash.patch
delete mode 100644 meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch
rename meta/recipes-extended/shadow/files/{allow-for-setting-password-in-clear-text.patch => 0002-Allow-for-setting-password-in-clear-text.patch} (81%)
create mode 100644 meta/recipes-extended/shadow/files/0004-useradd.c-create-parent-directories-when-necessary.patch
rename meta/recipes-extended/shadow/{shadow_4.6.bb => shadow_4.8.bb} (100%)meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch +8 -10
@@ -1,4 +1,4 @@ -From 8cf3454d567f77233023be49a39a33e9f0836f89 Mon Sep 17 00:00:00 2001 +From fa2d9453656641002802d8165e80adb9e6a729d2 Mon Sep 17 00:00:00 2001 From: Scott Garman <[email protected]> Date: Thu, 14 Apr 2016 12:28:57 +0200 Subject: [PATCH] Disable use of syslog for sysroot
@@ -12,6 +12,7 @@ Upstream-Status: Inappropriate [disable feature] Signed-off-by: Scott Garman <[email protected]> Signed-off-by: Peter Kjellerstedt <[email protected]> Signed-off-by: Chen Qi <[email protected]> + --- src/groupadd.c | 3 +++ src/groupdel.c | 3 +++
@@ -23,7 +24,7 @@ Signed-off-by: Chen Qi <[email protected]> 7 files changed, 21 insertions(+) diff --git a/src/groupadd.c b/src/groupadd.c -index 63e1c48..a596c49 100644 +index 2dd8eec..e9c4bb7 100644 --- a/src/groupadd.c +++ b/src/groupadd.c @@ -34,6 +34,9 @@
@@ -37,7 +38,7 @@ index 63e1c48..a596c49 100644 #include <fcntl.h> #include <getopt.h> diff --git a/src/groupdel.c b/src/groupdel.c -index 70bed01..ababd81 100644 +index f941a84..5a70056 100644 --- a/src/groupdel.c +++ b/src/groupdel.c @@ -34,6 +34,9 @@
@@ -65,7 +66,7 @@ index fc91c8b..2842514 100644 #include <getopt.h> #include <grp.h> diff --git a/src/groupmod.c b/src/groupmod.c -index 72daf2c..8965f9d 100644 +index 1dca5fc..bc14438 100644 --- a/src/groupmod.c +++ b/src/groupmod.c @@ -34,6 +34,9 @@
@@ -79,7 +80,7 @@ index 72daf2c..8965f9d 100644 #include <fcntl.h> #include <getopt.h> diff --git a/src/useradd.c b/src/useradd.c -index 3aaf45c..1ab9174 100644 +index 4af0f7c..1b7bf06 100644 --- a/src/useradd.c +++ b/src/useradd.c @@ -34,6 +34,9 @@
@@ -93,7 +94,7 @@ index 3aaf45c..1ab9174 100644 #include <ctype.h> #include <errno.h> diff --git a/src/userdel.c b/src/userdel.c -index c8de1d3..24d3ea9 100644 +index cc951e5..153e0be 100644 --- a/src/userdel.c +++ b/src/userdel.c @@ -34,6 +34,9 @@
@@ -107,7 +108,7 @@ index c8de1d3..24d3ea9 100644 #include <errno.h> #include <fcntl.h> diff --git a/src/usermod.c b/src/usermod.c -index ccfbb99..24fb60d 100644 +index 05b9871..21c6da9 100644 --- a/src/usermod.c +++ b/src/usermod.c @@ -34,6 +34,9 @@
@@ -120,6 +121,3 @@ index ccfbb99..24fb60d 100644 #include <assert.h> #include <ctype.h> #include <errno.h> --- -2.11.0 -
meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 0d0aded7307a9f4ee0d299951512acd18b3e029e Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 4 Dec 2019 19:28:48 +0100 +Subject: [PATCH] Do not check for validity of shell executable. + +This kind of check fails when building a rootfs. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + src/useradd.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/src/useradd.c b/src/useradd.c +index 4af0f7c..898fe02 100644 +--- a/src/useradd.c ++++ b/src/useradd.c +@@ -1328,10 +1328,7 @@ static void process_flags (int argc, char **argv) + if ( ( !VALID (optarg) ) + || ( ('\0' != optarg[0]) + && ('/' != optarg[0]) +- && ('*' != optarg[0]) ) +- || (stat(optarg, &st) != 0) +- || (S_ISDIR(st.st_mode)) +- || (access(optarg, X_OK) != 0)) { ++ && ('*' != optarg[0]) )) { + fprintf (stderr, + _("%s: invalid shell '%s'\n"), + Prog, optarg);
meta/recipes-extended/shadow/files/0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patch deleted +0 -89
89 lines not on this page · raw message
meta/recipes-extended/shadow/files/0001-configure.ac-fix-configure-error-with-dash.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From 3c52a84ff8775590e7e9da9c0d4408c23494305e Mon Sep 17 00:00:00 2001 -From: Yi Zhao <[email protected]> -Date: Mon, 17 Jun 2019 15:36:34 +0800 -Subject: [PATCH] configure.ac: fix configure error with dash - -A configure error occurs when /bin/sh -> dash: - checking for is_selinux_enabled in -lselinux... yes - checking for semanage_connect in -lsemanage... yes - configure: 16322: test: yesyes: unexpected operator - -Use "=" instead of "==" since dash doesn't support this operator. - -Upstream-Status: Backport -[https://github.com/shadow-maint/shadow/commit/3c52a84ff8775590e7e9da9c0d4408c23494305e] - -Signed-off-by: Yi Zhao <[email protected]> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 6762556..1907afb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -500,7 +500,7 @@ if test "$with_selinux" != "no"; then - AC_MSG_ERROR([libsemanage not found]) - fi - -- if test "$selinux_lib$semanage_lib" == "yesyes" ; then -+ if test "$selinux_lib$semanage_lib" = "yesyes" ; then - AC_DEFINE(WITH_SELINUX, 1, - [Build shadow with SELinux support]) - LIBSELINUX="-lselinux" --- -2.7.4 -
meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch deleted +0 -116
116 lines not on this page · raw message
meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch renamed from meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch +51 -50
234 lines not on this page · raw message
meta/recipes-extended/shadow/files/0004-useradd.c-create-parent-directories-when-necessary.patch new file +63 -0
63 lines not on this page · raw message
meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch +9 -6
@@ -1,3 +1,8 @@ +From 66533c7c6f347d257020675a1ed6e0c59cbbc3f0 Mon Sep 17 00:00:00 2001 +From: Chen Qi <[email protected]> +Date: Thu, 17 Jul 2014 15:53:34 +0800 +Subject: [PATCH] commonio.c-fix-unexpected-open-failure-in-chroot-env + Upstream-Status: Inappropriate [OE specific] commonio.c: fix unexpected open failure in chroot environment
@@ -10,15 +15,16 @@ Note that this patch doesn't change the logic in the code, it just expands the codes. Signed-off-by: Chen Qi <[email protected]> + --- - lib/commonio.c | 16 ++++++++++++---- + lib/commonio.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/commonio.c b/lib/commonio.c -index cc536bf..51cafd9 100644 +index 16fa7e7..d6bc297 100644 --- a/lib/commonio.c +++ b/lib/commonio.c -@@ -613,10 +613,18 @@ int commonio_open (struct commonio_db *db, int mode) +@@ -632,10 +632,18 @@ int commonio_open (struct commonio_db *db, int mode) db->cursor = NULL; db->changed = false;
@@ -41,6 +47,3 @@ index cc536bf..51cafd9 100644 db->fp = NULL; if (fd >= 0) { #ifdef WITH_TCB --- -1.7.9.5 -
meta/recipes-extended/shadow/files/shadow-relaxed-usernames.patch +31 -20
101 lines not on this page · raw message
meta/recipes-extended/shadow/shadow.inc +5 -6
@@ -11,8 +11,6 @@ DEPENDS = "virtual/crypt" UPSTREAM_CHECK_URI = "https://github.com/shadow-maint/shadow/releases" SRC_URI = "https://github.com/shadow-maint/shadow/releases/download/${PV}/${BP}.tar.gz \ file://shadow-4.1.3-dots-in-usernames.patch \ - file://0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patch \ - file://0001-configure.ac-fix-configure-error-with-dash.patch \ ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ file://shadow-relaxed-usernames.patch \ "
@@ -24,16 +22,17 @@ SRC_URI_append_class-target = " \ SRC_URI_append_class-native = " \ file://0001-Disable-use-of-syslog-for-sysroot.patch \ - file://allow-for-setting-password-in-clear-text.patch \ + file://0002-Allow-for-setting-password-in-clear-text.patch \ file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ - file://0001-useradd.c-create-parent-directories-when-necessary.patch \ + file://0004-useradd.c-create-parent-directories-when-necessary.patch \ + file://0001-Do-not-check-for-validity-of-shell-executable.patch \ " SRC_URI_append_class-nativesdk = " \ file://0001-Disable-use-of-syslog-for-sysroot.patch \ " -SRC_URI[md5sum] = "36feb15665338ae3de414f2a88e434db" -SRC_URI[sha256sum] = "4668f99bd087399c4a586084dc3b046b75f560720d83e92fd23bf7a89dda4d31" +SRC_URI[md5sum] = "017ac773ba370bc28e157cee30dad71a" +SRC_URI[sha256sum] = "82016d65317555fc8ce9e669eb187984d8d4b1f8ecda0769f4bc5412aed326e4" # Additional Policy files for PAM PAM_SRC_URI = "file://pam.d/chfn \
meta/recipes-extended/shadow/shadow_4.8.bb renamed from meta/recipes-extended/shadow/shadow_4.6.bb +0 -0
Signature · 1 line
2.17.1
Re: [PATCH 14/24] shadow: update 4.6 -> 4.8
Quoted 6 lines · Alexander Kanavin
Drop two backports.
Refactor 0001-useradd.c-create-parent-directories-when-necessary.patch to make the changes less invasive (and easier to rebase).
Is that change even needed any more?
https://github.com/shadow-maint/shadow/commit/b3b6d9d77c1d18b98670b97157777bb74092cd69
Looks like it ought to be doing the same thing.
Quoted 924 lines
Rebase the rest of the paches.
Add a patch to remove the check for validity of login shells which does not work in our environment.
Signed-off-by Alexander Kanavin <[email protected]>--- ...01-Disable-use-of-syslog-for-sysroot.patch | 18 ++- ...eck-for-validity-of-shell-executable.patch | 29 +++++ ...chg-shadow-field-reproducible-re.-71.patch | 89 -------------- ...ure.ac-fix-configure-error-with-dash.patch | 36 ------ ...te-parent-directories-when-necessary.patch | 116 ------------------ ...-for-setting-password-in-clear-text.patch} | 101 +++++++-------- ...te-parent-directories-when-necessary.patch | 63 ++++++++++ ...nexpected-open-failure-in-chroot-env.patch | 15 ++- .../files/shadow-relaxed-usernames.patch | 51 +++++--- meta/recipes-extended/shadow/shadow.inc | 11 +- .../shadow/{shadow_4.6.bb => shadow_4.8.bb} | 0 11 files changed, 196 insertions(+), 333 deletions(-) create mode 100644 meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch delete mode 100644 meta/recipes-extended/shadow/files/0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patch delete mode 100644 meta/recipes-extended/shadow/files/0001-configure.ac-fix-configure-error-with-dash.patch delete mode 100644 meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch rename meta/recipes-extended/shadow/files/{allow-for-setting-password-in-clear-text.patch => 0002-Allow-for-setting-password-in-clear-text.patch} (81%) create mode 100644 meta/recipes-extended/shadow/files/0004-useradd.c-create-parent-directories-when-necessary.patch rename meta/recipes-extended/shadow/{shadow_4.6.bb => shadow_4.8.bb} (100%)meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch +8
-10@@ -1,4 +1,4 @@ -From 8cf3454d567f77233023be49a39a33e9f0836f89 Mon Sep 17 00:00:00 2001 +From fa2d9453656641002802d8165e80adb9e6a729d2 Mon Sep 17 00:00:00 2001 From: Scott Garman <[email protected]> Date: Thu, 14 Apr 2016 12:28:57 +0200 Subject: [PATCH] Disable use of syslog for sysroot@@ -12,6 +12,7 @@ Upstream-Status: Inappropriate [disable feature] Signed-off-by: Scott Garman <[email protected]> Signed-off-by: Peter Kjellerstedt <[email protected]> Signed-off-by: Chen Qi <[email protected]> + --- src/groupadd.c | 3 +++ src/groupdel.c | 3 +++@@ -23,7 +24,7 @@ Signed-off-by: Chen Qi <[email protected]> 7 files changed, 21 insertions(+) diff --git a/src/groupadd.c b/src/groupadd.c -index 63e1c48..a596c49 100644 +index 2dd8eec..e9c4bb7 100644 --- a/src/groupadd.c +++ b/src/groupadd.c @@ -34,6 +34,9 @@@@ -37,7 +38,7 @@ index 63e1c48..a596c49 100644 #include <fcntl.h> #include <getopt.h> diff --git a/src/groupdel.c b/src/groupdel.c -index 70bed01..ababd81 100644 +index f941a84..5a70056 100644 --- a/src/groupdel.c +++ b/src/groupdel.c @@ -34,6 +34,9 @@@@ -65,7 +66,7 @@ index fc91c8b..2842514 100644 #include <getopt.h> #include <grp.h> diff --git a/src/groupmod.c b/src/groupmod.c -index 72daf2c..8965f9d 100644 +index 1dca5fc..bc14438 100644 --- a/src/groupmod.c +++ b/src/groupmod.c @@ -34,6 +34,9 @@@@ -79,7 +80,7 @@ index 72daf2c..8965f9d 100644 #include <fcntl.h> #include <getopt.h> diff --git a/src/useradd.c b/src/useradd.c -index 3aaf45c..1ab9174 100644 +index 4af0f7c..1b7bf06 100644 --- a/src/useradd.c +++ b/src/useradd.c @@ -34,6 +34,9 @@@@ -93,7 +94,7 @@ index 3aaf45c..1ab9174 100644 #include <ctype.h> #include <errno.h> diff --git a/src/userdel.c b/src/userdel.c -index c8de1d3..24d3ea9 100644 +index cc951e5..153e0be 100644 --- a/src/userdel.c +++ b/src/userdel.c @@ -34,6 +34,9 @@@@ -107,7 +108,7 @@ index c8de1d3..24d3ea9 100644 #include <errno.h> #include <fcntl.h> diff --git a/src/usermod.c b/src/usermod.c -index ccfbb99..24fb60d 100644 +index 05b9871..21c6da9 100644 --- a/src/usermod.c +++ b/src/usermod.c @@ -34,6 +34,9 @@@@ -120,6 +121,3 @@ index ccfbb99..24fb60d 100644 #include <assert.h> #include <ctype.h> #include <errno.h> --- -2.11.0 -meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch new file +29
-0@@ -0,0 +1,29 @@ +From 0d0aded7307a9f4ee0d299951512acd18b3e029e Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 4 Dec 2019 19:28:48 +0100 +Subject: [PATCH] Do not check for validity of shell executable. + +This kind of check fails when building a rootfs. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + src/useradd.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/src/useradd.c b/src/useradd.c +index 4af0f7c..898fe02 100644 +--- a/src/useradd.c ++++ b/src/useradd.c +@@ -1328,10 +1328,7 @@ static void process_flags (int argc, char **argv) + if ( ( !VALID (optarg) ) + || ( ('\0' != optarg[0]) + && ('/' != optarg[0]) +- && ('*' != optarg[0]) ) +- || (stat(optarg, &st) != 0) +- || (S_ISDIR(st.st_mode)) +- || (access(optarg, X_OK) != 0)) { ++ && ('*' != optarg[0]) )) { + fprintf (stderr, + _("%s: invalid shell '%s'\n"), + Prog, optarg);meta/recipes-extended/shadow/files/0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patch deleted +0
-89@@ -1,89 +0,0 @@ -From fe34a2a0e44bc80ff213bfd185046a5f10c94997 Mon Sep 17 00:00:00 2001 -From: Chris Lamb <[email protected]> -Date: Wed, 2 Jan 2019 18:06:16 +0000 -Subject: [PATCH 1/2] Make the sp_lstchg shadow field reproducible (re. #71) - -From <https://github.com/shadow-maint/shadow/pull/71>: - -``` -The third field in the /etc/shadow file (sp_lstchg) contains the date of -the last password change expressed as the number of days since Jan 1, 1970. -As this is a relative time, creating a user today will result in: - -username:17238:0:99999:7::: -whilst creating the same user tomorrow will result in: - -username:17239:0:99999:7::: -This has an impact for the Reproducible Builds[0] project where we aim to -be independent of as many elements the build environment as possible, -including the current date. - -This patch changes the behaviour to use the SOURCE_DATE_EPOCH[1] -environment variable (instead of Jan 1, 1970) if valid. -``` - -This updated PR adds some missing calls to gettime (). This was originally -filed by Johannes Schauer in Debian as #917773 [2]. - -[0] https://reproducible-builds.org/ -[1] https://reproducible-builds.org/specs/source-date-epoch/ -[2] https://bugs.debian.org/917773 - -Upstream-Status: Backport -Signed-off-by: Alex Kiernan <[email protected]> ---- - libmisc/pwd2spwd.c | 3 +-- - src/pwck.c | 2 +- - src/pwconv.c | 2 +- - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/libmisc/pwd2spwd.c b/libmisc/pwd2spwd.c -index c1b9b29ac873..6799dd50d490 100644 ---- a/libmisc/pwd2spwd.c -+++ b/libmisc/pwd2spwd.c -@@ -40,7 +40,6 @@ - #include "prototypes.h" - #include "defines.h" - #include <pwd.h> --extern time_t time (time_t *); - - /* - * pwd_to_spwd - create entries for new spwd structure -@@ -66,7 +65,7 @@ struct spwd *pwd_to_spwd (const struct passwd *pw) - */ - sp.sp_min = 0; - sp.sp_max = (10000L * DAY) / SCALE; -- sp.sp_lstchg = (long) time ((time_t *) 0) / SCALE; -+ sp.sp_lstchg = (long) gettime () / SCALE; - if (0 == sp.sp_lstchg) { - /* Better disable aging than requiring a password - * change */ -diff --git a/src/pwck.c b/src/pwck.c -index 0ffb711efb13..f70071b12500 100644 ---- a/src/pwck.c -+++ b/src/pwck.c -@@ -609,7 +609,7 @@ static void check_pw_file (int *errors, bool *changed) - sp.sp_inact = -1; - sp.sp_expire = -1; - sp.sp_flag = SHADOW_SP_FLAG_UNSET; -- sp.sp_lstchg = (long) time ((time_t *) 0) / SCALE; -+ sp.sp_lstchg = (long) gettime () / SCALE; - if (0 == sp.sp_lstchg) { - /* Better disable aging than - * requiring a password change -diff --git a/src/pwconv.c b/src/pwconv.c -index 9c69fa131d8e..f932f266c59c 100644 ---- a/src/pwconv.c -+++ b/src/pwconv.c -@@ -267,7 +267,7 @@ int main (int argc, char **argv) - spent.sp_flag = SHADOW_SP_FLAG_UNSET; - } - spent.sp_pwdp = pw->pw_passwd; -- spent.sp_lstchg = (long) time ((time_t *) 0) / SCALE; -+ spent.sp_lstchg = (long) gettime () / SCALE; - if (0 == spent.sp_lstchg) { - /* Better disable aging than requiring a password - * change */ --- -2.17.1 -meta/recipes-extended/shadow/files/0001-configure.ac-fix-configure-error-with-dash.patch deleted +0
-36@@ -1,36 +0,0 @@ -From 3c52a84ff8775590e7e9da9c0d4408c23494305e Mon Sep 17 00:00:00 2001 -From: Yi Zhao <[email protected]> -Date: Mon, 17 Jun 2019 15:36:34 +0800 -Subject: [PATCH] configure.ac: fix configure error with dash - -A configure error occurs when /bin/sh -> dash: - checking for is_selinux_enabled in -lselinux... yes - checking for semanage_connect in -lsemanage... yes - configure: 16322: test: yesyes: unexpected operator - -Use "=" instead of "==" since dash doesn't support this operator. - -Upstream-Status: Backport -[https://github.com/shadow-maint/shadow/commit/3c52a84ff8775590e7e9da9c0d4408c23494305e] - -Signed-off-by: Yi Zhao <[email protected]> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 6762556..1907afb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -500,7 +500,7 @@ if test "$with_selinux" != "no"; then - AC_MSG_ERROR([libsemanage not found]) - fi - -- if test "$selinux_lib$semanage_lib" == "yesyes" ; then -+ if test "$selinux_lib$semanage_lib" = "yesyes" ; then - AC_DEFINE(WITH_SELINUX, 1, - [Build shadow with SELinux support]) - LIBSELINUX="-lselinux" --- -2.7.4 -meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch deleted +0
-116@@ -1,116 +0,0 @@ -Subject: [PATCH] useradd.c: create parent directories when necessary - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Chen Qi <[email protected]> ---- - src/useradd.c | 80 +++++++++++++++++++++++++++++++++++++++-------------------- - 1 file changed, 53 insertions(+), 27 deletions(-) - -diff --git a/src/useradd.c b/src/useradd.c -index 00a3c30..9ecbb58 100644 ---- a/src/useradd.c -+++ b/src/useradd.c -@@ -2021,6 +2021,35 @@ static void usr_update (void) - } - - /* -+ * mkdir_p - create directories, including parent directories when needed -+ * -+ * similar to `mkdir -p' -+ */ -+void mkdir_p(const char *path) { -+ int len = strlen(path); -+ char newdir[len + 1]; -+ mode_t mode = 0755; -+ int i = 0; -+ -+ if (path[i] == '\0') { -+ return; -+ } -+ -+ /* skip the leading '/' */ -+ i++; -+ -+ while(path[i] != '\0') { -+ if (path[i] == '/') { -+ strncpy(newdir, path, i); -+ newdir[i] = '\0'; -+ mkdir(newdir, mode); -+ } -+ i++; -+ } -+ mkdir(path, mode); -+} -+ -+/* - * create_home - create the user's home directory - * - * create_home() creates the user's home directory if it does not -@@ -2038,39 +2067,36 @@ static void create_home (void) - fail_exit (E_HOMEDIR); - } - #endif -- /* XXX - create missing parent directories. --marekm */ -- if (mkdir (prefix_user_home, 0) != 0) { -- fprintf (stderr, -- _("%s: cannot create directory %s\n"), -- Prog, prefix_user_home); -+ mkdir_p(user_home); -+ } -+ if (access (prefix_user_home, F_OK) != 0) { - #ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -- "adding home directory", -- user_name, (unsigned int) user_id, -- SHADOW_AUDIT_FAILURE); -+ audit_logger (AUDIT_ADD_USER, Prog, -+ "adding home directory", -+ user_name, (unsigned int) user_id, -+ SHADOW_AUDIT_FAILURE); - #endif -- fail_exit (E_HOMEDIR); -- } -- (void) chown (prefix_user_home, user_id, user_gid); -- chmod (prefix_user_home, -- 0777 & ~getdef_num ("UMASK", GETDEF_DEFAULT_UMASK)); -- home_added = true; -+ fail_exit (E_HOMEDIR); -+ } -+ (void) chown (prefix_user_home, user_id, user_gid); -+ chmod (prefix_user_home, -+ 0777 & ~getdef_num ("UMASK", GETDEF_DEFAULT_UMASK)); -+ home_added = true; - #ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -- "adding home directory", -- user_name, (unsigned int) user_id, -- SHADOW_AUDIT_SUCCESS); -+ audit_logger (AUDIT_ADD_USER, Prog, -+ "adding home directory", -+ user_name, (unsigned int) user_id, -+ SHADOW_AUDIT_SUCCESS); - #endif - #ifdef WITH_SELINUX -- /* Reset SELinux to create files with default contexts */ -- if (reset_selinux_file_context () != 0) { -- fprintf (stderr, -- _("%s: cannot reset SELinux file creation context\n"), -- Prog); -- fail_exit (E_HOMEDIR); -- } --#endif -+ /* Reset SELinux to create files with default contexts */ -+ if (reset_selinux_file_context () != 0) { -+ fprintf (stderr, -+ _("%s: cannot reset SELinux file creation context\n"), -+ Prog); -+ fail_exit (E_HOMEDIR); - } -+#endif - } - - /* --- -2.11.0 -meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch renamed from meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch +51
-50@@ -1,8 +1,12 @@ +From a7d995228491ad5255ad86c1f04ba071f6880897 Mon Sep 17 00:00:00 2001 +From: Chen Qi <[email protected]> +Date: Sat, 16 Nov 2013 15:27:47 +0800 Subject: [PATCH] Allow for setting password in clear text Upstream-Status: Inappropriate [OE specific] Signed-off-by: Chen Qi <[email protected]> + --- src/Makefile.am | 8 ++++---- src/groupadd.c | 20 +++++++++++++++-----@@ -12,39 +16,39 @@ Signed-off-by: Chen Qi <[email protected]> 5 files changed, 64 insertions(+), 25 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am -index 3c98a8d..b8093d5 100644 +index f31fd7a..4a317a3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -93,10 +93,10 @@ chgpasswd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBSELINUX) $(LIBCRYPT) - chsh_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT_NOPAM) $(LIBSKEY) $(LIBMD) - chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT) - gpasswd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT) --groupadd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) -+groupadd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT) - groupdel_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) - groupmems_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) --groupmod_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) -+groupmod_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT) - grpck_LDADD = $(LDADD) $(LIBSELINUX) - grpconv_LDADD = $(LDADD) $(LIBSELINUX) - grpunconv_LDADD = $(LDADD) $(LIBSELINUX) -@@ -117,9 +117,9 @@ su_SOURCES = \ +@@ -103,10 +103,10 @@ chsh_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT_NOPAM) + chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT) $(LIBECONF) + expiry_LDADD = $(LDADD) $(LIBECONF) + gpasswd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT) $(LIBECONF) +-groupadd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) ++groupadd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) $(LIBCRYPT) + groupdel_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) + groupmems_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) +-groupmod_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) ++groupmod_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) $(LIBCRYPT) + grpck_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) + grpconv_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) + grpunconv_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) +@@ -127,9 +127,9 @@ su_SOURCES = \ suauth.c - su_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBCRYPT_NOPAM) $(LIBSKEY) $(LIBMD) - sulogin_LDADD = $(LDADD) $(LIBCRYPT) --useradd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBATTR) -+useradd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBATTR) $(LIBCRYPT) - userdel_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) --usermod_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBATTR) -+usermod_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBATTR) $(LIBCRYPT) - vipw_LDADD = $(LDADD) $(LIBSELINUX) + su_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBCRYPT_NOPAM) $(LIBSKEY) $(LIBMD) $(LIBECONF) + sulogin_LDADD = $(LDADD) $(LIBCRYPT) $(LIBECONF) +-useradd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBATTR) $(LIBECONF) ++useradd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBATTR) $(LIBECONF) $(LIBCRYPT) + userdel_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBECONF) +-usermod_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBATTR) $(LIBECONF) ++usermod_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBATTR) $(LIBECONF) $(LIBCRYPT) + vipw_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) install-am: all-am diff --git a/src/groupadd.c b/src/groupadd.c -index b57006c..63e1c48 100644 +index e9c4bb7..d572c00 100644 --- a/src/groupadd.c +++ b/src/groupadd.c -@@ -123,9 +123,10 @@ static /*@noreturn@*/void usage (int status) +@@ -127,9 +127,10 @@ static /*@noreturn@*/void usage (int status) (void) fputs (_(" -o, --non-unique allow to create groups with duplicate\n" " (non-unique) GID\n"), usageout); (void) fputs (_(" -p, --password PASSWORD use this encrypted password for the new group\n"), usageout);@@ -56,7 +60,7 @@ index b57006c..63e1c48 100644 (void) fputs ("\n", usageout); exit (status); } -@@ -387,13 +388,14 @@ static void process_flags (int argc, char **argv) +@@ -391,13 +392,14 @@ static void process_flags (int argc, char **argv) {"key", required_argument, NULL, 'K'}, {"non-unique", no_argument, NULL, 'o'}, {"password", required_argument, NULL, 'p'},@@ -73,7 +77,7 @@ index b57006c..63e1c48 100644 long_options, NULL)) != -1) { switch (c) { case 'f': -@@ -445,12 +447,20 @@ static void process_flags (int argc, char **argv) +@@ -449,12 +451,20 @@ static void process_flags (int argc, char **argv) pflg = true; group_passwd = optarg; break;@@ -95,7 +99,7 @@ index b57006c..63e1c48 100644 break; default: usage (E_USAGE); -@@ -584,7 +594,7 @@ int main (int argc, char **argv) +@@ -588,7 +598,7 @@ int main (int argc, char **argv) (void) textdomain (PACKAGE); process_root_flag ("-R", argc, argv);@@ -105,10 +109,10 @@ index b57006c..63e1c48 100644 OPENLOG ("groupadd"); #ifdef WITH_AUDIT diff --git a/src/groupmod.c b/src/groupmod.c -index b293b98..72daf2c 100644 +index bc14438..25ccb44 100644 --- a/src/groupmod.c +++ b/src/groupmod.c -@@ -134,8 +134,9 @@ static void usage (int status) +@@ -138,8 +138,9 @@ static void usage (int status) (void) fputs (_(" -o, --non-unique allow to use a duplicate (non-unique) GID\n"), usageout); (void) fputs (_(" -p, --password PASSWORD change the password to this (encrypted)\n" " PASSWORD\n"), usageout);@@ -119,7 +123,7 @@ index b293b98..72daf2c 100644 (void) fputs ("\n", usageout); exit (status); } -@@ -383,11 +384,12 @@ static void process_flags (int argc, char **argv) +@@ -387,11 +388,12 @@ static void process_flags (int argc, char **argv) {"new-name", required_argument, NULL, 'n'}, {"non-unique", no_argument, NULL, 'o'}, {"password", required_argument, NULL, 'p'},@@ -134,7 +138,7 @@ index b293b98..72daf2c 100644 long_options, NULL)) != -1) { switch (c) { case 'g': -@@ -414,9 +416,17 @@ static void process_flags (int argc, char **argv) +@@ -418,9 +420,17 @@ static void process_flags (int argc, char **argv) group_passwd = optarg; pflg = true; break;@@ -153,7 +157,7 @@ index b293b98..72daf2c 100644 break; default: usage (E_USAGE); -@@ -757,7 +767,7 @@ int main (int argc, char **argv) +@@ -761,7 +771,7 @@ int main (int argc, char **argv) (void) textdomain (PACKAGE); process_root_flag ("-R", argc, argv);@@ -163,10 +167,10 @@ index b293b98..72daf2c 100644 OPENLOG ("groupmod"); #ifdef WITH_AUDIT diff --git a/src/useradd.c b/src/useradd.c -index c74e491..7214e72 100644 +index 1b7bf06..44f09e2 100644 --- a/src/useradd.c +++ b/src/useradd.c -@@ -829,9 +829,10 @@ static void usage (int status) +@@ -853,9 +853,10 @@ static void usage (int status) (void) fputs (_(" -o, --non-unique allow to create users with duplicate\n" " (non-unique) UID\n"), usageout); (void) fputs (_(" -p, --password PASSWORD encrypted password of the new account\n"), usageout);@@ -178,7 +182,7 @@ index c74e491..7214e72 100644 (void) fputs (_(" -s, --shell SHELL login shell of the new account\n"), usageout); (void) fputs (_(" -u, --uid UID user ID of the new account\n"), usageout); (void) fputs (_(" -U, --user-group create a group with the same name as the user\n"), usageout); -@@ -1104,9 +1105,10 @@ static void process_flags (int argc, char **argv) +@@ -1133,9 +1134,10 @@ static void process_flags (int argc, char **argv) {"no-user-group", no_argument, NULL, 'N'}, {"non-unique", no_argument, NULL, 'o'}, {"password", required_argument, NULL, 'p'},@@ -190,7 +194,7 @@ index c74e491..7214e72 100644 {"shell", required_argument, NULL, 's'}, {"uid", required_argument, NULL, 'u'}, {"user-group", no_argument, NULL, 'U'}, -@@ -1117,9 +1119,9 @@ static void process_flags (int argc, char **argv) +@@ -1146,9 +1148,9 @@ static void process_flags (int argc, char **argv) }; while ((c = getopt_long (argc, argv, #ifdef WITH_SELINUX@@ -202,7 +206,7 @@ index c74e491..7214e72 100644 #endif /* !WITH_SELINUX */ long_options, NULL)) != -1) { switch (c) { -@@ -1285,12 +1287,19 @@ static void process_flags (int argc, char **argv) +@@ -1320,12 +1322,19 @@ static void process_flags (int argc, char **argv) } user_pass = optarg; break;@@ -223,7 +227,7 @@ index c74e491..7214e72 100644 break; case 's': if ( ( !VALID (optarg) ) -@@ -2148,7 +2157,7 @@ int main (int argc, char **argv) +@@ -2257,7 +2266,7 @@ int main (int argc, char **argv) process_root_flag ("-R", argc, argv);@@ -233,10 +237,10 @@ index c74e491..7214e72 100644 OPENLOG ("useradd"); #ifdef WITH_AUDIT diff --git a/src/usermod.c b/src/usermod.c -index e571426..ccfbb99 100644 +index 21c6da9..cffdb3e 100644 --- a/src/usermod.c +++ b/src/usermod.c -@@ -424,8 +424,9 @@ static /*@noreturn@*/void usage (int status) +@@ -431,8 +431,9 @@ static /*@noreturn@*/void usage (int status) " new location (use only with -d)\n"), usageout); (void) fputs (_(" -o, --non-unique allow using duplicate (non-unique) UID\n"), usageout); (void) fputs (_(" -p, --password PASSWORD use encrypted password for the new password\n"), usageout);@@ -247,7 +251,7 @@ index e571426..ccfbb99 100644 (void) fputs (_(" -s, --shell SHELL new login shell for the user account\n"), usageout); (void) fputs (_(" -u, --uid UID new UID for the user account\n"), usageout); (void) fputs (_(" -U, --unlock unlock the user account\n"), usageout); -@@ -1002,8 +1003,9 @@ static void process_flags (int argc, char **argv) +@@ -1010,8 +1011,9 @@ static void process_flags (int argc, char **argv) {"move-home", no_argument, NULL, 'm'}, {"non-unique", no_argument, NULL, 'o'}, {"password", required_argument, NULL, 'p'},@@ -258,16 +262,16 @@ index e571426..ccfbb99 100644 {"shell", required_argument, NULL, 's'}, {"uid", required_argument, NULL, 'u'}, {"unlock", no_argument, NULL, 'U'}, -@@ -1019,7 +1021,7 @@ static void process_flags (int argc, char **argv) +@@ -1027,7 +1029,7 @@ static void process_flags (int argc, char **argv) {NULL, 0, NULL, '\0'} }; while ((c = getopt_long (argc, argv, -- "ac:d:e:f:g:G:hl:Lmop:R:s:u:UP:" -+ "ac:d:e:f:g:G:hl:Lmop:P:R:s:u:UA:" +- "abc:d:e:f:g:G:hl:Lmop:R:s:u:UP:" ++ "abc:d:e:f:g:G:hl:Lmop:P:R:s:u:UA:" #ifdef ENABLE_SUBIDS "v:w:V:W:" #endif /* ENABLE_SUBIDS */ -@@ -1119,9 +1121,17 @@ static void process_flags (int argc, char **argv) +@@ -1130,9 +1132,17 @@ static void process_flags (int argc, char **argv) user_pass = optarg; pflg = true; break;@@ -286,7 +290,7 @@ index e571426..ccfbb99 100644 break; case 's': if (!VALID (optarg)) { -@@ -2098,7 +2108,7 @@ int main (int argc, char **argv) +@@ -2127,7 +2137,7 @@ int main (int argc, char **argv) (void) textdomain (PACKAGE); process_root_flag ("-R", argc, argv);@@ -295,6 +299,3 @@ index e571426..ccfbb99 100644 OPENLOG ("usermod"); #ifdef WITH_AUDIT --- -2.11.0 -meta/recipes-extended/shadow/files/0004-useradd.c-create-parent-directories-when-necessary.patch new file +63
-0@@ -0,0 +1,63 @@ +From b406a7f4c3d6472885b75320ea63f140e021ff03 Mon Sep 17 00:00:00 2001 +From: Chen Qi <[email protected]> +Date: Thu, 17 Jul 2014 15:53:34 +0800 +Subject: [PATCH] useradd.c: create parent directories when necessary + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Chen Qi <[email protected]> + +--- + src/useradd.c | 32 +++++++++++++++++++++++++++++++- + 1 file changed, 31 insertions(+), 1 deletion(-) + +diff --git a/src/useradd.c b/src/useradd.c +index 44f09e2..fec0986 100644 +--- a/src/useradd.c ++++ b/src/useradd.c +@@ -2065,6 +2065,36 @@ static void usr_update (void) + } + } + ++/* ++ * mkdir_p - create directories, including parent directories when needed ++ * ++ * similar to `mkdir -p' ++ */ ++int mkdir_p(const char *path) { ++ int len = strlen(path); ++ char newdir[len + 1]; ++ mode_t mode = 0755; ++ int i = 0; ++ ++ if (path[i] == '\0') { ++ return 0; ++ } ++ ++ /* skip the leading '/' */ ++ i++; ++ ++ while(path[i] != '\0') { ++ if (path[i] == '/') { ++ strncpy(newdir, path, i); ++ newdir[i] = '\0'; ++ mkdir(newdir, mode); ++ } ++ i++; ++ } ++ mkdir(path, mode); ++ return 0; ++} ++ + /* + * create_home - create the user's home directory + * +@@ -2137,7 +2167,7 @@ static void create_home (void) + } + else + #endif +- if (mkdir (path, 0) != 0) { ++ if ((mkdir_p (path) == 0) && (access (prefix_user_home, F_OK) != 0)) { + fprintf (stderr, + _("%s: cannot create directory %s\n"), + Prog, path);meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch +9
-6@@ -1,3 +1,8 @@ +From 66533c7c6f347d257020675a1ed6e0c59cbbc3f0 Mon Sep 17 00:00:00 2001 +From: Chen Qi <[email protected]> +Date: Thu, 17 Jul 2014 15:53:34 +0800 +Subject: [PATCH] commonio.c-fix-unexpected-open-failure-in-chroot-env + Upstream-Status: Inappropriate [OE specific] commonio.c: fix unexpected open failure in chroot environment@@ -10,15 +15,16 @@ Note that this patch doesn't change the logic in the code, it just expands the codes. Signed-off-by: Chen Qi <[email protected]> + --- - lib/commonio.c | 16 ++++++++++++---- + lib/commonio.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/commonio.c b/lib/commonio.c -index cc536bf..51cafd9 100644 +index 16fa7e7..d6bc297 100644 --- a/lib/commonio.c +++ b/lib/commonio.c -@@ -613,10 +613,18 @@ int commonio_open (struct commonio_db *db, int mode) +@@ -632,10 +632,18 @@ int commonio_open (struct commonio_db *db, int mode) db->cursor = NULL; db->changed = false;@@ -41,6 +47,3 @@ index cc536bf..51cafd9 100644 db->fp = NULL; if (fd >= 0) { #ifdef WITH_TCB --- -1.7.9.5 -meta/recipes-extended/shadow/files/shadow-relaxed-usernames.patch +31
-20@@ -1,26 +1,37 @@ +From ca472d6866e545aaa70a70020e3226f236a8aafc Mon Sep 17 00:00:00 2001 +From: Shan Hai <[email protected]> +Date: Tue, 13 Sep 2016 13:45:46 +0800 +Subject: [PATCH] shadow: use relaxed usernames The groupadd from shadow does not allow upper case group names, the same is true for the upstream shadow. But distributions like Debian/Ubuntu/CentOS has their own way to cope with this problem, this patch is picked up from CentOS release 7.0 to relax the usernames restrictions to allow the upper case group names, and the relaxation is -POSIX compliant because POSIX indicate that usernames are composed of +POSIX compliant because POSIX indicate that usernames are composed of characters from the portable filename character set [A-Za-z0-9._-]. Upstream-Status: Pending -Signed-off-by: Shan Hai <[email protected]> +Signed-off-by: Shan Hai <[email protected]> -diff -urpN a/libmisc/chkname.c b/libmisc/chkname.c -index 5089112..f40a0da 100644 +--- + libmisc/chkname.c | 30 ++++++++++++++++++------------ + man/groupadd.8.xml | 6 ------ + man/useradd.8.xml | 8 +------- + 3 files changed, 19 insertions(+), 25 deletions(-) + +diff --git a/libmisc/chkname.c b/libmisc/chkname.c +index 90f185c..65762b4 100644 --- a/libmisc/chkname.c +++ b/libmisc/chkname.c -@@ -49,21 +49,28 @@ - static bool is_valid_name (const char *name) - { +@@ -55,22 +55,28 @@ static bool is_valid_name (const char *name) + } + /* - * User/group names must match [a-z_][a-z0-9_-]*[$] - */ +- - if (('\0' == *name) || - !((('a' <= *name) && ('z' >= *name)) || ('_' == *name))) { + * User/group names must match gnu e-regex:@@ -55,28 +66,28 @@ index 5089112..f40a0da 100644 return false; } } -diff -urpN a/man/groupadd.8.xml b/man/groupadd.8.xml -index 230fd0c..94f7807 100644 +diff --git a/man/groupadd.8.xml b/man/groupadd.8.xml +index 1e58f09..d804b61 100644 --- a/man/groupadd.8.xml +++ b/man/groupadd.8.xml -@@ -222,12 +222,6 @@ +@@ -272,12 +272,6 @@ + <refsect1 id='caveats'> <title>CAVEATS</title> - <para> +- <para> - Groupnames must start with a lower case letter or an underscore, - followed by lower case letters, digits, underscores, or dashes. - They can end with a dollar sign. - In regular expression terms: [a-z_][a-z0-9_-]*[$]? - </para> -- <para> + <para> Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long. </para> - <para> -diff -urpN a/man/useradd.8.xml b/man/useradd.8.xml -index 5dec989..fe623b9 100644 +diff --git a/man/useradd.8.xml b/man/useradd.8.xml +index a16d730..c0bd777 100644 --- a/man/useradd.8.xml +++ b/man/useradd.8.xml -@@ -336,7 +336,7 @@ +@@ -366,7 +366,7 @@ </term> <listitem> <para>@@ -85,16 +96,16 @@ index 5dec989..fe623b9 100644 wide setting from <filename>/etc/login.defs</filename> (<option>CREATE_HOME</option>) is set to <replaceable>yes</replaceable>. -@@ -607,12 +607,6 @@ +@@ -660,12 +660,6 @@ + the user account creation request. </para> - <para> +- <para> - Usernames must start with a lower case letter or an underscore, - followed by lower case letters, digits, underscores, or dashes. - They can end with a dollar sign. - In regular expression terms: [a-z_][a-z0-9_-]*[$]? - </para> -- <para> + <para> Usernames may only be up to 32 characters long. </para> - </refsect1>meta/recipes-extended/shadow/shadow.inc +5
-6@@ -11,8 +11,6 @@ DEPENDS = "virtual/crypt" UPSTREAM_CHECK_URI = "https://github.com/shadow-maint/shadow/releases" SRC_URI = "https://github.com/shadow-maint/shadow/releases/download/${PV}/${BP}.tar.gz \ file://shadow-4.1.3-dots-in-usernames.patch \ - file://0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patch \ - file://0001-configure.ac-fix-configure-error-with-dash.patch \ ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ file://shadow-relaxed-usernames.patch \ "@@ -24,16 +22,17 @@ SRC_URI_append_class-target = " \ SRC_URI_append_class-native = " \ file://0001-Disable-use-of-syslog-for-sysroot.patch \ - file://allow-for-setting-password-in-clear-text.patch \ + file://0002-Allow-for-setting-password-in-clear-text.patch \ file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ - file://0001-useradd.c-create-parent-directories-when-necessary.patch \ + file://0004-useradd.c-create-parent-directories-when-necessary.patch \ + file://0001-Do-not-check-for-validity-of-shell-executable.patch \ " SRC_URI_append_class-nativesdk = " \ file://0001-Disable-use-of-syslog-for-sysroot.patch \ " -SRC_URI[md5sum] = "36feb15665338ae3de414f2a88e434db" -SRC_URI[sha256sum] = "4668f99bd087399c4a586084dc3b046b75f560720d83e92fd23bf7a89dda4d31" +SRC_URI[md5sum] = "017ac773ba370bc28e157cee30dad71a" +SRC_URI[sha256sum] = "82016d65317555fc8ce9e669eb187984d8d4b1f8ecda0769f4bc5412aed326e4" # Additional Policy files for PAM PAM_SRC_URI = "file://pam.d/chfn \meta/recipes-extended/shadow/shadow_4.8.bb renamed from meta/recipes-extended/shadow/shadow_4.6.bb +0
-1--2.17.1
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 1 line
Alex Kiernan
Re: [PATCH 14/24] shadow: update 4.6 -> 4.8
Right, I have now dropped it.
Alex
Quoted 1,071 lines · Alex Kiernan
Quoted 6 lines · Alexander Kanavin
Drop two backports.
Refactor 0001-useradd.c-create-parent-directories-when-necessary.patch to make the changes less invasive (and easier to rebase).
Is that change even needed any more?
https://github.com/shadow-maint/shadow/commit/b3b6d9d77c1d18b98670b97157777bb74092cd69
Looks like it ought to be doing the same thing.
Quoted 6 lines
Rebase the rest of the paches.
Add a patch to remove the check for validity of login shells which does not work in our environment.
Signed-off-by Alexander Kanavin <[email protected]>Quoted 14 lines
--- ...01-Disable-use-of-syslog-for-sysroot.patch | 18 ++- ...eck-for-validity-of-shell-executable.patch | 29 +++++ ...chg-shadow-field-reproducible-re.-71.patch | 89 -------------- ...ure.ac-fix-configure-error-with-dash.patch | 36 ------ ...te-parent-directories-when-necessary.patch | 116 ------------------ ...-for-setting-password-in-clear-text.patch} | 101 +++++++-------- ...te-parent-directories-when-necessary.patch | 63 ++++++++++ ...nexpected-open-failure-in-chroot-env.patch | 15 ++- .../files/shadow-relaxed-usernames.patch | 51 +++++--- meta/recipes-extended/shadow/shadow.inc | 11 +- .../shadow/{shadow_4.6.bb => shadow_4.8.bb} | 0 11 files changed, 196 insertions(+), 333 deletions(-) create mode 100644
meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/shadow/files/0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/shadow/files/0001-configure.ac-fix-configure-error-with-dash.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patchQuoted 1 line
rename
meta/recipes-extended/shadow/files/{allow-for-setting-password-in-clear-text.patch=> 0002-Allow-for-setting-password-in-clear-text.patch} (81%)Quoted 1 line
create mode 100644
meta/recipes-extended/shadow/files/0004-useradd.c-create-parent-directories-when-necessary.patchQuoted 1 line
rename meta/recipes-extended/shadow/{shadow_4.6.bb => shadow_4.8.bb}(100%)
Quoted 2 lines
diff --git
a/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patchb/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patchQuoted 2 lines
index
aac2d42b12a..ab317b9aa03100644
---
a/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patchQuoted 1 line
+++
b/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patchQuoted 75 lines
meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch +8
-10@@ -1,4 +1,4 @@ -From 8cf3454d567f77233023be49a39a33e9f0836f89 Mon Sep 17 00:00:00 2001 +From fa2d9453656641002802d8165e80adb9e6a729d2 Mon Sep 17 00:00:00 2001 From: Scott Garman <[email protected]> Date: Thu, 14 Apr 2016 12:28:57 +0200 Subject: [PATCH] Disable use of syslog for sysroot@@ -12,6 +12,7 @@ Upstream-Status: Inappropriate [disable feature] Signed-off-by: Scott Garman <[email protected]> Signed-off-by: Peter Kjellerstedt <[email protected]> Signed-off-by: Chen Qi <[email protected]> + --- src/groupadd.c | 3 +++ src/groupdel.c | 3 +++@@ -23,7 +24,7 @@ Signed-off-by: Chen Qi <[email protected]> 7 files changed, 21 insertions(+) diff --git a/src/groupadd.c b/src/groupadd.c -index 63e1c48..a596c49 100644 +index 2dd8eec..e9c4bb7 100644 --- a/src/groupadd.c +++ b/src/groupadd.c @@ -34,6 +34,9 @@@@ -37,7 +38,7 @@ index 63e1c48..a596c49 100644 #include <fcntl.h> #include <getopt.h> diff --git a/src/groupdel.c b/src/groupdel.c -index 70bed01..ababd81 100644 +index f941a84..5a70056 100644 --- a/src/groupdel.c +++ b/src/groupdel.c @@ -34,6 +34,9 @@@@ -65,7 +66,7 @@ index fc91c8b..2842514 100644 #include <getopt.h> #include <grp.h> diff --git a/src/groupmod.c b/src/groupmod.c -index 72daf2c..8965f9d 100644 +index 1dca5fc..bc14438 100644 --- a/src/groupmod.c +++ b/src/groupmod.c @@ -34,6 +34,9 @@@@ -79,7 +80,7 @@ index 72daf2c..8965f9d 100644 #include <fcntl.h> #include <getopt.h> diff --git a/src/useradd.c b/src/useradd.c -index 3aaf45c..1ab9174 100644 +index 4af0f7c..1b7bf06 100644 --- a/src/useradd.c +++ b/src/useradd.c @@ -34,6 +34,9 @@@@ -93,7 +94,7 @@ index 3aaf45c..1ab9174 100644 #include <ctype.h> #include <errno.h> diff --git a/src/userdel.c b/src/userdel.c -index c8de1d3..24d3ea9 100644 +index cc951e5..153e0be 100644 --- a/src/userdel.c +++ b/src/userdel.c @@ -34,6 +34,9 @@@@ -107,7 +108,7 @@ index c8de1d3..24d3ea9 100644 #include <errno.h> #include <fcntl.h> diff --git a/src/usermod.c b/src/usermod.c -index ccfbb99..24fb60d 100644 +index 05b9871..21c6da9 100644 --- a/src/usermod.c +++ b/src/usermod.c @@ -34,6 +34,9 @@@@ -120,6 +121,3 @@ index ccfbb99..24fb60d 100644 #include <assert.h> #include <ctype.h> #include <errno.h> --- -2.11.0 -Quoted 1 line
diff --git
a/meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patchb/meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patchQuoted 4 lines
new file mode 100644
index 00000000000..2d15ff0673a
---/dev/null
+++
b/meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patchQuoted 19 lines
meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch new file +18
-0@@ -0,0 +1,29 @@ +From 0d0aded7307a9f4ee0d299951512acd18b3e029e Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 4 Dec 2019 19:28:48 +0100 +Subject: [PATCH] Do not check for validity of shell executable. + +This kind of check fails when building a rootfs. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + src/useradd.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/src/useradd.c b/src/useradd.c +index 4af0f7c..898fe02 100644 +--- a/src/useradd.c ++++ b/src/useradd.c +@@ -1328,10 +1328,7 @@ static void process_flags (int argc, char **argv)meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch line 28
Quoted 10 lines
meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch new file +10
-0+ if ( ( !VALID (optarg) ) + || ( ('\0' != optarg[0]) + && ('/' != optarg[0]) +- && ('*' != optarg[0]) ) +- || (stat(optarg, &st) != 0) +- || (S_ISDIR(st.st_mode)) +- || (access(optarg, X_OK) != 0)) { ++ && ('*' != optarg[0]) )) { + fprintf (stderr, + _("%s: invalid shell'%s'\n"),
Quoted 2 lines
meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch new file +1
-0+ Prog, optarg);diff --git
a/meta/recipes-extended/shadow/files/0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patchb/meta/recipes-extended/shadow/files/0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patchQuoted 3 lines
deleted file mode 100644
index de0ba3ebb42..00000000000
---
a/meta/recipes-extended/shadow/files/0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patchmeta/recipes-extended/shadow/files/0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patch line 4
Quoted 6 lines
+++
/dev/nullmeta/recipes-extended/shadow/files/0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patch deleted +0
-4@@ -1,89 +0,0 @@ -From fe34a2a0e44bc80ff213bfd185046a5f10c94997 Mon Sep 17 00:00:00 2001 -From: Chris Lamb <[email protected]> -Date: Wed, 2 Jan 2019 18:06:16 +0000 -Subject: [PATCH 1/2] Make the sp_lstchg shadow field reproducible (re.#71)
meta/recipes-extended/shadow/files/0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patch
Quoted 6 lines
meta/recipes-extended/shadow/files/0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patch deleted +0
-6- -From <https://github.com/shadow-maint/shadow/pull/71>: - -``` -The third field in the /etc/shadow file (sp_lstchg) contains the date of -the last password change expressed as the number of days since Jan 1,1970.
meta/recipes-extended/shadow/files/0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patch
Quoted 7 lines
meta/recipes-extended/shadow/files/0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patch deleted +0
-7-As this is a relative time, creating a user today will result in: - -username:17238:0:99999:7::: -whilst creating the same user tomorrow will result in: - -username:17239:0:99999:7::: -This has an impact for the Reproducible Builds[0] project where we aimto
meta/recipes-extended/shadow/files/0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patch
Quoted 8 lines
meta/recipes-extended/shadow/files/0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patch deleted +0
-8-be independent of as many elements the build environment as possible, -including the current date. - -This patch changes the behaviour to use the SOURCE_DATE_EPOCH[1] -environment variable (instead of Jan 1, 1970) if valid. -``` - -This updated PR adds some missing calls to gettime (). This wasoriginally
Quoted 30 lines
meta/recipes-extended/shadow/files/0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patch deleted +0
-30-filed by Johannes Schauer in Debian as #917773 [2]. - -[0] https://reproducible-builds.org/ -[1] https://reproducible-builds.org/specs/source-date-epoch/ -[2] https://bugs.debian.org/917773 - -Upstream-Status: Backport -Signed-off-by: Alex Kiernan <[email protected]> ---- - libmisc/pwd2spwd.c | 3 +-- - src/pwck.c | 2 +- - src/pwconv.c | 2 +- - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/libmisc/pwd2spwd.c b/libmisc/pwd2spwd.c -index c1b9b29ac873..6799dd50d490 100644 ---- a/libmisc/pwd2spwd.c -+++ b/libmisc/pwd2spwd.c -@@ -40,7 +40,6 @@ - #include "prototypes.h" - #include "defines.h" - #include <pwd.h> --extern time_t time (time_t *); - - /* - * pwd_to_spwd - create entries for new spwd structure -@@ -66,7 +65,7 @@ struct spwd *pwd_to_spwd (const struct passwd *pw) - */ - sp.sp_min = 0; - sp.sp_max = (10000L * DAY) / SCALE;meta/recipes-extended/shadow/files/0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patch
Quoted 10 lines
meta/recipes-extended/shadow/files/0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patch deleted +0
-10-- sp.sp_lstchg = (long) time ((time_t *) 0) / SCALE; -+ sp.sp_lstchg = (long) gettime () / SCALE; - if (0 == sp.sp_lstchg) { - /* Better disable aging than requiring a password - * change */ -diff --git a/src/pwck.c b/src/pwck.c -index 0ffb711efb13..f70071b12500 100644 ---- a/src/pwck.c -+++ b/src/pwck.c -@@ -609,7 +609,7 @@ static void check_pw_file (int *errors, bool*changed)
meta/recipes-extended/shadow/files/0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patch
Quoted 3 lines
meta/recipes-extended/shadow/files/0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patch deleted +0
-3- sp.sp_inact = -1; - sp.sp_expire = -1; - sp.sp_flag =
SHADOW_SP_FLAG_UNSET;Review line 69
Quoted 1 line
(quoted diff) +0
-1-- sp.sp_lstchg = (long) time((
time_t*) 0) / SCALE;Review line 70
Quoted 1 line
(quoted diff) +0
-1-+ sp.sp_lstchg = (long) gettime ()/ SCALE;
Review line 72
Quoted 2 lines
(quoted diff) +0
-2- if (0 == sp.sp_lstchg) { - /* Better disable agingthan
Review line 73
Quoted 1 line
(quoted diff) +0
-1- * requiring a passwordchange
Quoted 16 lines
meta/recipes-extended/shadow/files/0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patch deleted +0
-16-diff --git a/src/pwconv.c b/src/pwconv.c -index 9c69fa131d8e..f932f266c59c 100644 ---- a/src/pwconv.c -+++ b/src/pwconv.c -@@ -267,7 +267,7 @@ int main (int argc, char **argv) - spent.sp_flag = SHADOW_SP_FLAG_UNSET; - } - spent.sp_pwdp = pw->pw_passwd; -- spent.sp_lstchg = (long) time ((time_t *) 0) / SCALE; -+ spent.sp_lstchg = (long) gettime () / SCALE; - if (0 == spent.sp_lstchg) { - /* Better disable aging than requiring a password - * change */ --- -2.17.1 -Quoted 1 line
diff --git
a/meta/recipes-extended/shadow/files/0001-configure.ac-fix-configure-error-with-dash.patchb/meta/recipes-extended/shadow/files/0001-configure.ac-fix-configure-error-with-dash.patchQuoted 3 lines
deleted file mode 100644
index a74cbb0c0e7..00000000000
---
a/meta/recipes-extended/shadow/files/0001-configure.ac-fix-configure-error-with-dash.patchQuoted 6 lines
+++
/dev/nullmeta/recipes-extended/shadow/files/0001-configure.ac-fix-configure-error-with-dash.patch deleted +0
-4@@ -1,36 +0,0 @@ -From 3c52a84ff8775590e7e9da9c0d4408c23494305e Mon Sep 17 00:00:00 2001 -From: Yi Zhao <[email protected]> -Date: Mon, 17 Jun 2019 15:36:34 +0800 -Subject: [PATCH] configure.ac: fix configure error with dashmeta/recipes-extended/shadow/files/0001-configure.ac-fix-configure-error-with-dash.patch line 14
Quoted 10 lines
meta/recipes-extended/shadow/files/0001-configure.ac-fix-configure-error-with-dash.patch deleted +0
-10- -A configure error occurs when /bin/sh -> dash: - checking for is_selinux_enabled in -lselinux... yes - checking for semanage_connect in -lsemanage... yes - configure: 16322: test: yesyes: unexpected operator - -Use "=" instead of "==" since dash doesn't support this operator. - -Upstream-Status: Backport -[https://github.com/shadow-maint/shadow/commit/3c52a84ff8775590e7e9da9c0d4408c23494305e
]Quoted 22 lines
meta/recipes-extended/shadow/files/0001-configure.ac-fix-configure-error-with-dash.patch deleted +0
-22- -Signed-off-by: Yi Zhao <[email protected]> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 6762556..1907afb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -500,7 +500,7 @@ if test "$with_selinux" != "no"; then - AC_MSG_ERROR([libsemanage not found]) - fi - -- if test "$selinux_lib$semanage_lib" == "yesyes" ; then -+ if test "$selinux_lib$semanage_lib" = "yesyes" ; then - AC_DEFINE(WITH_SELINUX, 1, - [Build shadow with SELinux support]) - LIBSELINUX="-lselinux" --- -2.7.4 -Quoted 1 line
diff --git
a/meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patchb/meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patchQuoted 3 lines
deleted file mode 100644
index faa6f68ebe2..00000000000
---
a/meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patchmeta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch line 7
Quoted 9 lines
+++
/dev/nullmeta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch deleted +0
-7@@ -1,116 +0,0 @@ -Subject: [PATCH] useradd.c: create parent directories when necessary - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Chen Qi <[email protected]> ---- - src/useradd.c | 80+++++++++++++++++++++++++++++++++++++++--------------------
meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch
Quoted 11 lines
meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch deleted +0
-11- 1 file changed, 53 insertions(+), 27 deletions(-) - -diff --git a/src/useradd.c b/src/useradd.c -index 00a3c30..9ecbb58 100644 ---- a/src/useradd.c -+++ b/src/useradd.c -@@ -2021,6 +2021,35 @@ static void usr_update (void) - } - - /* -+ * mkdir_p - create directories, including parent directories whenneeded
Quoted 48 lines
meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch deleted +0
-48-+ * -+ * similar to `mkdir -p' -+ */ -+void mkdir_p(const char *path) { -+ int len = strlen(path); -+ char newdir[len + 1]; -+ mode_t mode = 0755; -+ int i = 0; -+ -+ if (path[i] == '\0') { -+ return; -+ } -+ -+ /* skip the leading '/' */ -+ i++; -+ -+ while(path[i] != '\0') { -+ if (path[i] == '/') { -+ strncpy(newdir, path, i); -+ newdir[i] = '\0'; -+ mkdir(newdir, mode); -+ } -+ i++; -+ } -+ mkdir(path, mode); -+} -+ -+/* - * create_home - create the user's home directory - * - * create_home() creates the user's home directory if it does not -@@ -2038,39 +2067,36 @@ static void create_home (void) - fail_exit (E_HOMEDIR); - } - #endif -- /* XXX - create missing parent directories. --marekm */ -- if (mkdir (prefix_user_home, 0) != 0) { -- fprintf (stderr, -- _("%s: cannot create directory %s\n"), -- Prog, prefix_user_home); -+ mkdir_p(user_home); -+ } -+ if (access (prefix_user_home, F_OK) != 0) { - #ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -- "adding home directory", -- user_name, (unsigned int) user_id, -- SHADOW_AUDIT_FAILURE);meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch
Quoted 10 lines
meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch deleted +0
-10-+ audit_logger (AUDIT_ADD_USER, Prog, -+ "adding home directory", -+ user_name, (unsigned int) user_id, -+ SHADOW_AUDIT_FAILURE); - #endif -- fail_exit (E_HOMEDIR); -- } -- (void) chown (prefix_user_home, user_id, user_gid); -- chmod (prefix_user_home, -- 0777 & ~getdef_num ("UMASK",
GETDEF_DEFAULT_UMASK));Quoted 12 lines
meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch deleted +0
-12-- home_added = true; -+ fail_exit (E_HOMEDIR); -+ } -+ (void) chown (prefix_user_home, user_id, user_gid); -+ chmod (prefix_user_home, -+ 0777 & ~getdef_num ("UMASK", GETDEF_DEFAULT_UMASK)); -+ home_added = true; - #ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -- "adding home directory", -- user_name, (unsigned int) user_id, -- SHADOW_AUDIT_SUCCESS);meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch
Quoted 10 lines
meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch deleted +0
-10-+ audit_logger (AUDIT_ADD_USER, Prog, -+ "adding home directory", -+ user_name, (unsigned int) user_id, -+ SHADOW_AUDIT_SUCCESS); - #endif - #ifdef WITH_SELINUX -- /* Reset SELinux to create files with default contexts */ -- if (reset_selinux_file_context () != 0) { -- fprintf (stderr, -- _("%s: cannot reset SELinux filecreation context\n"),
meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch
Quoted 8 lines
meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch deleted +0
-8-- Prog); -- fail_exit (E_HOMEDIR); -- } --#endif -+ /* Reset SELinux to create files with default contexts */ -+ if (reset_selinux_file_context () != 0) { -+ fprintf (stderr, -+ _("%s: cannot reset SELinux file creationcontext\n"),
Quoted 11 lines
meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch deleted +0
-10-+ Prog); -+ fail_exit (E_HOMEDIR); - } -+#endif - } - - /* --- -2.11.0 -diff --git
a/meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patchb/meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patchQuoted 2 lines
similarity index 81%
rename from
meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patchQuoted 1 line
rename to
meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patchQuoted 2 lines
index
fa7eb07aa51..c6332e4f766100644
---
a/meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patchQuoted 1 line
+++
b/meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patchQuoted 14 lines
meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch renamed from meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch +4
-0@@ -1,8 +1,12 @@ +From a7d995228491ad5255ad86c1f04ba071f6880897 Mon Sep 17 00:00:00 2001 +From: Chen Qi <[email protected]> +Date: Sat, 16 Nov 2013 15:27:47 +0800 Subject: [PATCH] Allow for setting password in clear text Upstream-Status: Inappropriate [OE specific] Signed-off-by: Chen Qi <[email protected]> + --- src/Makefile.am | 8 ++++---- src/groupadd.c | 20 +++++++++++++++-----meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch Signed-off-by: Chen Qi <[email protected]> · line 18
Quoted 8 lines
meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch renamed from meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch +1
-2@@ -12,39 +16,39 @@ Signed-off-by: Chen Qi <[email protected]> 5 files changed, 64 insertions(+), 25 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am -index 3c98a8d..b8093d5 100644 +index f31fd7a..4a317a3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -93,10 +93,10 @@ chgpasswd_LDADD = $(LDADD) $(LIBPAM_SUID)$(LIBSELINUX) $(LIBCRYPT)
Review Signed-off-by: Chen Qi <[email protected]> · line 19
Quoted 1 line
(quoted diff) +0
-1- chsh_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT_NOPAM)$(LIBSKEY) $(LIBMD)
meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch Signed-off-by: Chen Qi <[email protected]>
Quoted 4 lines
meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch renamed from meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch +0
-4- chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT) - gpasswd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT) --groupadd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) -+groupadd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)$(LIBCRYPT)
meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch Signed-off-by: Chen Qi <[email protected]>
Quoted 4 lines
meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch renamed from meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch +0
-4- groupdel_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) - groupmems_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) --groupmod_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) -+groupmod_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)$(LIBCRYPT)
meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch Signed-off-by: Chen Qi <[email protected]>
Quoted 5 lines
meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch renamed from meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch +1
-4- grpck_LDADD = $(LDADD) $(LIBSELINUX) - grpconv_LDADD = $(LDADD) $(LIBSELINUX) - grpunconv_LDADD = $(LDADD) $(LIBSELINUX) -@@ -117,9 +117,9 @@ su_SOURCES = \ +@@ -103,10 +103,10 @@ chsh_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT)$(LIBSELINUX) $(LIBCRYPT_NOPAM)
Review Signed-off-by: Chen Qi <[email protected]> · line 23
Quoted 1 line
(quoted diff) +1
-0+ chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)$(LIBCRYPT) $(LIBECONF)
Review Signed-off-by: Chen Qi <[email protected]> · line 25
Quoted 2 lines
(quoted diff) +2
-0+ expiry_LDADD = $(LDADD) $(LIBECONF) + gpasswd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT)$(LIBECONF)
Review Signed-off-by: Chen Qi <[email protected]> · line 26
Quoted 1 line
(quoted diff) +1
-0+-groupadd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)$(LIBECONF)
Review Signed-off-by: Chen Qi <[email protected]> · line 27
Quoted 1 line
(quoted diff) +1
-0++groupadd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)$(LIBECONF) $(LIBCRYPT)
Review Signed-off-by: Chen Qi <[email protected]> · line 28
Quoted 1 line
(quoted diff) +1
-0+ groupdel_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)$(LIBECONF)
Review Signed-off-by: Chen Qi <[email protected]> · line 29
Quoted 1 line
(quoted diff) +1
-0+ groupmems_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)$(LIBECONF)
Review Signed-off-by: Chen Qi <[email protected]> · line 30
Quoted 1 line
(quoted diff) +1
-0+-groupmod_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)$(LIBECONF)
Review Signed-off-by: Chen Qi <[email protected]> · line 31
Quoted 1 line
(quoted diff) +1
-0++groupmod_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)$(LIBECONF) $(LIBCRYPT)
meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch Signed-off-by: Chen Qi <[email protected]>
Quoted 6 lines
meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch renamed from meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch +4
-1+ grpck_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) + grpconv_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) + grpunconv_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) +@@ -127,9 +127,9 @@ su_SOURCES = \ suauth.c - su_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBCRYPT_NOPAM)$(LIBSKEY) $(LIBMD)
Review Signed-off-by: Chen Qi <[email protected]> · line 35
Quoted 2 lines
(quoted diff) +0
-2- sulogin_LDADD = $(LDADD) $(LIBCRYPT) --useradd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)$(LIBSEMANAGE) $(LIBACL) $(LIBATTR)
Review Signed-off-by: Chen Qi <[email protected]> · line 36
Quoted 1 line
(quoted diff) +0
-1-+useradd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)$(LIBSEMANAGE) $(LIBACL) $(LIBATTR) $(LIBCRYPT)
Review Signed-off-by: Chen Qi <[email protected]> · line 37
Quoted 1 line
(quoted diff) +0
-1- userdel_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)$(LIBSEMANAGE)
Review Signed-off-by: Chen Qi <[email protected]> · line 38
Quoted 1 line
(quoted diff) +0
-1--usermod_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)$(LIBSEMANAGE) $(LIBACL) $(LIBATTR)
Review Signed-off-by: Chen Qi <[email protected]> · line 39
Quoted 1 line
(quoted diff) +0
-1-+usermod_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)$(LIBSEMANAGE) $(LIBACL) $(LIBATTR) $(LIBCRYPT)
Review Signed-off-by: Chen Qi <[email protected]> · line 37
Quoted 2 lines
(quoted diff) +1
-1- vipw_LDADD = $(LDADD) $(LIBSELINUX) + su_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBCRYPT_NOPAM)$(LIBSKEY) $(LIBMD) $(LIBECONF)
Review Signed-off-by: Chen Qi <[email protected]> · line 39
Quoted 2 lines
(quoted diff) +2
-0+ sulogin_LDADD = $(LDADD) $(LIBCRYPT) $(LIBECONF) +-useradd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)$(LIBSEMANAGE) $(LIBACL) $(LIBATTR) $(LIBECONF)
Review Signed-off-by: Chen Qi <[email protected]> · line 40
Quoted 1 line
(quoted diff) +1
-0++useradd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)$(LIBSEMANAGE) $(LIBACL) $(LIBATTR) $(LIBECONF) $(LIBCRYPT)
Review Signed-off-by: Chen Qi <[email protected]> · line 41
Quoted 1 line
(quoted diff) +1
-0+ userdel_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)$(LIBSEMANAGE) $(LIBECONF)
Review Signed-off-by: Chen Qi <[email protected]> · line 42
Quoted 1 line
(quoted diff) +1
-0+-usermod_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)$(LIBSEMANAGE) $(LIBACL) $(LIBATTR) $(LIBECONF)
Review Signed-off-by: Chen Qi <[email protected]> · line 43
Quoted 1 line
(quoted diff) +1
-0++usermod_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)$(LIBSEMANAGE) $(LIBACL) $(LIBATTR) $(LIBECONF) $(LIBCRYPT)
meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch Signed-off-by: Chen Qi <[email protected]>
Quoted 11 lines
meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch renamed from meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch +3
-2+ vipw_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) install-am: all-am diff --git a/src/groupadd.c b/src/groupadd.c -index b57006c..63e1c48 100644 +index e9c4bb7..d572c00 100644 --- a/src/groupadd.c +++ b/src/groupadd.c -@@ -123,9 +123,10 @@ static /*@noreturn@*/void usage (int status) +@@ -127,9 +127,10 @@ static /*@noreturn@*/void usage (int status) (void) fputs (_(" -o, --non-unique allow to creategroups with duplicate\n"
Review Signed-off-by: Chen Qi <[email protected]> · line 53
Quoted 1 line
(quoted diff) +0
-0" (non-unique)GID\n"), usageout);
Review Signed-off-by: Chen Qi <[email protected]> · line 54
Quoted 1 line
(quoted diff) +0
-0(void) fputs (_(" -p, --password PASSWORD use thisencrypted password for the new group\n"), usageout);
Quoted 28 lines
meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch renamed from meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch +3
-3@@ -56,7 +60,7 @@ index b57006c..63e1c48 100644 (void) fputs ("\n", usageout); exit (status); } -@@ -387,13 +388,14 @@ static void process_flags (int argc, char **argv) +@@ -391,13 +392,14 @@ static void process_flags (int argc, char **argv) {"key", required_argument, NULL, 'K'}, {"non-unique", no_argument, NULL, 'o'}, {"password", required_argument, NULL, 'p'},@@ -73,7 +77,7 @@ index b57006c..63e1c48 100644 long_options, NULL)) != -1) { switch (c) { case 'f': -@@ -445,12 +447,20 @@ static void process_flags (int argc, char **argv) +@@ -449,12 +451,20 @@ static void process_flags (int argc, char **argv) pflg = true; group_passwd = optarg; break;@@ -95,7 +99,7 @@ index b57006c..63e1c48 100644 break; default: usage (E_USAGE); -@@ -584,7 +594,7 @@ int main (int argc, char **argv) +@@ -588,7 +598,7 @@ int main (int argc, char **argv) (void) textdomain (PACKAGE); process_root_flag ("-R", argc, argv);meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch index b57006c..63e1c48 100644 · line 116
Quoted 10 lines
meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch renamed from meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch +2
-2@@ -105,10 +109,10 @@ index b57006c..63e1c48 100644 OPENLOG ("groupadd"); #ifdef WITH_AUDIT diff --git a/src/groupmod.c b/src/groupmod.c -index b293b98..72daf2c 100644 +index bc14438..25ccb44 100644 --- a/src/groupmod.c +++ b/src/groupmod.c -@@ -134,8 +134,9 @@ static void usage (int status) +@@ -138,8 +138,9 @@ static void usage (int status) (void) fputs (_(" -o, --non-unique allow to use aduplicate (non-unique) GID\n"), usageout);
Review index b57006c..63e1c48 100644 · line 117
Quoted 1 line
(quoted diff) +0
-0(void) fputs (_(" -p, --password PASSWORD change thepassword to this (encrypted)\n"
Review index b57006c..63e1c48 100644 · line 118
Quoted 1 line
(quoted diff) +0
-0" PASSWORD\n"),usageout);
Quoted 28 lines
meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch renamed from meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch +3
-3@@ -119,7 +123,7 @@ index b293b98..72daf2c 100644 (void) fputs ("\n", usageout); exit (status); } -@@ -383,11 +384,12 @@ static void process_flags (int argc, char **argv) +@@ -387,11 +388,12 @@ static void process_flags (int argc, char **argv) {"new-name", required_argument, NULL, 'n'}, {"non-unique", no_argument, NULL, 'o'}, {"password", required_argument, NULL, 'p'},@@ -134,7 +138,7 @@ index b293b98..72daf2c 100644 long_options, NULL)) != -1) { switch (c) { case 'g': -@@ -414,9 +416,17 @@ static void process_flags (int argc, char **argv) +@@ -418,9 +420,17 @@ static void process_flags (int argc, char **argv) group_passwd = optarg; pflg = true; break;@@ -153,7 +157,7 @@ index b293b98..72daf2c 100644 break; default: usage (E_USAGE); -@@ -757,7 +767,7 @@ int main (int argc, char **argv) +@@ -761,7 +771,7 @@ int main (int argc, char **argv) (void) textdomain (PACKAGE); process_root_flag ("-R", argc, argv);meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch index b293b98..72daf2c 100644 · line 174
Quoted 10 lines
meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch renamed from meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch +2
-2@@ -163,10 +167,10 @@ index b293b98..72daf2c 100644 OPENLOG ("groupmod"); #ifdef WITH_AUDIT diff --git a/src/useradd.c b/src/useradd.c -index c74e491..7214e72 100644 +index 1b7bf06..44f09e2 100644 --- a/src/useradd.c +++ b/src/useradd.c -@@ -829,9 +829,10 @@ static void usage (int status) +@@ -853,9 +853,10 @@ static void usage (int status) (void) fputs (_(" -o, --non-unique allow to createusers with duplicate\n"
Review index b293b98..72daf2c 100644 · line 175
Quoted 1 line
(quoted diff) +0
-0" (non-unique)UID\n"), usageout);
Review index b293b98..72daf2c 100644 · line 176
Quoted 1 line
(quoted diff) +0
-0(void) fputs (_(" -p, --password PASSWORD encryptedpassword of the new account\n"), usageout);
Review index c74e491..7214e72 100644 · line 182
Quoted 2 lines
(quoted diff) +0
-0@@ -178,7 +182,7 @@ index c74e491..7214e72 100644 (void) fputs (_(" -s, --shell SHELL login shell ofthe new account\n"), usageout);
Review index c74e491..7214e72 100644 · line 183
Quoted 1 line
(quoted diff) +0
-0(void) fputs (_(" -u, --uid UID user ID of thenew account\n"), usageout);
Review index c74e491..7214e72 100644 · line 184
Quoted 1 line
(quoted diff) +0
-0(void) fputs (_(" -U, --user-group create a groupwith the same name as the user\n"), usageout);
Quoted 15 lines
meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch renamed from meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch +2
-2-@@ -1104,9 +1105,10 @@ static void process_flags (int argc, char **argv) +@@ -1133,9 +1134,10 @@ static void process_flags (int argc, char **argv) {"no-user-group", no_argument, NULL, 'N'}, {"non-unique", no_argument, NULL, 'o'}, {"password", required_argument, NULL, 'p'},@@ -190,7 +194,7 @@ index c74e491..7214e72 100644 {"shell", required_argument, NULL, 's'}, {"uid", required_argument, NULL, 'u'}, {"user-group", no_argument, NULL, 'U'}, -@@ -1117,9 +1119,9 @@ static void process_flags (int argc, char **argv) +@@ -1146,9 +1148,9 @@ static void process_flags (int argc, char **argv) }; while ((c = getopt_long (argc, argv, #ifdef WITH_SELINUXmeta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch index c74e491..7214e72 100644 · line 205
Quoted 4 lines
meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch renamed from meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch +0
-1@@ -202,7 +206,7 @@ index c74e491..7214e72 100644 #endif /* !WITH_SELINUX */ long_options, NULL)) != -1) { switch (c) { -@@ -1285,12 +1287,19 @@ static void process_flags (int argc, char**argv)
Review index c74e491..7214e72 100644 · line 209
Quoted 1 line
(quoted diff) +1
-0+@@ -1320,12 +1322,19 @@ static void process_flags (int argc, char**argv)
Quoted 13 lines
meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch renamed from meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch +1
-1} user_pass = optarg; break;@@ -223,7 +227,7 @@ index c74e491..7214e72 100644 break; case 's': if ( ( !VALID (optarg) ) -@@ -2148,7 +2157,7 @@ int main (int argc, char **argv) +@@ -2257,7 +2266,7 @@ int main (int argc, char **argv) process_root_flag ("-R", argc, argv);meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch index c74e491..7214e72 100644 · line 244
Quoted 10 lines
meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch renamed from meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch +2
-2@@ -233,10 +237,10 @@ index c74e491..7214e72 100644 OPENLOG ("useradd"); #ifdef WITH_AUDIT diff --git a/src/usermod.c b/src/usermod.c -index e571426..ccfbb99 100644 +index 21c6da9..cffdb3e 100644 --- a/src/usermod.c +++ b/src/usermod.c -@@ -424,8 +424,9 @@ static /*@noreturn@*/void usage (int status) +@@ -431,8 +431,9 @@ static /*@noreturn@*/void usage (int status) " new location(use only with -d)\n"), usageout);
Review index c74e491..7214e72 100644 · line 245
Quoted 1 line
(quoted diff) +0
-0(void) fputs (_(" -o, --non-unique allow usingduplicate (non-unique) UID\n"), usageout);
Review index c74e491..7214e72 100644 · line 246
Quoted 1 line
(quoted diff) +0
-0(void) fputs (_(" -p, --password PASSWORD use encryptedpassword for the new password\n"), usageout);
Review index e571426..ccfbb99 100644 · line 251
Quoted 2 lines
(quoted diff) +0
-0@@ -247,7 +251,7 @@ index e571426..ccfbb99 100644 (void) fputs (_(" -s, --shell SHELL new login shellfor the user account\n"), usageout);
Review index e571426..ccfbb99 100644 · line 252
Quoted 1 line
(quoted diff) +0
-0(void) fputs (_(" -u, --uid UID new UID for theuser account\n"), usageout);
Review index e571426..ccfbb99 100644 · line 253
Quoted 1 line
(quoted diff) +0
-0(void) fputs (_(" -U, --unlock unlock the useraccount\n"), usageout);
Quoted 6 lines
meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch renamed from meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch +1
-1-@@ -1002,8 +1003,9 @@ static void process_flags (int argc, char **argv) +@@ -1010,8 +1011,9 @@ static void process_flags (int argc, char **argv) {"move-home", no_argument, NULL, 'm'}, {"non-unique", no_argument, NULL, 'o'}, {"password", required_argument, NULL, 'p'},meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch index e571426..ccfbb99 100644 · line 266
Quoted 10 lines
meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch renamed from meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch +1
-3@@ -258,16 +262,16 @@ index e571426..ccfbb99 100644 {"shell", required_argument, NULL, 's'}, {"uid", required_argument, NULL, 'u'}, {"unlock", no_argument, NULL, 'U'}, -@@ -1019,7 +1021,7 @@ static void process_flags (int argc, char **argv) +@@ -1027,7 +1029,7 @@ static void process_flags (int argc, char **argv) {NULL, 0, NULL, '\0'} }; while ((c = getopt_long (argc, argv, -- "ac:d:e:f:g:G:hl:Lmop:R:s:u:UP:" -+"ac:d:e:f:g:G:hl:Lmop:P:R:s:u:UA:"
meta/recipes-extended/shadow/files/shadow-relaxed-usernames.patch line 34
Quoted 1 line
meta/recipes-extended/shadow/files/shadow-relaxed-usernames.patch +1
-0+-"abc:d:e:f:g:G:hl:Lmop:R:s:u:UP:"
Review index e571426..ccfbb99 100644 · line 270
Quoted 1 line
(quoted diff) +1
-0++"abc:d:e:f:g:G:hl:Lmop:P:R:s:u:UA:"
Quoted 24 lines
meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch renamed from meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch +2
-5#ifdef ENABLE_SUBIDS "v:w:V:W:" #endif /* ENABLE_SUBIDS */ -@@ -1119,9 +1121,17 @@ static void process_flags (int argc, char **argv) +@@ -1130,9 +1132,17 @@ static void process_flags (int argc, char **argv) user_pass = optarg; pflg = true; break;@@ -286,7 +290,7 @@ index e571426..ccfbb99 100644 break; case 's': if (!VALID (optarg)) { -@@ -2098,7 +2108,7 @@ int main (int argc, char **argv) +@@ -2127,7 +2137,7 @@ int main (int argc, char **argv) (void) textdomain (PACKAGE); process_root_flag ("-R", argc, argv);@@ -295,6 +299,3 @@ index e571426..ccfbb99 100644 OPENLOG ("usermod"); #ifdef WITH_AUDIT --- -2.11.0 -Quoted 1 line
diff --git
a/meta/recipes-extended/shadow/files/0004-useradd.c-create-parent-directories-when-necessary.patchb/meta/recipes-extended/shadow/files/0004-useradd.c-create-parent-directories-when-necessary.patchQuoted 4 lines
new file mode 100644
index 00000000000..77357027764
---/dev/null
+++
b/meta/recipes-extended/shadow/files/0004-useradd.c-create-parent-directories-when-necessary.patchQuoted 14 lines
meta/recipes-extended/shadow/files/0004-useradd.c-create-parent-directories-when-necessary.patch new file +13
-0@@ -0,0 +1,63 @@ +From b406a7f4c3d6472885b75320ea63f140e021ff03 Mon Sep 17 00:00:00 2001 +From: Chen Qi <[email protected]> +Date: Thu, 17 Jul 2014 15:53:34 +0800 +Subject: [PATCH] useradd.c: create parent directories when necessary + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Chen Qi <[email protected]> + +--- + src/useradd.c | 32 +++++++++++++++++++++++++++++++- + 1 file changed, 31 insertions(+), 1 deletion(-) +meta/recipes-extended/shadow/files/0004-useradd.c-create-parent-directories-when-necessary.patch line 23
Quoted 10 lines
meta/recipes-extended/shadow/files/0004-useradd.c-create-parent-directories-when-necessary.patch new file +10
-0+diff --git a/src/useradd.c b/src/useradd.c +index 44f09e2..fec0986 100644 +--- a/src/useradd.c ++++ b/src/useradd.c +@@ -2065,6 +2065,36 @@ static void usr_update (void) + } + } + ++/* ++ * mkdir_p - create directories, including parent directories whenneeded
Quoted 27 lines
meta/recipes-extended/shadow/files/0004-useradd.c-create-parent-directories-when-necessary.patch new file +27
-0++ * ++ * similar to `mkdir -p' ++ */ ++int mkdir_p(const char *path) { ++ int len = strlen(path); ++ char newdir[len + 1]; ++ mode_t mode = 0755; ++ int i = 0; ++ ++ if (path[i] == '\0') { ++ return 0; ++ } ++ ++ /* skip the leading '/' */ ++ i++; ++ ++ while(path[i] != '\0') { ++ if (path[i] == '/') { ++ strncpy(newdir, path, i); ++ newdir[i] = '\0'; ++ mkdir(newdir, mode); ++ } ++ i++; ++ } ++ mkdir(path, mode); ++ return 0; ++}meta/recipes-extended/shadow/files/0004-useradd.c-create-parent-directories-when-necessary.patch
Quoted 10 lines
meta/recipes-extended/shadow/files/0004-useradd.c-create-parent-directories-when-necessary.patch new file +10
-0++ + /* + * create_home - create the user's home directory + * +@@ -2137,7 +2167,7 @@ static void create_home (void) + } + else + #endif +- if (mkdir (path, 0) != 0) { ++ if ((mkdir_p (path) == 0) && (access(
prefix_user_home,F_OK) != 0)) {Review line 62
Quoted 2 lines
(quoted diff) +2
-0+ fprintf (stderr, + _("%s: cannotcreate directory %s\n"),
Quoted 2 lines
meta/recipes-extended/shadow/files/0004-useradd.c-create-parent-directories-when-necessary.patch new file +1
-0+ Prog, path);diff --git
a/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patchb/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patchQuoted 2 lines
index 4fa3d184edf..98252163692 100644
---
a/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patchQuoted 1 line
+++
b/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patchmeta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch Note that this patch doesn't change the logic in the
Quoted 10 lines
meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch +5
-0@@ -1,3 +1,8 @@ +From 66533c7c6f347d257020675a1ed6e0c59cbbc3f0 Mon Sep 17 00:00:00 2001 +From: Chen Qi <[email protected]> +Date: Thu, 17 Jul 2014 15:53:34 +0800 +Subject: [PATCH] commonio.c-fix-unexpected-open-failure-in-chroot-env + Upstream-Status: Inappropriate [OE specific] commonio.c: fix unexpected open failure in chroot environment@@ -10,15 +15,16 @@ Note that this patch doesn't change the logic in thecode, it just expands
Quoted 5 lines
meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch +1
-0the codes. Signed-off-by: Chen Qi <[email protected]> + ---meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch Note that this patch doesn't change the logic in the code, it just expands
Quoted 10 lines
meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch +2
-3- lib/commonio.c | 16 ++++++++++++---- + lib/commonio.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/commonio.c b/lib/commonio.c -index cc536bf..51cafd9 100644 +index 16fa7e7..d6bc297 100644 --- a/lib/commonio.c +++ b/lib/commonio.c -@@ -613,10 +613,18 @@ int commonio_open (struct commonio_db *db, intmode)
Review Note that this patch doesn't change the logic in the · line 27
Quoted 1 line
(quoted diff) +1
-0+@@ -632,10 +632,18 @@ int commonio_open (struct commonio_db *db, intmode)
Quoted 11 lines
meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch +0
-3db->cursor = NULL; db->changed = false;@@ -41,6 +47,3 @@ index cc536bf..51cafd9 100644 db->fp = NULL; if (fd >= 0) { #ifdef WITH_TCB --- -1.7.9.5 -diff --git
a/meta/recipes-extended/shadow/files/shadow-relaxed-usernames.patchb/meta/recipes-extended/shadow/files/shadow-relaxed-usernames.patchQuoted 63 lines
index
1af04d5fe89..cc833362e9a100644meta/recipes-extended/shadow/files/shadow-relaxed-usernames.patch +22
-10@@ -1,26 +1,37 @@ +From ca472d6866e545aaa70a70020e3226f236a8aafc Mon Sep 17 00:00:00 2001 +From: Shan Hai <[email protected]> +Date: Tue, 13 Sep 2016 13:45:46 +0800 +Subject: [PATCH] shadow: use relaxed usernames The groupadd from shadow does not allow upper case group names, the same is true for the upstream shadow. But distributions like Debian/Ubuntu/CentOS has their own way to cope with this problem, this patch is picked up from CentOS release 7.0 to relax the usernames restrictions to allow the upper case group names, and the relaxation is -POSIX compliant because POSIX indicate that usernames are composed of +POSIX compliant because POSIX indicate that usernames are composed of characters from the portable filename character set [A-Za-z0-9._-]. Upstream-Status: Pending -Signed-off-by: Shan Hai <[email protected]> +Signed-off-by: Shan Hai <[email protected]> -diff -urpN a/libmisc/chkname.c b/libmisc/chkname.c -index 5089112..f40a0da 100644 +--- + libmisc/chkname.c | 30 ++++++++++++++++++------------ + man/groupadd.8.xml | 6 ------ + man/useradd.8.xml | 8 +------- + 3 files changed, 19 insertions(+), 25 deletions(-) + +diff --git a/libmisc/chkname.c b/libmisc/chkname.c +index 90f185c..65762b4 100644 --- a/libmisc/chkname.c +++ b/libmisc/chkname.c -@@ -49,21 +49,28 @@ - static bool is_valid_name (const char *name) - { +@@ -55,22 +55,28 @@ static bool is_valid_name (const char *name) + } + /* - * User/group names must match [a-z_][a-z0-9_-]*[$] - */ +- - if (('\0' == *name) || - !((('a' <= *name) && ('z' >= *name)) || ('_' == *name))) { + * User/group names must match gnu e-regex:@@ -55,28 +66,28 @@ index 5089112..f40a0da 100644 return false; } } -diff -urpN a/man/groupadd.8.xml b/man/groupadd.8.xml -index 230fd0c..94f7807 100644 +diff --git a/man/groupadd.8.xml b/man/groupadd.8.xml +index 1e58f09..d804b61 100644 --- a/man/groupadd.8.xml +++ b/man/groupadd.8.xml -@@ -222,12 +222,6 @@ +@@ -272,12 +272,6 @@ + <refsect1 id='caveats'> <title>CAVEATS</title>meta/recipes-extended/shadow/files/shadow-relaxed-usernames.patch index 5089112..f40a0da 100644 · line 84
Quoted 10 lines
meta/recipes-extended/shadow/files/shadow-relaxed-usernames.patch +2
-2- <para> +- <para> - Groupnames must start with a lower case letter or an underscore, - followed by lower case letters, digits, underscores, or dashes. - They can end with a dollar sign. - In regular expression terms: [a-z_][a-z0-9_-]*[$]? - </para> -- <para> + <para> Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characterslong.
Review
Quoted 35 lines
meta/recipes-extended/shadow/files/shadow-relaxed-usernames.patch +7
-8</para> - <para> -diff -urpN a/man/useradd.8.xml b/man/useradd.8.xml -index 5dec989..fe623b9 100644 +diff --git a/man/useradd.8.xml b/man/useradd.8.xml +index a16d730..c0bd777 100644 --- a/man/useradd.8.xml +++ b/man/useradd.8.xml -@@ -336,7 +336,7 @@ +@@ -366,7 +366,7 @@ </term> <listitem> <para>@@ -85,16 +96,16 @@ index 5dec989..fe623b9 100644 wide setting from <filename>/etc/login.defs</filename> (<option>CREATE_HOME</option>) is set to <replaceable>yes</replaceable>. -@@ -607,12 +607,6 @@ +@@ -660,12 +660,6 @@ + the user account creation request. </para> - <para> +- <para> - Usernames must start with a lower case letter or an underscore, - followed by lower case letters, digits, underscores, or dashes. - They can end with a dollar sign. - In regular expression terms: [a-z_][a-z0-9_-]*[$]? - </para> -- <para> + <para> Usernames may only be up to 32 characters long. </para> - </refsect1>(quoted diff) +0
-0b/meta/recipes-extended/shadow/shadow.inc
meta/recipes-extended/shadow/shadow.inc DEPENDS = "virtual/crypt" · line 12
Quoted 6 lines
index
770c239e96d..d07b507532f100644meta/recipes-extended/shadow/shadow.inc +0
-0@@ -11,8 +11,6 @@ DEPENDS = "virtual/crypt" UPSTREAM_CHECK_URI = "https://github.com/shadow-maint/shadow/releases" SRC_URI = "https://github.com/shadow-maint/shadow/releases/download/${PV}/${BP}.tar.gz
\meta/recipes-extended/shadow/shadow.inc DEPENDS = "virtual/crypt" · line 14
Quoted 2 lines
meta/recipes-extended/shadow/shadow.inc +0
-1file://shadow-4.1.3-dots-in-usernames.patch \ -file://0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patch \
meta/recipes-extended/shadow/shadow.inc DEPENDS = "virtual/crypt" · line 15
Quoted 1 line
meta/recipes-extended/shadow/shadow.inc +0
-1- file://0001-configure.ac-fix-configure-error-with-dash.patch\
meta/recipes-extended/shadow/shadow.inc DEPENDS = "virtual/crypt" · line 14
Quoted 1 line
meta/recipes-extended/shadow/shadow.inc +0
-0${@bb.utils.contains('PACKAGECONFIG', 'pam','${PAM_SRC_URI}', '', d)} \
meta/recipes-extended/shadow/shadow.inc SRC_URI_append_class-target = " \ · line 26
Quoted 9 lines
meta/recipes-extended/shadow/shadow.inc +1
-1file://shadow-relaxed-usernames.patch \ "@@ -24,16 +22,17 @@ SRC_URI_append_class-target = " \ SRC_URI_append_class-native = " \ file://0001-Disable-use-of-syslog-for-sysroot.patch \ - file://allow-for-setting-password-in-clear-text.patch \ + file://0002-Allow-for-setting-password-in-clear-text.patch \file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \
meta/recipes-extended/shadow/shadow.inc SRC_URI_append_class-target = " \ · line 29
Quoted 1 line
meta/recipes-extended/shadow/shadow.inc +0
-1-file://0001-useradd.c-create-parent-directories-when-necessary.patch \
meta/recipes-extended/shadow/shadow.inc SRC_URI_append_class-target = " \ · line 27
Quoted 1 line
meta/recipes-extended/shadow/shadow.inc +1
-0+file://0004-useradd.c-create-parent-directories-when-necessary.patch \
meta/recipes-extended/shadow/shadow.inc SRC_URI_append_class-target = " \ · line 28
Quoted 1 line
meta/recipes-extended/shadow/shadow.inc +1
-0+file://0001-Do-not-check-for-validity-of-shell-executable.patch \
meta/recipes-extended/shadow/shadow.inc SRC_URI_append_class-target = " \
Quoted 7 lines
meta/recipes-extended/shadow/shadow.inc +0
-2" SRC_URI_append_class-nativesdk = " \ file://0001-Disable-use-of-syslog-for-sysroot.patch \ " -SRC_URI[md5sum] = "36feb15665338ae3de414f2a88e434db" -SRC_URI[sha256sum] ="
4668f99bd087399c4a586084dc3b046b75f560720d83e92fd23bf7a89dda4d31"meta/recipes-extended/shadow/shadow.inc SRC_URI_append_class-target = " \ · line 35
Quoted 2 lines
meta/recipes-extended/shadow/shadow.inc +2
-0+SRC_URI[md5sum] = "017ac773ba370bc28e157cee30dad71a" +SRC_URI[sha256sum] ="
82016d65317555fc8ce9e669eb187984d8d4b1f8ecda0769f4bc5412aed326e4"Review
Quoted 4 lines
meta/recipes-extended/shadow/shadow.inc +0
-0# Additional Policy files for PAM PAM_SRC_URI = "file://pam.d/chfn \(quoted diff) +0
-0b/meta/recipes-extended/shadow/shadow_4.8.bb
Quoted 11 lines
similarity index 100%
rename from meta/recipes-extended/shadow/shadow_4.6.bb rename to meta/recipes-extended/shadow/shadow_4.8.bb --
2.17.1--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core--
Alex Kiernan
PATCH 15/24 sysklogd: update to 2.0.3
In reply to Alexander KanavinDrop all patches as they are no longer necessary with autotools,
fix problems that are addressed upstream, or (in case of no-vectorization.patch) don't apply to the old version either, which means no one is using that hw target anymore.
Remove custom systemd configs (provided by upstream), and custom syslog config (also provided by upstream but not installed by default).
Adjust parselogs to not error out on not being able to find System.map file during boot (that is packaged into kernel-dev and is not normally installed).
License-Update: various tweaks; the license terms are the same.
--- meta/lib/oeqa/runtime/cases/parselogs.py | 3 +- .../files/0001-Fix-build-with-musl.patch | 132 ------------------ ...t-causes-a-segmentation-fault-under-.patch | 28 ---- ...or-respecting-flags-from-environment.patch | 35 ----- .../sysklogd/files/klogd.service | 13 -- .../sysklogd/files/no-strip-install.patch | 17 --- .../sysklogd/files/no-vectorization.patch | 20 --- meta/recipes-extended/sysklogd/files/sysklogd | 4 +- .../sysklogd/files/syslog.conf | 71 ---------- .../sysklogd/files/syslogd.service | 14 -- .../sysklogd/files/tmpfiles.sysklogd.conf | 1 - meta/recipes-extended/sysklogd/sysklogd.inc | 46 ++---- .../sysklogd/sysklogd_1.5.1.bb | 3 - .../sysklogd/sysklogd_2.0.3.bb | 3 + 14 files changed, 19 insertions(+), 371 deletions(-) delete mode 100644 meta/recipes-extended/sysklogd/files/0001-Fix-build-with-musl.patch delete mode 100644 meta/recipes-extended/sysklogd/files/0001-fix-problems-that-causes-a-segmentation-fault-under-.patch delete mode 100644 meta/recipes-extended/sysklogd/files/0002-Make-way-for-respecting-flags-from-environment.patch delete mode 100644 meta/recipes-extended/sysklogd/files/klogd.service delete mode 100644 meta/recipes-extended/sysklogd/files/no-strip-install.patch delete mode 100644 meta/recipes-extended/sysklogd/files/no-vectorization.patch delete mode 100644 meta/recipes-extended/sysklogd/files/syslog.conf delete mode 100644 meta/recipes-extended/sysklogd/files/syslogd.service delete mode 100644 meta/recipes-extended/sysklogd/files/tmpfiles.sysklogd.conf delete mode 100644 meta/recipes-extended/sysklogd/sysklogd_1.5.1.bb create mode 100644 meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb
meta/lib/oeqa/runtime/cases/parselogs.py +2 -1
@@ -55,7 +55,8 @@ common_errors = [ "Failed to read /var/lib/nfs/statd/state: Success", "error retry time-out =", "logind: cannot setup systemd-logind helper (-61), using legacy fallback", - "Error changing net interface name 'eth0' to " + "Error changing net interface name 'eth0' to ", + "Cannot find a map file" ] video_related = [
meta/recipes-extended/sysklogd/files/0001-Fix-build-with-musl.patch deleted +0 -132
132 lines not on this page · raw message
meta/recipes-extended/sysklogd/files/0001-fix-problems-that-causes-a-segmentation-fault-under-.patch deleted +0 -28
@@ -1,28 +0,0 @@ -From cb72b3e172c238b4b5ae5935dc6be54f5034fcf1 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 30 Jun 2017 18:20:06 -0700 -Subject: [PATCH 1/2] fix problems that causes a segmentation fault under some - conditions - -Upstream-Status: Inappropriate [ no upstream ] - -Signed-off-by: Khem Raj <[email protected]> ---- - ksym_mod.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/ksym_mod.c b/ksym_mod.c -index 6e26da1..a3daa7d 100644 ---- a/ksym_mod.c -+++ b/ksym_mod.c -@@ -186,7 +186,6 @@ extern int InitMsyms() - else - Syslog(LOG_ERR, "Error loading kernel symbols " \ - "- %s\n", strerror(errno)); -- fclose(ksyms); - return(0); - } - --- -2.13.2 -
meta/recipes-extended/sysklogd/files/0002-Make-way-for-respecting-flags-from-environment.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From b22f244732cd0f475af2f82fc7eecec49f90623b Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Sat, 1 Jul 2017 00:01:50 -0700 -Subject: [PATCH 2/2] Make way for respecting flags from environment - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <[email protected]> ---- - Makefile | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index 5af1689..af699d2 100644 ---- a/Makefile -+++ b/Makefile -@@ -17,14 +17,12 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --CC= gcc - #SKFLAGS= -g -DSYSV -Wall - #LDFLAGS= -g --SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce -+SKFLAGS = $(CFLAGS) $(CPPFLAGS) -DSYSV -Wall -fno-strength-reduce - # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE - # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE - # $(shell getconf LFS_SKFLAGS) --LDFLAGS= -s - - # Look where your install program is. - INSTALL = /usr/bin/install --- -2.13.2 -
meta/recipes-extended/sysklogd/files/klogd.service deleted +0 -13
@@ -1,13 +0,0 @@ -[Unit] -Description=Kernel Logging Service -After=syslogd.service - -[Service] -Type=forking -ExecStart=/sbin/klogd -PIDFile=/var/run/klogd.pid -StandardOutput=null -Restart=on-failure - -[Install] -WantedBy=multi-user.target
meta/recipes-extended/sysklogd/files/no-strip-install.patch deleted +0 -17
@@ -1,17 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: sysklogd-1.5.1/Makefile -=================================================================== ---- sysklogd-1.5.1.orig/Makefile -+++ sysklogd-1.5.1/Makefile -@@ -127,8 +127,8 @@ clobber: clean - rm -f syslogd klogd ksym syslog_tst oops_test TAGS tsyslogd tklogd - - install_exec: syslogd klogd -- ${INSTALL} -m 500 -s syslogd ${BINDIR}/syslogd -- ${INSTALL} -m 500 -s klogd ${BINDIR}/klogd -+ ${INSTALL} -m 500 syslogd ${BINDIR}/syslogd -+ ${INSTALL} -m 500 klogd ${BINDIR}/klogd - - install_man: - ${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} sysklogd.8 ${MANDIR}/man8/sysklogd.8
meta/recipes-extended/sysklogd/files/no-vectorization.patch deleted +0 -20
@@ -1,20 +0,0 @@ -Upstream-Status: Inappropriate - -The compiler should not be generating vectorized instructions on this target. -This is a work around until I can determine why this is occuring on this -particular recipe - -Index: sysklogd-1.5/Makefile -=================================================================== ---- sysklogd-1.5.orig/Makefile -+++ sysklogd-1.5/Makefile -@@ -20,7 +20,8 @@ - CC= gcc - #SKFLAGS= -g -DSYSV -Wall - #LDFLAGS= -g --SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce -+SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce \ -+ -fno-tree-vectorize - # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE - # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE - # $(shell getconf LFS_SKFLAGS)
meta/recipes-extended/sysklogd/files/sysklogd +2 -2
@@ -19,8 +19,8 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin pidfile_syslogd=/var/run/syslogd.pid pidfile_klogd=/var/run/klogd.pid -binpath_syslogd=/sbin/syslogd -binpath_klogd=/sbin/klogd +binpath_syslogd=/usr/sbin/syslogd +binpath_klogd=/usr/sbin/klogd test -x $binpath || exit 0
meta/recipes-extended/sysklogd/files/syslog.conf deleted +0 -71
71 lines not on this page · raw message
meta/recipes-extended/sysklogd/files/syslogd.service deleted +0 -14
@@ -1,14 +0,0 @@ -[Unit] -Description=System Logging Service -Requires=syslog.socket - -[Service] -Type=forking -ExecStart=/sbin/syslogd -PIDFile=/var/run/syslogd.pid -StandardOutput=null -Restart=on-failure - -[Install] -WantedBy=multi-user.target -Alias=syslog.service
meta/recipes-extended/sysklogd/files/tmpfiles.sysklogd.conf deleted +0 -1
@@ -1 +0,0 @@ -p /dev/xconsole 0640 root adm
meta/recipes-extended/sysklogd/sysklogd.inc +12 -34
66 lines not on this page · raw message
meta/recipes-extended/sysklogd/sysklogd_1.5.1.bb deleted +0 -3
@@ -1,3 +0,0 @@ -require sysklogd.inc - -SRCREV = "930a2b1c0d15b14309a49f14e3f30e905456af4d"
meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb new file +3 -0
@@ -0,0 +1,3 @@ +require sysklogd.inc + +SRCREV = "ad686ca86d977f9eac4cd0a0d0e9a5964a4621d3"
Signature · 1 line
2.17.1
Re: [PATCH 15/24] sysklogd: update to 2.0.3
Quoted 7 lines · Alexander Kanavin
Drop all patches as they are no longer necessary with autotools,
fix problems that are addressed upstream, or (in case of no-vectorization.patch) don't apply to the old version either, which means no one is using that hw target anymore.Remove custom systemd configs (provided by upstream), and custom syslog config (also provided by upstream but not installed by default).
Sorry, but:
ERROR: sysklogd-2.0.3-r0 do_package: SYSTEMD_SERVICE_sysklogd value syslogd.service does not exist
Ross
Re: [PATCH 15/24] sysklogd: update to 2.0.3
Thanks, I fixed this and will resend.
Alex
Quoted 19 lines · Ross Burton
Quoted 2 lines · Alexander Kanavin
Drop all patches as they are no longer necessary with autotools, fix problems that are addressed upstream, or (in case of
no-vectorization.patch)
Quoted 1 line
don't apply to the old version either, which means no one is using that
hw target
Quoted 4 lines
anymore.
Remove custom systemd configs (provided by upstream), and custom syslog config (also provided by upstream but not installed by default).
Sorry, but:
ERROR: sysklogd-2.0.3-r0
do_package:SYSTEMD_SERVICE_sysklogdvalue syslogd.service does not existRoss
PATCH 16/24 libtasn1: update to 4.15.0
In reply to Alexander KanavinDrop backports.
---
.../gnutls/libtasn1/fix-gtkdoc.patch | 38 -------------------
.../gnutls/libtasn1/fix-ldflags.patch | 31 ---------------
.../{libtasn1_4.14.bb => libtasn1_4.15.0.bb} | 11 ++++--
3 files changed, 7 insertions(+), 73 deletions(-)
delete mode 100644 meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch
delete mode 100644 meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch
rename meta/recipes-support/gnutls/{libtasn1_4.14.bb => libtasn1_4.15.0.bb} (71%)meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch deleted +0 -38
@@ -1,38 +0,0 @@ -Upstream-Status: Backport [https://gitlab.com/gnutls/libtasn1/merge_requests/49] -Signed-off-by: Ross Burton <[email protected]> - -From ebd4f871b5241809f6a5b461444a6d331e15c949 Mon Sep 17 00:00:00 2001 -From: Ross Burton <[email protected]> -Date: Mon, 9 Sep 2019 13:11:39 +0100 -Subject: [PATCH] doc/reference: don't add empty object hierarchy chapter - -The object hierarchy section is empty because there are no GObjects in the -libtasn1 API. With gtk-doc 1.30 onwards if there are no objects then the object -hierarchy file won't exist, resulting in a failure when building the -documentation: - -| ../libtasn1-docs.xml:39: element include: XInclude error : could not load ../xml/tree_index.sgml, and no fallback was found - -Signed-off-by: Ross Burton <[email protected]> ---- - doc/reference/libtasn1-docs.xml | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/doc/reference/libtasn1-docs.xml b/doc/reference/libtasn1-docs.xml -index accdb85..f88b888 100644 ---- a/doc/reference/libtasn1-docs.xml -+++ b/doc/reference/libtasn1-docs.xml -@@ -34,10 +34,6 @@ - <xi:include href="xml/libtasn1.xml"/> - - </chapter> -- <chapter id="object-tree"> -- <title>Object Hierarchy</title> -- <xi:include href="xml/tree_index.sgml"/> -- </chapter> - <index id="api-index-full"> - <title>API Index</title> - <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include> --- -2.20.1 -
meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch deleted +0 -31
@@ -1,31 +0,0 @@ -From a6f93b7ace347bc4fe29eb4a8fe4383d786cc8d0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= <[email protected]> -Date: Tue, 23 Jul 2019 20:44:01 +0200 -Subject: [PATCH] Fix LDFLAGS to AM_LDFLAGS in src/Makefile.am -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Tim Rühsen <[email protected]> -Upstream-Status: Backport -Signed-off-by: Anuj Mittal <[email protected]> ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 5bf3622..4459767 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -21,7 +21,7 @@ AM_CPPFLAGS = -I$(top_builddir)/lib/includes -I$(top_srcdir)/lib/includes \ - -I$(top_builddir)/lib/gl -I$(top_srcdir)/lib/gl $(CODE_COVERAGE_CPPFLAGS) - - LDADD = ../lib/libtasn1.la --LDFLAGS = $(CODE_COVERAGE_LDFLAGS) -+AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS) - - bin_PROGRAMS = asn1Parser asn1Coding asn1Decoding - --- -2.21.0 -
meta/recipes-support/gnutls/libtasn1_4.15.0.bb renamed from meta/recipes-support/gnutls/libtasn1_4.14.bb +7 -4
@@ -10,15 +10,18 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ file://dont-depend-on-help2man.patch \ - file://fix-ldflags.patch \ - file://fix-gtkdoc.patch \ " DEPENDS = "bison-native" -SRC_URI[md5sum] = "e9918200ed4a778e2b3cbe34c1be4205" -SRC_URI[sha256sum] = "9e604ba5c5c8ea403487695c2e407405820d98540d9de884d6e844f9a9c5ba08" +SRC_URI[md5sum] = "33e3fb5501bb2142184238c815b0beb8" +SRC_URI[sha256sum] = "dd77509fe8f5304deafbca654dc7f0ea57f5841f41ba530cff9a5bf71382739e" inherit autotools texinfo lib_package gtk-doc +do_install_append () { + # this utility is not useful and has a bogus RPATH + rm ${D}/${bindir}/corpus2array +} + BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.17.1
Re: [PATCH 16/24] libtasn1: update to 4.15.0
Quoted 110 lines · Alexander Kanavin
Drop backports.
Signed-off-by Alexander Kanavin <[email protected]>--- .../gnutls/libtasn1/fix-gtkdoc.patch | 38 ------------------- .../gnutls/libtasn1/fix-ldflags.patch | 31 --------------- .../{libtasn1_4.14.bb => libtasn1_4.15.0.bb} | 11 ++++-- 3 files changed, 7 insertions(+), 73 deletions(-) delete mode 100644 meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch delete mode 100644 meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch rename meta/recipes-support/gnutls/{libtasn1_4.14.bb => libtasn1_4.15.0.bb} (71%)meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch deleted +0
-38@@ -1,38 +0,0 @@ -Upstream-Status: Backport [https://gitlab.com/gnutls/libtasn1/merge_requests/49] -Signed-off-by: Ross Burton <[email protected]> - -From ebd4f871b5241809f6a5b461444a6d331e15c949 Mon Sep 17 00:00:00 2001 -From: Ross Burton <[email protected]> -Date: Mon, 9 Sep 2019 13:11:39 +0100 -Subject: [PATCH] doc/reference: don't add empty object hierarchy chapter - -The object hierarchy section is empty because there are no GObjects in the -libtasn1 API. With gtk-doc 1.30 onwards if there are no objects then the object -hierarchy file won't exist, resulting in a failure when building the -documentation: - -| ../libtasn1-docs.xml:39: element include: XInclude error : could not load ../xml/tree_index.sgml, and no fallback was found - -Signed-off-by: Ross Burton <[email protected]> ---- - doc/reference/libtasn1-docs.xml | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/doc/reference/libtasn1-docs.xml b/doc/reference/libtasn1-docs.xml -index accdb85..f88b888 100644 ---- a/doc/reference/libtasn1-docs.xml -+++ b/doc/reference/libtasn1-docs.xml -@@ -34,10 +34,6 @@ - <xi:include href="xml/libtasn1.xml"/> - - </chapter> -- <chapter id="object-tree"> -- <title>Object Hierarchy</title> -- <xi:include href="xml/tree_index.sgml"/> -- </chapter> - <index id="api-index-full"> - <title>API Index</title> - <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include> --- -2.20.1 -meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch deleted +0
-31@@ -1,31 +0,0 @@ -From a6f93b7ace347bc4fe29eb4a8fe4383d786cc8d0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= <[email protected]> -Date: Tue, 23 Jul 2019 20:44:01 +0200 -Subject: [PATCH] Fix LDFLAGS to AM_LDFLAGS in src/Makefile.am -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Tim Rühsen <[email protected]> -Upstream-Status: Backport -Signed-off-by: Anuj Mittal <[email protected]> ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 5bf3622..4459767 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -21,7 +21,7 @@ AM_CPPFLAGS = -I$(top_builddir)/lib/includes -I$(top_srcdir)/lib/includes \ - -I$(top_builddir)/lib/gl -I$(top_srcdir)/lib/gl $(CODE_COVERAGE_CPPFLAGS) - - LDADD = ../lib/libtasn1.la --LDFLAGS = $(CODE_COVERAGE_LDFLAGS) -+AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS) - - bin_PROGRAMS = asn1Parser asn1Coding asn1Decoding - --- -2.21.0 -meta/recipes-support/gnutls/libtasn1_4.15.0.bb renamed from meta/recipes-support/gnutls/libtasn1_4.14.bb +0
-2@@ -10,15 +10,18 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ file://dont-depend-on-help2man.patch \ - file://fix-ldflags.patch \ - file://fix-gtkdoc.patch \ " DEPENDS = "bison-native"
meta/recipes-support/gnutls/libtasn1_4.15.0.bb LIC_FILES_CHKSUM = "file://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ · line 23
Quoted 10 lines
meta/recipes-support/gnutls/libtasn1_4.15.0.bb renamed from meta/recipes-support/gnutls/libtasn1_4.14.bb +4
-2-SRC_URI[md5sum] = "e9918200ed4a778e2b3cbe34c1be4205" -SRC_URI[sha256sum] = "9e604ba5c5c8ea403487695c2e407405820d98540d9de884d6e844f9a9c5ba08" +SRC_URI[md5sum] = "33e3fb5501bb2142184238c815b0beb8" +SRC_URI[sha256sum] = "dd77509fe8f5304deafbca654dc7f0ea57f5841f41ba530cff9a5bf71382739e" inherit autotools texinfo lib_package gtk-doc +do_install_append () { + # this utility is not useful and has a bogus RPATH
if bogus rpath is the reason to delete it then its better to nick it with chrpath --delete
Quoted 12 lines
meta/recipes-support/gnutls/libtasn1_4.15.0.bb renamed from meta/recipes-support/gnutls/libtasn1_4.14.bb +3
-1+ rm ${D}/${bindir}/corpus2array +} + BBCLASSEXTEND = "native nativesdk" --2.17.1
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [PATCH 16/24] libtasn1: update to 4.15.0
Thanks, will change that and resend.
Alex
Quoted 155 lines · Khem Raj
Quoted 11 lines · Alexander Kanavin
Drop backports.
Signed-off-by Alexander Kanavin <[email protected]>--- .../gnutls/libtasn1/fix-gtkdoc.patch | 38 ------------------- .../gnutls/libtasn1/fix-ldflags.patch | 31 --------------- .../{libtasn1_4.14.bb => libtasn1_4.15.0.bb} | 11 ++++-- 3 files changed, 7 insertions(+), 73 deletions(-) delete mode 100644 meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch delete mode 100644
meta/recipes-support/gnutls/libtasn1/fix-ldflags.patchQuoted 1 line
rename meta/recipes-support/gnutls/{libtasn1_4.14.bb =>libtasn1_4.15.0.bb} (71%)
Review
Quoted 2 lines
(quoted diff) +0
-0
b/meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patchmeta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch line 1
Quoted 6 lines
deleted file mode 100644
index bfc9b9fca7e..00000000000meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch deleted +0
-1@@ -1,38 +0,0 @@ -Upstream-Status: Backport [meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch
Quoted 8 lines
meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch deleted +0
-8-Signed-off-by: Ross Burton <[email protected]> - -From ebd4f871b5241809f6a5b461444a6d331e15c949 Mon Sep 17 00:00:00 2001 -From: Ross Burton <[email protected]> -Date: Mon, 9 Sep 2019 13:11:39 +0100 -Subject: [PATCH] doc/reference: don't add empty object hierarchy chapter - -The object hierarchy section is empty because there are no GObjects inthe
meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch line 10
Quoted 1 line
meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch deleted +0
-1-libtasn1 API. With gtk-doc 1.30 onwards if there are no objects thenthe object
meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch
Quoted 4 lines
meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch deleted +0
-4-hierarchy file won't exist, resulting in a failure when building the -documentation: - -| ../libtasn1-docs.xml:39: element include: XInclude error : could notload ../xml/tree_index.sgml, and no fallback was found
meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch
Quoted 7 lines
meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch deleted +0
-7- -Signed-off-by: Ross Burton <[email protected]> ---- - doc/reference/libtasn1-docs.xml | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/doc/reference/libtasn1-docs.xml
b/doc/reference/libtasn1-docs.xmlQuoted 4 lines
meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch deleted +0
-4-index accdb85..f88b888 100644 ---- a/doc/reference/libtasn1-docs.xml -+++ b/doc/reference/libtasn1-docs.xml -@@ -34,10 +34,6 @@meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch
Quoted 10 lines
meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch deleted +0
-10- <xi:include href="xml/libtasn1.xml"/> - - </chapter> -- <chapter id="object-tree"> -- <title>Object Hierarchy</title> -- <xi:include href="xml/tree_index.sgml"/> -- </chapter> - <index id="api-index-full"> - <title>API Index</title> - <xi:include href="xml/api-index-full.xml"><xi:fallback/></xi:include>
Review
Quoted 4 lines
meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch deleted +0
-3--- -2.20.1 -(quoted diff) +0
-0
b/meta/recipes-support/gnutls/libtasn1/fix-ldflags.patchQuoted 15 lines
deleted file mode 100644
index f18f3c62679..00000000000meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch deleted +0
-10@@ -1,31 +0,0 @@ -From a6f93b7ace347bc4fe29eb4a8fe4383d786cc8d0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= <[email protected]> -Date: Tue, 23 Jul 2019 20:44:01 +0200 -Subject: [PATCH] Fix LDFLAGS to AM_LDFLAGS in src/Makefile.am -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Tim Rühsen <[email protected]> -Upstream-Status: Backportmeta/recipes-support/gnutls/libtasn1/fix-ldflags.patch line 20
Quoted 10 lines
meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch deleted +0
-10-Signed-off-by: Anuj Mittal <[email protected]> ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 5bf3622..4459767 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -21,7 +21,7 @@ AM_CPPFLAGS = -I$(top_builddir)/lib/includes-I$(top_srcdir)/lib/includes \
meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch line 21
Quoted 1 line
meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch deleted +0
-1- -I$(top_builddir)/lib/gl -I$(top_srcdir)/lib/gl$(CODE_COVERAGE_CPPFLAGS)
Review
Quoted 11 lines
meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch deleted +0
-10- - LDADD = ../lib/libtasn1.la --LDFLAGS = $(CODE_COVERAGE_LDFLAGS) -+AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS) - - bin_PROGRAMS = asn1Parser asn1Coding asn1Decoding - --- -2.21.0 -(quoted diff) +0
-0b/meta/recipes-support/gnutls/libtasn1_4.15.0.bb
meta/recipes-support/gnutls/libtasn1_4.15.0.bb LIC_FILES_CHKSUM =
Quoted 7 lines
similarity index 71%
rename from meta/recipes-support/gnutls/libtasn1_4.14.bb rename to meta/recipes-support/gnutls/libtasn1_4.15.0.bb indexef2c1956a24..cd00d17b803100644meta/recipes-support/gnutls/libtasn1_4.15.0.bb renamed from meta/recipes-support/gnutls/libtasn1_4.14.bb +0
-0@@ -10,15 +10,18 @@ LIC_FILES_CHKSUM ="file://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \
meta/recipes-support/gnutls/libtasn1_4.15.0.bb LIC_FILES_CHKSUM = "file://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \
Quoted 11 lines
meta/recipes-support/gnutls/libtasn1_4.15.0.bb renamed from meta/recipes-support/gnutls/libtasn1_4.14.bb +0
-4SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ file://dont-depend-on-help2man.patch \ - file://fix-ldflags.patch \ - file://fix-gtkdoc.patch \ " DEPENDS = "bison-native" -SRC_URI[md5sum] = "e9918200ed4a778e2b3cbe34c1be4205" -SRC_URI[sha256sum] ="
9e604ba5c5c8ea403487695c2e407405820d98540d9de884d6e844f9a9c5ba08"meta/recipes-support/gnutls/libtasn1_4.15.0.bb LIC_FILES_CHKSUM = · line 17
Quoted 2 lines
meta/recipes-support/gnutls/libtasn1_4.15.0.bb renamed from meta/recipes-support/gnutls/libtasn1_4.14.bb +2
-0+SRC_URI[md5sum] = "33e3fb5501bb2142184238c815b0beb8" +SRC_URI[sha256sum] ="
dd77509fe8f5304deafbca654dc7f0ea57f5841f41ba530cff9a5bf71382739e"meta/recipes-support/gnutls/libtasn1_4.15.0.bb LIC_FILES_CHKSUM = "file://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ · line 23
Quoted 5 lines
meta/recipes-support/gnutls/libtasn1_4.15.0.bb renamed from meta/recipes-support/gnutls/libtasn1_4.14.bb +2
-0inherit autotools texinfo lib_package gtk-doc +do_install_append () { + # this utility is not useful and has a bogus RPATHif bogus rpath is the reason to delete it then its better to nick it with chrpath --delete
Quoted 12 lines
meta/recipes-support/gnutls/libtasn1_4.15.0.bb renamed from meta/recipes-support/gnutls/libtasn1_4.14.bb +3
-1+ rm ${D}/${bindir}/corpus2array +} + BBCLASSEXTEND = "native nativesdk" --2.17.1
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
PATCH 17/24 texinfo: update to 6.7
In reply to Alexander KanavinDrop 0001-Unset-need_charset_alias-when-building-for-musl.patch as the problematic code is gone.
Rebase the other patches.
---
...charset_alias-when-building-for-musl.patch | 30 -----------
.../texinfo/dont-depend-on-help2man.patch | 23 ++++----
.../texinfo/texinfo/link-zip.patch | 23 +++++---
.../texinfo/texinfo/texinfo-4.12-zlib.patch | 38 +++++++------
.../{texinfo_6.5.bb => texinfo_6.7.bb} | 54 +++++++++++++++++--
5 files changed, 94 insertions(+), 74 deletions(-)
delete mode 100644 meta/recipes-extended/texinfo/texinfo/0001-Unset-need_charset_alias-when-building-for-musl.patch
rename meta/recipes-extended/texinfo/{texinfo_6.5.bb => texinfo_6.7.bb} (57%)meta/recipes-extended/texinfo/texinfo/0001-Unset-need_charset_alias-when-building-for-musl.patch deleted +0 -30
@@ -1,30 +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(-) - -Index: texinfo-5.2/gnulib/lib/Makefile.am -=================================================================== ---- texinfo-5.2.orig/gnulib/lib/Makefile.am -+++ texinfo-5.2/gnulib/lib/Makefile.am -@@ -378,7 +378,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 ;; \
meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch +12 -11
@@ -1,4 +1,4 @@ -From e89b1c57d76f5cf5acbb0d0187374f7a77bce1e2 Mon Sep 17 00:00:00 2001 +From 63a803ead3656353329a801846a9a3beb7210c46 Mon Sep 17 00:00:00 2001 From: Edwin Plauchu <[email protected]> Date: Tue, 29 Nov 2016 13:43:24 -0600 Subject: [PATCH] dont-depend-on-help2man
@@ -7,29 +7,30 @@ Upstream-Status: Inappropriate Signed-off-by: Marko Lindqvist <[email protected]> Signed-off-by: Edwin Plauchu <[email protected]> + --- doc/Makefile.am | 2 +- man/Makefile.am | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am -index 39db834..1bb2a4f +index 732833e..041cb9b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am -@@ -38,7 +38,7 @@ refcard_files = refcard/Makefile refcard/txicmdcheck \ +@@ -37,7 +37,7 @@ refcard_files = refcard/Makefile refcard/txicmdcheck \ # Include our texinfo.tex, not Automake's. EXTRA_DIST = epsf.tex texinfo.tex \ fdl.texi \ - $(man_MANS) $(TXI_XLATE) \ + $(TXI_XLATE) \ - $(refcard_files) texinfo-tex-test.texi \ + $(refcard_files) \ + texinfo-tex-test.texi texinfo-tex-test.WIDOWs \ texinfo-ja.tex short-sample-ja.texi - diff --git a/man/Makefile.am b/man/Makefile.am -index 6bfcb3d..a820c96 +index d0cd72c..a19e52a 100644 --- a/man/Makefile.am +++ b/man/Makefile.am -@@ -13,24 +13,24 @@ +@@ -11,27 +11,27 @@ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # These are generated using help2man.
@@ -47,10 +48,13 @@ index 6bfcb3d..a820c96 -man_MANS += info.5 texinfo.5 +#man_MANS += info.5 texinfo.5 - # This is generated by pod2man, but let's just run it by hand. -man_MANS += pod2texi.1 +#man_MANS += pod2texi.1 + pod2texi.1: $(top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl + $(POD2MAN) $(top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl >"$@" + + # These are just .so's to the common program. -man_MANS += texi2any.1 texi2pdf.1 pdftexi2dvi.1 +#man_MANS += texi2any.1 texi2pdf.1 pdftexi2dvi.1
@@ -60,6 +64,3 @@ index 6bfcb3d..a820c96 # Maintainers should be able to regenerate. MAINTAINERCLEANFILES = $(man_MANS) --- -2.9.3 -
meta/recipes-extended/texinfo/texinfo/link-zip.patch +15 -8
@@ -1,16 +1,23 @@ -install-info uses symbols from zlib so must link against it. +From c1002138033fcccb2d1abfc41f5c2e46c836f7a0 Mon Sep 17 00:00:00 2001 +From: Joshua Lock <[email protected]> +Date: Mon, 29 Jul 2013 15:02:34 -0700 +Subject: [PATCH] install-info uses symbols from zlib so must link against it. Upstream-Status: Pending Signed-off-by: Joshua Lock <[email protected]> -Index: texinfo-5.1/install-info/Makefile.am -=================================================================== ---- texinfo-5.1.orig/install-info/Makefile.am -+++ texinfo-5.1/install-info/Makefile.am -@@ -34,4 +34,4 @@ AM_CPPFLAGS = \ +--- + install-info/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/install-info/Makefile.am b/install-info/Makefile.am +index 9bcff71..68247f9 100644 +--- a/install-info/Makefile.am ++++ b/install-info/Makefile.am +@@ -33,4 +33,4 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/gnulib/lib \ -I$(top_builddir)/gnulib/lib \ -DLOCALEDIR=\"$(localedir)\" --LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) -+LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) -lz +-LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) $(LIBTHREAD) ++LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) $(LIBTHREAD) -lz
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch +18 -20
@@ -1,4 +1,4 @@ -From fe4f00459601efe0cfa75d92749a32237800a530 Mon Sep 17 00:00:00 2001 +From 3d3b66cf398853c666e724c3dbcc37d53a2240d5 Mon Sep 17 00:00:00 2001 From: Edwin Plauchu <[email protected]> Date: Tue, 29 Nov 2016 12:27:17 -0600 Subject: [PATCH] texinfo-4.12-zlib
@@ -7,16 +7,17 @@ Upstream-Status: Pending Signed-off-by: Jussi Kukkonen <[email protected]> Signed-off-by: Edwin Plauchu <[email protected]> + --- - install-info/Makefile.in | 12 ++----- - install-info/install-info.c | 79 +++++++++++++++++++++++++++------------------ - 2 files changed, 49 insertions(+), 42 deletions(-) + install-info/Makefile.in | 2 +- + install-info/install-info.c | 79 ++++++++++++++++++++++--------------- + 2 files changed, 48 insertions(+), 33 deletions(-) diff --git a/install-info/Makefile.in b/install-info/Makefile.in -index 837d020..ba96579 100644 +index c924509..746df05 100644 --- a/install-info/Makefile.in +++ b/install-info/Makefile.in -@@ -216,7 +208,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" +@@ -218,7 +218,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am_ginstall_info_OBJECTS = install-info.$(OBJEXT) ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS)
@@ -24,12 +25,12 @@ index 837d020..ba96579 100644 +ginstall_info_LDADD = $(LDADD) -lz am__DEPENDENCIES_1 = ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) diff --git a/install-info/install-info.c b/install-info/install-info.c -index e58189c..8617787 100644 +index 21f4fe3..a7aba82 100644 --- a/install-info/install-info.c +++ b/install-info/install-info.c -@@ -22,6 +22,7 @@ +@@ -19,6 +19,7 @@ #include <getopt.h> #include <regex.h> #include <argz.h>
@@ -37,7 +38,7 @@ index e58189c..8617787 100644 #define TAB_WIDTH 8 -@@ -684,15 +685,15 @@ The first time you invoke Info you start off looking at this node.\n\ +@@ -681,15 +682,15 @@ The first time you invoke Info you start off looking at this node.\n\ Return either stdin reading the file, or a non-stdin pipe reading the output of the compression program. */
@@ -56,7 +57,7 @@ index e58189c..8617787 100644 /* We let them pass NULL if they don't want this info, but it's easier to always determine it. */ -@@ -700,48 +701,48 @@ open_possibly_compressed_file (char *filename, +@@ -697,48 +698,48 @@ open_possibly_compressed_file (char *filename, opened_filename = &local_opened_filename; *opened_filename = filename;
@@ -113,7 +114,7 @@ index e58189c..8617787 100644 } #endif /* __MSDOS__ */ if (!f) -@@ -757,7 +758,7 @@ open_possibly_compressed_file (char *filename, +@@ -754,7 +755,7 @@ open_possibly_compressed_file (char *filename, (*create_callback) (filename); /* And try opening it again. */
@@ -122,7 +123,7 @@ index e58189c..8617787 100644 if (!f) return 0; } -@@ -767,26 +768,26 @@ open_possibly_compressed_file (char *filename, +@@ -764,26 +765,26 @@ open_possibly_compressed_file (char *filename, /* Read first few bytes of file rather than relying on the filename. If the file is shorter than this it can't be usable anyway. */
@@ -158,7 +159,7 @@ index e58189c..8617787 100644 return 0; goto determine_file_type; /* success */ } -@@ -857,35 +858,40 @@ determine_file_type: +@@ -854,35 +855,40 @@ determine_file_type: *compression_program = NULL; /* Seek back over the magic bytes. */
@@ -206,7 +207,7 @@ index e58189c..8617787 100644 } return f; -@@ -904,7 +910,8 @@ readfile (char *filename, int *sizep, +@@ -901,7 +907,8 @@ readfile (char *filename, int *sizep, void (*create_callback) (char *), char **opened_filename, char **compression_program) {
@@ -216,7 +217,7 @@ index e58189c..8617787 100644 int filled = 0; int data_size = 8192; char *data = xmalloc (data_size); -@@ -912,14 +919,20 @@ readfile (char *filename, int *sizep, +@@ -909,14 +916,20 @@ readfile (char *filename, int *sizep, /* If they passed the space for the file name to return, use it. */ f = open_possibly_compressed_file (filename, create_callback, opened_filename,
@@ -239,7 +240,7 @@ index e58189c..8617787 100644 if (nread < 0) return 0; if (nread == 0) -@@ -938,8 +951,10 @@ readfile (char *filename, int *sizep, +@@ -935,8 +948,10 @@ readfile (char *filename, int *sizep, /* We need to close the stream, since on some systems the pipe created by popen is simulated by a temporary file which only gets removed inside pclose. */
@@ -251,6 +252,3 @@ index e58189c..8617787 100644 *sizep = filled; return data; --- -2.9.3 -
meta/recipes-extended/texinfo/texinfo_6.7.bb renamed from meta/recipes-extended/texinfo/texinfo_6.5.bb +49 -5
71 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 18/24 sysstat: update to 12.2.0
In reply to Alexander Kanavin--- ...orruption-bug-due-to-Integer-Overflo.patch | 46 ------------------- .../sysstat/sysstat_12.1.6.bb | 11 ----- .../sysstat/sysstat_12.2.0.bb | 10 ++++ 3 files changed, 10 insertions(+), 57 deletions(-) delete mode 100644 meta/recipes-extended/sysstat/sysstat/0001-Fix-232-Memory-corruption-bug-due-to-Integer-Overflo.patch delete mode 100644 meta/recipes-extended/sysstat/sysstat_12.1.6.bb create mode 100644 meta/recipes-extended/sysstat/sysstat_12.2.0.bb
meta/recipes-extended/sysstat/sysstat/0001-Fix-232-Memory-corruption-bug-due-to-Integer-Overflo.patch deleted +0 -46
@@ -1,46 +0,0 @@ -From 603ae4ed8cd65abf0776ef7f68354a5c24a3411c Mon Sep 17 00:00:00 2001 -From: Sebastien GODARD <[email protected]> -Date: Tue, 15 Oct 2019 14:39:33 +0800 -Subject: [PATCH] Fix #232: Memory corruption bug due to Integer Overflow in - remap_struct() - -Try to avoid integer overflow when reading a corrupted binary datafile -with sadf. - -Upstream-Status: Backport [https://github.com/sysstat/sysstat/commit/83fad9c895d1ac13f76af5883b7451b3302beef5] -CVE: CVE-2019-16167 - -Signed-off-by: Sebastien GODARD <[email protected]> -Signed-off-by: Wenlin Kang <[email protected]> ---- - sa_common.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/sa_common.c b/sa_common.c -index 395c11c..cfa9007 100644 ---- a/sa_common.c -+++ b/sa_common.c -@@ -1336,7 +1336,8 @@ int remap_struct(unsigned int gtypes_nr[], unsigned int ftypes_nr[], - /* Remap [unsigned] int fields */ - d = gtypes_nr[1] - ftypes_nr[1]; - if (d) { -- if (ftypes_nr[1] * UL_ALIGNMENT_WIDTH < ftypes_nr[1]) -+ if (gtypes_nr[0] * ULL_ALIGNMENT_WIDTH + -+ ftypes_nr[1] * UL_ALIGNMENT_WIDTH < ftypes_nr[1]) - /* Overflow */ - return -1; - -@@ -1365,7 +1366,9 @@ int remap_struct(unsigned int gtypes_nr[], unsigned int ftypes_nr[], - /* Remap possible fields (like strings of chars) following int fields */ - d = gtypes_nr[2] - ftypes_nr[2]; - if (d) { -- if (ftypes_nr[2] * U_ALIGNMENT_WIDTH < ftypes_nr[2]) -+ if (gtypes_nr[0] * ULL_ALIGNMENT_WIDTH + -+ gtypes_nr[1] * UL_ALIGNMENT_WIDTH + -+ ftypes_nr[2] * U_ALIGNMENT_WIDTH < ftypes_nr[2]) - /* Overflow */ - return -1; - --- -1.9.1 -
meta/recipes-extended/sysstat/sysstat_12.1.6.bb deleted +0 -11
@@ -1,11 +0,0 @@ -require sysstat.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" - -SRC_URI += "file://0001-Include-needed-headers-explicitly.patch \ - file://0001-Fix-232-Memory-corruption-bug-due-to-Integer-Overflo.patch \ - file://0001-configure.in-remove-check-for-chkconfig.patch \ -" - -SRC_URI[md5sum] = "d8e3bbb9c873dd370f6d33664e326570" -SRC_URI[sha256sum] = "f752f3c406153a6fc446496f1102872505ace3f0931d975c1d664c81ec09f129"
meta/recipes-extended/sysstat/sysstat_12.2.0.bb new file +10 -0
@@ -0,0 +1,10 @@ +require sysstat.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" + +SRC_URI += "file://0001-Include-needed-headers-explicitly.patch \ + file://0001-configure.in-remove-check-for-chkconfig.patch \ +" + +SRC_URI[md5sum] = "7deffb18e7f32a0b74ab81f1f75de9ee" +SRC_URI[sha256sum] = "61aa98eb8b38542eb97defcc2472adee1a24df8252f41b96e20d64c6064a8375"
Signature · 1 line
2.17.1
PATCH 19/24 mkfontscale: update to 1.2.1
In reply to Alexander Kanavinmkfontdir utility has been merged into mkfontscale source tree, so a separate recipe is no longer needed (and clashes on install).
License-Update: additional copyright claims from Red Hat and Open Group
---
.../xorg-app/mkfontdir_1.0.7.bb | 22 -------------------
...ontscale_1.1.3.bb => mkfontscale_1.2.1.bb} | 9 +++++---
2 files changed, 6 insertions(+), 25 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb
rename meta/recipes-graphics/xorg-app/{mkfontscale_1.1.3.bb => mkfontscale_1.2.1.bb} (65%)meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb deleted +0 -22
@@ -1,22 +0,0 @@ -require xorg-app-common.inc - -SUMMARY = "A program to create an index of X font files in a directory" - -DESCRIPTION = "For each directory argument, mkfontdir reads all of the \ -font files in the directory. The font names and related data are written \ -out to the files \"fonts.dir\", \"fonts.scale\", and \"fonts.alias\". \ -The X server and font server use these files to find the available font \ -files." - -PE = "1" -PR = "${INC_PR}.0" - -RDEPENDS_${PN} += "mkfontscale" -RDEPENDS_${PN}_class-native += "mkfontscale-native" - -BBCLASSEXTEND = "native" - -LIC_FILES_CHKSUM = "file://COPYING;md5=b4fcf2b90cadbfc15009b9e124dc3a3f" - -SRC_URI[md5sum] = "18c429148c96c2079edda922a2b67632" -SRC_URI[sha256sum] = "56d52a482df130484e51fd066d1b6eda7c2c02ddbc91fe6e2be1b9c4e7306530"
meta/recipes-graphics/xorg-app/mkfontscale_1.2.1.bb renamed from meta/recipes-graphics/xorg-app/mkfontscale_1.1.3.bb +6 -3
@@ -10,9 +10,12 @@ is used by the mkfontdir program." DEPENDS = "util-macros-native zlib libfontenc freetype xorgproto" +PROVIDES += "mkfontdir" +RPROVIDES_${PN} += "mkfontdir" + BBCLASSEXTEND = "native" -LIC_FILES_CHKSUM = "file://COPYING;md5=2e0d129d05305176d1a790e0ac1acb7f" +LIC_FILES_CHKSUM = "file://COPYING;md5=99b1e1269aba5179139b9e4380fc0934" -SRC_URI[md5sum] = "987c438e79f5ddb84a9c5726a1610819" -SRC_URI[sha256sum] = "1e98df69ee5f4542d711e140e1d93e2c3f2775407ccbb7849110d52b91782a6a" +SRC_URI[md5sum] = "215940de158b1a3d8b3f8b442c606e2f" +SRC_URI[sha256sum] = "ca0495eb974a179dd742bfa6199d561bda1c8da4a0c5a667f21fd82aaab6bac7"
Signature · 1 line
2.17.1
PATCH 20/24 libxkbcommon: update to 0.9.1
In reply to Alexander KanavinSwitch over to meson, and add an option for wayland support.
---
...{libxkbcommon_0.8.4.bb => libxkbcommon_0.9.1.bb} | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libxkbcommon_0.8.4.bb => libxkbcommon_0.9.1.bb} (59%)meta/recipes-graphics/xorg-lib/libxkbcommon_0.9.1.bb renamed from meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.4.bb +7 -6
@@ -9,17 +9,18 @@ DEPENDS = "util-macros flex-native bison-native" SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "3c4409058dfd203f641a563358e0187d" -SRC_URI[sha256sum] = "60ddcff932b7fd352752d51a5c4f04f3d0403230a584df9a2e0d5ed87c486c8b" +SRC_URI[md5sum] = "4662756fd73ab0ac9e32efdad8f807f6" +SRC_URI[sha256sum] = "d4c6aabf0a5c1fc616f8a6a65c8a818c03773b9a87da9fbc434da5acd1199be0" UPSTREAM_CHECK_URI = "http://xkbcommon.org/" -inherit autotools pkgconfig +inherit meson pkgconfig -EXTRA_OECONF = "--disable-docs" +EXTRA_OEMESON = "-Denable-docs=false" -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,libxcb xkeyboard-config," +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)}" +PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb xkeyboard-config," +PACKAGECONFIG[wayland] = "-Denable-wayland=true,-Denable-wayland=false,wayland-native wayland wayland-protocols," # Fix a following runtime error: # xkbcommon: ERROR: couldn't find a Compose file for locale "C"
Signature · 1 line
2.17.1
PATCH 21/24 xkeyboard-config: update to 2.28
In reply to Alexander Kanavin---
.../{xkeyboard-config_2.27.bb => xkeyboard-config_2.28.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-lib/{xkeyboard-config_2.27.bb => xkeyboard-config_2.28.bb} (87%)meta/recipes-graphics/xorg-lib/xkeyboard-config_2.28.bb renamed from meta/recipes-graphics/xorg-lib/xkeyboard-config_2.27.bb +2 -2
@@ -13,8 +13,8 @@ LICENSE = "MIT & MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9" SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "316753e35d3906d042c74230612eab9f" -SRC_URI[sha256sum] = "690daec8fea63526c07620c90e6f3f10aae34e94b6db6e30906173480721901f" +SRC_URI[md5sum] = "5a968ab77846ff85a04242410b2a61de" +SRC_URI[sha256sum] = "69adb25b0fc64e4075f8ec0eab8d869892419f474f91fb69db1713de2062bdce" SECTION = "x11/libs" DEPENDS = "util-macros libxslt-native"
Signature · 1 line
2.17.1
PATCH 22/24 debianutils: update to 4.9
In reply to Alexander Kanavin---
.../{debianutils_4.8.6.3.bb => debianutils_4.9.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-support/debianutils/{debianutils_4.8.6.3.bb => debianutils_4.9.bb} (87%)meta/recipes-support/debianutils/debianutils_4.9.bb renamed from meta/recipes-support/debianutils/debianutils_4.8.6.3.bb +3 -3
@@ -3,13 +3,13 @@ SECTION = "base" LICENSE = "GPLv2 & SMAIL_GPL" LIC_FILES_CHKSUM = "file://debian/copyright;md5=f01a5203d50512fc4830b4332b696a9f" -SRC_URI = "http://snapshot.debian.org/archive/debian/20190717T213444Z/pool/main/d/${BPN}/${BPN}_${PV}.tar.xz" +SRC_URI = "http://snapshot.debian.org/archive/debian/20191205T090816Z/pool/main/d/${BPN}/${BPN}_${PV}.tar.xz" # the package is taken from snapshots.debian.org; that source is static and goes stale # so we check the latest upstream from a directory that does get updated UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/" -SRC_URI[md5sum] = "ca57cc6621275346d7d516ab0b5fa1f5" -SRC_URI[sha256sum] = "2cc7de3afc6df1cf6d00af9938efac7ee8f739228e548e512ddc186b6a7be221" +SRC_URI[md5sum] = "bc599768703e594b91d8f6172ce82746" +SRC_URI[sha256sum] = "20975c5cb8cb305f28c2ac35dd99fd9f594f25b6140b5d478a0a364e9fa8073f" inherit autotools update-alternatives
Signature · 1 line
2.17.1
PATCH 23/24 nspr: update to 4.24
In reply to Alexander Kanavin---
meta/recipes-support/nspr/{nspr_4.23.bb => nspr_4.24.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/nspr/{nspr_4.23.bb => nspr_4.24.bb} (96%)meta/recipes-support/nspr/nspr_4.24.bb renamed from meta/recipes-support/nspr/nspr_4.23.bb +2 -2
@@ -23,8 +23,8 @@ CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/" -SRC_URI[md5sum] = "90af0450423b0588f0eba6255c07ab79" -SRC_URI[sha256sum] = "4b9d821037faf5723da901515ed9cac8b23ef1ea3729022259777393453477a4" +SRC_URI[md5sum] = "d630c2111e1db6d2ec2069aad22b4121" +SRC_URI[sha256sum] = "90a59a0df6a11528749647fe18401cc7e03881e3e63c309f8c520ce06dd413d0" CVE_PRODUCT = "netscape_portable_runtime"
Signature · 1 line
2.17.1
PATCH 24/24 sysvinit: update 2.88dsf -> 2.96
In reply to Alexander KanavinRemove 0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch, the problem has been fixed upstream.
Rebase the other patches.
License-Update: copyright years
---
...sue-that-clang-reports-about-mutlipl.patch | 52 ------------
...acros.h-for-major-minor-defines-in-g.patch | 14 +--
.../sysvinit/sysvinit/crypt-lib.patch | 31 ++++---
.../sysvinit/sysvinit/install.patch | 47 ++++++----
.../sysvinit/pidof-add-m-option.patch | 64 +++++++-------
.../sysvinit/sysvinit/realpath.patch | 85 +++++++------------
.../{sysvinit_2.88dsf.bb => sysvinit_2.96.bb} | 20 +++--
7 files changed, 135 insertions(+), 178 deletions(-)
delete mode 100644 meta/recipes-core/sysvinit/sysvinit/0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch
rename meta/recipes-core/sysvinit/{sysvinit_2.88dsf.bb => sysvinit_2.96.bb} (88%)meta/recipes-core/sysvinit/sysvinit/0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch deleted +0 -52
@@ -1,52 +0,0 @@ -From 36ac97bfe51797458442a6035219a504a42e703a Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 21 Aug 2015 10:56:40 -0700 -Subject: [PATCH] This fixes an issue that clang reports about mutliple output - files - -Issue is that we are passing .h file to link step as seen below. - -| arm-oe-linux-gnueabi-clang -march=armv7-a -mthumb -mfloat-abi=hard --mfpu=neon-vfpv4 -mtune=cortex-a7 -D__extern_always_inline=inline --no-integrated-as ---sysroot=/mnt/home/kraj/work/angstrom/sources/openembedded-core/build/tmp-glibc/sysroots/raspberrypi2 --Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed halt.o ifdown.o hddown.o -utmp.o reboot.h -o halt -| clang-3.7: error: cannot specify -o when generating multiple output -files - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <[email protected]> ---- - src/Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index e77ed5f..a6f9f40 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -103,9 +103,9 @@ all: $(BIN) $(SBIN) $(USRBIN) - init: LDLIBS += $(INITLIBS) $(STATIC) - init: init.o init_utmp.o - --halt: halt.o ifdown.o hddown.o utmp.o reboot.h -+halt: halt.o ifdown.o hddown.o utmp.o - --last: last.o oldutmp.h -+last: last.o - - mesg: mesg.o - -@@ -120,7 +120,7 @@ sulogin: sulogin.o - - wall: dowall.o wall.o - --shutdown: dowall.o shutdown.o utmp.o reboot.h -+shutdown: dowall.o shutdown.o utmp.o - - bootlogd: LDLIBS += -lutil - bootlogd: bootlogd.o --- -2.1.4 -
meta/recipes-core/sysvinit/sysvinit/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch +7 -7
@@ -1,4 +1,4 @@ -From 3c29a86f351ea4827dc445bb8e6cb774543c9be6 Mon Sep 17 00:00:00 2001 +From c710a3accd1fabdb671274e1a458405282d51e0c Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 6 Aug 2018 15:38:58 -0700 Subject: [PATCH] include sys/sysmacros.h for major/minor definitions
@@ -13,10 +13,10 @@ Upstream-Status: Pending 3 files changed, 3 insertions(+) diff --git a/src/bootlogd.c b/src/bootlogd.c -index 570d382..68d62f3 100644 +index 787db87..8b07903 100644 --- a/src/bootlogd.c +++ b/src/bootlogd.c -@@ -35,6 +35,7 @@ +@@ -29,6 +29,7 @@ #include <sys/types.h> #include <sys/time.h> #include <sys/stat.h>
@@ -25,7 +25,7 @@ index 570d382..68d62f3 100644 #include <sys/utsname.h> #include <time.h> diff --git a/src/mountpoint.c b/src/mountpoint.c -index 9e3dd9c..91f74ed 100644 +index 5f20522..94df7a1 100644 --- a/src/mountpoint.c +++ b/src/mountpoint.c @@ -25,6 +25,7 @@
@@ -37,7 +37,7 @@ index 9e3dd9c..91f74ed 100644 #include <stdlib.h> #include <string.h> diff --git a/src/shutdown.c b/src/shutdown.c -index 7e997da..17de58d 100644 +index b744a2c..40b7faf 100644 --- a/src/shutdown.c +++ b/src/shutdown.c @@ -40,6 +40,7 @@
@@ -46,5 +46,5 @@ index 7e997da..17de58d 100644 #include <sys/stat.h> +#include <sys/sysmacros.h> #include <sys/wait.h> - #include <time.h> - #include <string.h> + #ifdef __linux__ + #include <sys/sysmacros.h> /* brought in my LFS patch */
meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch +21 -10
@@ -1,3 +1,8 @@ +From 7276275d9a08d5ae268fb263027bbc60bc0ab2e8 Mon Sep 17 00:00:00 2001 +From: Jeff Dike <jdike@x86_64.user-mode-linux.org> +Date: Wed, 14 Jul 2010 14:35:52 -0400 +Subject: [PATCH] sysvinit - Remove sulogin dependency on /usr/lib*/libcrypt.a + Upstream-Status: Inappropriate [configuration] # The src Makefile was checking for libcrypt.a on the host, not in the
@@ -5,21 +10,27 @@ Upstream-Status: Inappropriate [configuration] # and uses it if it's there. # - [email protected] -Index: sysvinit-2.88dsf/src/Makefile -=================================================================== ---- sysvinit-2.88dsf.orig/src/Makefile -+++ sysvinit-2.88dsf/src/Makefile -@@ -85,9 +85,13 @@ else +--- + src/Makefile | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 1380d7f..628e77f 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -97,13 +97,8 @@ else endif # Additional libs for GNU libc. +-ifneq ($(wildcard /usr/lib*/libcrypt.*),) +- SULOGINLIBS += -lcrypt +-endif +- +-# Additional libs for GNU libc / multiarch on Debian based systems. +-ifneq ($(wildcard /usr/lib/*/libcrypt.*),) +- SULOGINLIBS += -lcrypt +ifneq ($(LCRYPT),) + SULOGINLIBS += $(LCRYPT) -+else - ifneq ($(wildcard /usr/lib*/libcrypt.a),) - SULOGINLIBS += -lcrypt endif -+endif all: $(BIN) $(SBIN) $(USRBIN) -
meta/recipes-core/sysvinit/sysvinit/install.patch +30 -17
83 lines not on this page · raw message
meta/recipes-core/sysvinit/sysvinit/pidof-add-m-option.patch +33 -31
156 lines not on this page · raw message
meta/recipes-core/sysvinit/sysvinit/realpath.patch +33 -52
103 lines not on this page · raw message
meta/recipes-core/sysvinit/sysvinit_2.96.bb renamed from meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb +11 -9
@@ -4,16 +4,15 @@ HOMEPAGE = "http://savannah.nongnu.org/projects/sysvinit/" SECTION = "base" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ - file://COPYRIGHT;endline=15;md5=349c872e0066155e1818b786938876a4" -PR = "r14" + file://COPYRIGHT;endline=15;md5=a1d3b3526501d3546d530bbe6ab6cdbe \ + " RDEPENDS_${PN} = "${PN}-inittab" -SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.bz2 \ +SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \ file://install.patch \ file://crypt-lib.patch \ file://pidof-add-m-option.patch \ - file://0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch \ file://realpath.patch \ file://0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch \ file://rcS-default \
@@ -21,10 +20,9 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.bz2 \ file://rcS \ file://bootlogd.init \ file://01_bootlogd \ -" - -SRC_URI[md5sum] = "6eda8a97b86e0a6f59dabbf25202aa6f" -SRC_URI[sha256sum] = "60bbc8c1e1792056e23761d22960b30bb13eccc2cabff8c7310a01f4d5df1519" + " +SRC_URI[md5sum] = "48cebffebf2a96ab09bec14bf9976016" +SRC_URI[sha256sum] = "2a2e26b72aa235a23ab1c8471005f890309ce1196c83fbc9413c57b9ab62b587" S = "${WORKDIR}/sysvinit-${PV}" B = "${S}/src"
@@ -81,7 +79,8 @@ EXTRA_OEMAKE += "'base_bindir=${base_bindir}' \ 'sbindir=${sbindir}' \ 'sysconfdir=${sysconfdir}' \ 'includedir=${includedir}' \ - 'mandir=${mandir}'" + 'mandir=${mandir}' \ + MNTPOINT=yes" do_install () { oe_runmake 'ROOT=${D}' install
@@ -107,4 +106,7 @@ do_install () { chown root:shutdown ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown chmod o-x,u+s ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown + + # Already provided by e2fsprogs; sysvinit's version is a copy from there + rm ${D}${base_sbindir}/logsave }
Signature · 1 line
2.17.1
✗ patchtest: failure for "rpm: upgrade to 4.15.1..." and 23 more
In reply to Alexander Kanavin== Series Details ==
Series: "rpm: upgrade to 4.15.1..." and 23 more
Revision: 1
URL : https://patchwork.openembedded.org/series/21464/
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:
* 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
Quoted 5 lines · Alexander Kanavin
Drop patches that were merged upstream.
0001-mono-find-provides-requires-do-not-use-monodis-from-.patch modifies a file that was removed upstream.
Quoted 7 lines
Add a 0001-rpmfc.c-do-not-run-file-classification-in-parallel.patch as unfortunately the new parallel file classification feature from upstream trips over somewhere in libmagic when inspected files are compressed:
https://github.com/rpm-software-management/rpm/issues/756Signed-off-by Alexander Kanavin <[email protected]>
This patch series (and your following patches) is showing quite a few problems. This gives an idea:
I'm going to drop:
* gettext changes (needs testing in isolation)
* python 3.8 (build failures)
* debianutil upgrade (build failure)
* sysklogd upgrade (build failure)
* atk/at-spi2* (build failures)
* rpm upgrade (load of segfaults in do_package_write_rpm in previous build)
* libtasn upgrade (build failure)
so we can at least try and get the simpler pieces sorted out first...
Cheers,
Richard