Skip to contentSkip to conversation

btrfs-tools: upgrade 5.4.1 -> 5.6.1

PATCH In review Alexander Kanavin 7 participants 100 messages May 31, 2020 – Jun 5, 2020 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/70 btrfs-tools: upgrade 5.4.1 -> 5.6.1

---
 .../btrfs-tools/{btrfs-tools_5.4.1.bb => btrfs-tools_5.6.1.bb}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_5.4.1.bb => btrfs-tools_5.6.1.bb} (97%)
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.6.1.bb renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.4.1.bb +1 -1
similarity index 97%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.4.1.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_5.6.1.bb
index cdc971cf5d..885d79dcdc 100644
@@ -14,7 +14,7 @@ DEPENDS = "util-linux attr e2fsprogs lzo acl"
 DEPENDS_append_class-target = " udev"
 RDEPENDS_${PN} = "libgcc"
 
-SRCREV = "3fc2326d3474a5e4df2449f5e3043f7298501334"
+SRCREV = "2a74d408f4b65d603e42f6e7b6b905ac81825fc9"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
            file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
            "
Signature · 1 line
2.26.2
#1 lore raw

PATCH 2/70 build-compare: upgrade to latest revision

---
 meta/recipes-devtools/build-compare/build-compare_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/build-compare/build-compare_git.bb +2 -2
index d2a4b5444d..74a954db46 100644
@@ -9,9 +9,9 @@ SRC_URI = "git://github.com/openSUSE/build-compare.git"
 
 # Date matches entry in build-compare.changes and date of SRCREV.
 #
-SRCREV = "28bf642fcfdab94adb9b847329338005be6f73c7"
+SRCREV = "102d844ce052c6dec6c56ee1d471bde72a1b4633"
 PE = "1"
-PV = "2020.03.31+git${SRCPV}"
+PV = "2020.05.29+git${SRCPV}"
 UPSTREAM_CHECK_COMMITS = "1"
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.26.2
#2 lore raw

PATCH 3/70 ccache: upgrade 3.7.7 -> 3.7.9

In reply to Alexander Kanavin
---
 meta/recipes-devtools/ccache/ccache_3.7.7.bb | 7 -------
 meta/recipes-devtools/ccache/ccache_3.7.9.bb | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 meta/recipes-devtools/ccache/ccache_3.7.7.bb
 create mode 100644 meta/recipes-devtools/ccache/ccache_3.7.9.bb
meta/recipes-devtools/ccache/ccache_3.7.7.bb deleted +0 -7
deleted file mode 100644
index 3e7362b28b..0000000000
@@ -1,7 +0,0 @@
-require ccache.inc
-
-LICENSE = "GPLv3+"
-LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=22d514dbc01fdf9a9784334b6b59417a"
-
-SRC_URI[md5sum] = "500d7bd9ebc6ee3105d7fc332c1ef395"
-SRC_URI[sha256sum] = "9b61f7fab2ec15305ee8382b03365503232dfb04b57414e7b0433768d530fa8a"
meta/recipes-devtools/ccache/ccache_3.7.9.bb new file +7 -0
new file mode 100644
index 0000000000..a4de6c9fe1
@@ -0,0 +1,7 @@
+require ccache.inc
+
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=22d514dbc01fdf9a9784334b6b59417a"
+
+SRC_URI[md5sum] = "a4a38afc62ed189904357739fd8f3fb8"
+SRC_URI[sha256sum] = "92838e2133c9e704fdab9ee2608dad86c99021278b9ac47d065aa8ff2ea8ce36"
Signature · 1 line
2.26.2
#3 lore raw

PATCH 4/70 createrepo-c: upgrade 0.15.7 -> 0.15.10

In reply to Alexander Kanavin
---
 .../{createrepo-c_0.15.7.bb => createrepo-c_0.15.10.bb}         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/createrepo-c/{createrepo-c_0.15.7.bb => createrepo-c_0.15.10.bb} (95%)
meta/recipes-devtools/createrepo-c/createrepo-c_0.15.10.bb renamed from meta/recipes-devtools/createrepo-c/createrepo-c_0.15.7.bb +1 -1
similarity index 95%
rename from meta/recipes-devtools/createrepo-c/createrepo-c_0.15.7.bb
rename to meta/recipes-devtools/createrepo-c/createrepo-c_0.15.10.bb
index c6a53ffece..13bfa21091 100644
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c \
            file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
            "
 
-SRCREV = "4ab6b56b8b718396386982afba4ade297c14d91a"
+SRCREV = "9f3f3be6359d8f9b6b269e28d9ae1f279cc5f3aa"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.26.2
#4 lore raw

PATCH 5/70 dpkg: upgrade 1.19.7 -> 1.20.0

In reply to Alexander Kanavin
---
 .../dpkg/dpkg/tweak-options-require-tar-1.27.patch    | 11 ++++++++++-
 .../dpkg/{dpkg_1.19.7.bb => dpkg_1.20.0.bb}           |  4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/dpkg/{dpkg_1.19.7.bb => dpkg_1.20.0.bb} (87%)
meta/recipes-devtools/dpkg/dpkg/tweak-options-require-tar-1.27.patch +10 -1
index e9119918b1..ac59dce69e 100644
@@ -1,3 +1,8 @@
+From 48bcc51ce042d1b779b34fae454c52b15bdd9cae Mon Sep 17 00:00:00 2001
+From: Kai Kang <[email protected]>
+Date: Fri, 22 Feb 2019 01:47:16 -0500
+Subject: [PATCH] dpkg: 1.18.25 -> 1.19.4
+
 GNU tar >= 1.27 is required for --owner=NAME:ID and --group=NAME:ID. And fails
 to build .deb packages with error:
 
@@ -11,9 +16,13 @@ Tweak tar options in dpkg-deb source code to make it work on old machines.
 Upstream-Status: Inappropriate [cross build specific]
 
 Signed-off-by: Kai Kang <[email protected]>
+
 ---
+ dpkg-deb/build.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
-index 68d187511..86fe22e25 100644
+index 8436839..67c0c20 100644
 --- a/dpkg-deb/build.c
 +++ b/dpkg-deb/build.c
 @@ -462,7 +462,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
meta/recipes-devtools/dpkg/dpkg_1.20.0.bb renamed from meta/recipes-devtools/dpkg/dpkg_1.19.7.bb +2 -2
similarity index 87%
rename from meta/recipes-devtools/dpkg/dpkg_1.19.7.bb
rename to meta/recipes-devtools/dpkg/dpkg_1.20.0.bb
index 50fe54dee1..1e822bbdf5 100644
@@ -19,5 +19,5 @@ SRC_URI_append_class-native = " \
                                 file://tweak-options-require-tar-1.27.patch \
 "
 
-SRC_URI[md5sum] = "60f57c5494e6dfa177504d47bfa0e383"
-SRC_URI[sha256sum] = "4c27fededf620c0aa522fff1a48577ba08144445341257502e7730f2b1a296e8"
+SRC_URI[md5sum] = "f88f077236a3ff3decae3b25c989893d"
+SRC_URI[sha256sum] = "b633cc2b0e030efb61e11029d8a3fb1123f719864c9992da2e52b471c96d0900"
Signature · 1 line
2.26.2
#5 lore raw

PATCH 6/70 librepo: upgrade 1.11.2 -> 1.11.3

In reply to Alexander Kanavin
---
 .../librepo/{librepo_1.11.2.bb => librepo_1.11.3.bb}            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/librepo/{librepo_1.11.2.bb => librepo_1.11.3.bb} (93%)
meta/recipes-devtools/librepo/librepo_1.11.3.bb renamed from meta/recipes-devtools/librepo/librepo_1.11.2.bb +1 -1
similarity index 93%
rename from meta/recipes-devtools/librepo/librepo_1.11.2.bb
rename to meta/recipes-devtools/librepo/librepo_1.11.3.bb
index 6a0a59f865..3e745314a8 100644
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/librepo.git \
            file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \
            "
 
-SRCREV = "67c2d1f83f1bf87be3f26ba730fce7fbdf0c9fba"
+SRCREV = "59b3f76ca6e79786a213cda72ecafa232d30553f"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.26.2
#6 lore raw

PATCH 7/70 python3-numpy: upgrade 1.18.3 -> 1.18.4

In reply to Alexander Kanavin
---
 meta/recipes-devtools/python-numpy/python-numpy.inc           | 4 ++--
 .../{python3-numpy_1.18.3.bb => python3-numpy_1.18.4.bb}      | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python-numpy/{python3-numpy_1.18.3.bb => python3-numpy_1.18.4.bb} (100%)
meta/recipes-devtools/python-numpy/python-numpy.inc +2 -2
index 0bff979a6b..6a437e7c3c 100644
@@ -9,8 +9,8 @@ SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${S
            file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \
            file://0001-convert-shebang-from-python-to-python3.patch \
            "
-SRC_URI[md5sum] = "cd631c761f141d382b4e1b31c8232fc0"
-SRC_URI[sha256sum] = "93ee59ec38f3bf8f9a42d5f4301f60e6825a4a6385a145f70badcd2bf2a11134"
+SRC_URI[md5sum] = "70e6c294f8dffa8d630eda1b0d42ae4d"
+SRC_URI[sha256sum] = "e0781ec6627e85f2a618478ee278893343fb8b40577b4c74b2ec15c7a5b8f698"
 
 UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
meta/recipes-devtools/python-numpy/python3-numpy_1.18.4.bb renamed from meta/recipes-devtools/python-numpy/python3-numpy_1.18.3.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/python-numpy/python3-numpy_1.18.3.bb
rename to meta/recipes-devtools/python-numpy/python3-numpy_1.18.4.bb
Signature · 1 line
2.26.2
#7 lore raw

PATCH 8/70 python3-cython: upgrade 0.29.16 -> 0.29.19

In reply to Alexander Kanavin
---
 meta/recipes-devtools/python/python-cython.inc                 | 3 +--
 .../{python3-cython_0.29.16.bb => python3-cython_0.29.19.bb}   | 0
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python3-cython_0.29.16.bb => python3-cython_0.29.19.bb} (100%)
meta/recipes-devtools/python/python-cython.inc +1 -2
index 437e796629..eee567ed2c 100644
@@ -7,8 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa"
 PYPI_PACKAGE = "Cython"
 BBCLASSEXTEND = "native nativesdk"
 
-SRC_URI[md5sum] = "a899abaa48b68bb679aef45ceb4b89d3"
-SRC_URI[sha256sum] = "232755284f942cbb3b43a06cd85974ef3c970a021aef19b5243c03ee2b08fa05"
+SRC_URI[sha256sum] = "97f98a7dc0d58ea833dc1f8f8b3ce07adf4c0f030d1886c5399a2135ed415258"
 UPSTREAM_CHECK_REGEX = "Cython-(?P<pver>.*)\.tar"
 
 inherit pypi
meta/recipes-devtools/python/python3-cython_0.29.19.bb renamed from meta/recipes-devtools/python/python3-cython_0.29.16.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/python/python3-cython_0.29.16.bb
rename to meta/recipes-devtools/python/python3-cython_0.29.19.bb
Signature · 1 line
2.26.2
#8 lore raw

PATCH 9/70 python3-gitdb: upgrade 4.0.4 -> 4.0.5

In reply to Alexander Kanavin
---
 meta/recipes-devtools/python/python-gitdb.inc       | 2 +-
 meta/recipes-devtools/python/python3-gitdb_4.0.4.bb | 3 ---
 meta/recipes-devtools/python/python3-gitdb_4.0.5.bb | 4 ++++
 3 files changed, 5 insertions(+), 4 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python3-gitdb_4.0.4.bb
 create mode 100644 meta/recipes-devtools/python/python3-gitdb_4.0.5.bb
meta/recipes-devtools/python/python-gitdb.inc +1 -1
index a91bb32c3b..618d85ff8d 100644
@@ -8,7 +8,7 @@ inherit pypi
 
 PYPI_PACKAGE = "gitdb"
 
-SRC_URI[sha256sum] = "6f0ecd46f99bb4874e5678d628c3a198e2b4ef38daea2756a2bfd8df7dd5c1a5"
+SRC_URI[sha256sum] = "c9e1f2d0db7ddb9a704c2a0217be31214e91a4fe1dea1efad19ae42ba0c285c9"
 
 DEPENDS = "${PYTHON_PN}-async ${PYTHON_PN}-setuptools-native ${PYTHON_PN}-smmap"
 
meta/recipes-devtools/python/python3-gitdb_4.0.4.bb deleted +0 -3
deleted file mode 100644
index 2dcd9c8aff..0000000000
@@ -1,3 +0,0 @@
-inherit setuptools3
-require python-gitdb.inc
-
meta/recipes-devtools/python/python3-gitdb_4.0.5.bb new file +4 -0
new file mode 100644
index 0000000000..fe56bf9640
@@ -0,0 +1,4 @@
+inherit setuptools3
+require python-gitdb.inc
+
+SRC_URI[md5sum] = "0e2d3f34efece5deda7c55fede6507cc"
Signature · 1 line
2.26.2
#9 lore raw

PATCH 10/70 python3-mako: upgrade 1.1.1 -> 1.1.3

In reply to Alexander Kanavin
---
 .../python/{python3-mako_1.1.1.bb => python3-mako_1.1.3.bb}    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python3-mako_1.1.1.bb => python3-mako_1.1.3.bb} (75%)
meta/recipes-devtools/python/python3-mako_1.1.3.bb renamed from meta/recipes-devtools/python/python3-mako_1.1.1.bb +1 -2
similarity index 75%
rename from meta/recipes-devtools/python/python3-mako_1.1.1.bb
rename to meta/recipes-devtools/python/python3-mako_1.1.3.bb
index bc38009de4..cda4e99220 100644
@@ -8,8 +8,7 @@ PYPI_PACKAGE = "Mako"
 
 inherit pypi setuptools3
 
-SRC_URI[md5sum] = "2660a4916f2f63456e6885c727b7cd2f"
-SRC_URI[sha256sum] = "2984a6733e1d472796ceef37ad48c26f4a984bb18119bb2dbc37a44d8f6e75a4"
+SRC_URI[sha256sum] = "8195c8c1400ceb53496064314c6736719c6f25e7479cd24c77be3d9361cddc27"
 
 RDEPENDS_${PN} = "${PYTHON_PN}-html \
                   ${PYTHON_PN}-netclient \
Signature · 1 line
2.26.2
#10 lore raw

PATCH 11/70 python3-pygments: upgrade 2.5.2 -> 2.6.1

In reply to Alexander Kanavin
---
 .../{python3-pygments_2.5.2.bb => python3-pygments_2.6.1.bb}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python3-pygments_2.5.2.bb => python3-pygments_2.6.1.bb} (75%)
meta/recipes-devtools/python/python3-pygments_2.6.1.bb renamed from meta/recipes-devtools/python/python3-pygments_2.5.2.bb +2 -2
similarity index 75%
rename from meta/recipes-devtools/python/python3-pygments_2.5.2.bb
rename to meta/recipes-devtools/python/python3-pygments_2.6.1.bb
index 474b95494a..bffef59e69 100644
@@ -5,8 +5,8 @@ LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e1d7b7bffbfeaa14083fd2bd3236aea8"
 
 inherit setuptools3
-SRC_URI[md5sum] = "465a35559863089d959d783a69f79b9f"
-SRC_URI[sha256sum] = "98c8aa5a9f778fcd1026a17361ddaf7330d1b7c62ae97c3bb0ae73e0b9b6b0fe"
+SRC_URI[md5sum] = "a48c5219de92f12c41acba814730b31a"
+SRC_URI[sha256sum] = "647344a061c249a3b74e230c739f434d7ea4d8b1d5f3721bc0f3558049b38f44"
 
 DEPENDS += "\
             ${PYTHON_PN} \
Signature · 1 line
2.26.2
#11 lore raw

PATCH 12/70 python3-pygobject: upgrade 3.34.0 -> 3.36.1

In reply to Alexander Kanavin
---
 ...ython3-pygobject_3.34.0.bb => python3-pygobject_3.36.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python3-pygobject_3.34.0.bb => python3-pygobject_3.36.1.bb} (87%)
meta/recipes-devtools/python/python3-pygobject_3.36.1.bb renamed from meta/recipes-devtools/python/python3-pygobject_3.34.0.bb +2 -2
similarity index 87%
rename from meta/recipes-devtools/python/python3-pygobject_3.34.0.bb
rename to meta/recipes-devtools/python/python3-pygobject_3.36.1.bb
index 6babf0cae8..0a34d4373f 100644
@@ -14,8 +14,8 @@ SRC_URI = " \
     http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz \
     file://0001-Do-not-build-tests.patch \
 "
-SRC_URI[md5sum] = "ca1dc4f31c1d6d283758e8f315a88ab6"
-SRC_URI[sha256sum] = "87e2c9aa785f352ef111dcc5f63df9b85cf6e05e52ff04f803ffbebdacf5271a"
+SRC_URI[md5sum] = "ebfebc4533856572281add29f08412bf"
+SRC_URI[sha256sum] = "d1bf42802d1cec113b5adaa0e7bf7f3745b44521dc2163588d276d5cd61d718f"
 
 UNKNOWN_CONFIGURE_WHITELIST = "introspection"
 
Signature · 1 line
2.26.2
#12 lore raw

PATCH 13/70 python3-smmap: upgrade 2.0.5 -> 3.0.4

In reply to Alexander Kanavin
---
 meta/recipes-devtools/python/python-smmap.inc                | 5 ++---
 .../{python3-smmap_2.0.5.bb => python3-smmap_3.0.4.bb}       | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/python/{python3-smmap_2.0.5.bb => python3-smmap_3.0.4.bb} (97%)
meta/recipes-devtools/python/python-smmap.inc +2 -3
index b878b4b399..7703722bca 100644
@@ -9,10 +9,9 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665
 
 inherit pypi
 
-PYPI_PACKAGE = "smmap2"
+PYPI_PACKAGE = "smmap"
 
-SRC_URI[md5sum] = "1c59a985be5aa645c4c5a4e063a40dd5"
-SRC_URI[sha256sum] = "29a9ffa0497e7f2be94ca0ed1ca1aa3cd4cf25a1f6b4f5f87f74b46ed91d609a"
+SRC_URI[sha256sum] = "9c98bbd1f9786d22f14b3d4126894d56befb835ec90cef151af566c7e19b5d24"
 
 RDEPENDS_${PN} += "${PYTHON_PN}-codecs \
                    ${PYTHON_PN}-mmap \
meta/recipes-devtools/python/python3-smmap_3.0.4.bb renamed from meta/recipes-devtools/python/python3-smmap_2.0.5.bb +1 -0
similarity index 97%
rename from meta/recipes-devtools/python/python3-smmap_2.0.5.bb
rename to meta/recipes-devtools/python/python3-smmap_3.0.4.bb
index e87b8df8c5..5f0f341d6a 100644
@@ -1,2 +1,3 @@
 inherit setuptools3
 require python-smmap.inc
+
Signature · 1 line
2.26.2
#13 lore raw

PATCH 14/70 python3-subunit: upgrade 1.3.0 -> 1.4.0

In reply to Alexander Kanavin
---
 meta/recipes-devtools/python/python-subunit.inc               | 4 ++--
 .../{python3-subunit_1.3.0.bb => python3-subunit_1.4.0.bb}    | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python3-subunit_1.3.0.bb => python3-subunit_1.4.0.bb} (100%)
meta/recipes-devtools/python/python-subunit.inc +2 -2
index afaaa51fa5..fc63b38aaf 100644
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://README.rst;beginline=1;endline=20;md5=909c08e291647fd
 
 PYPI_PACKAGE = "python-subunit"
 
-SRC_URI[md5sum] = "16d468a3aeafe6c60a0c3b2b9132d65b"
-SRC_URI[sha256sum] = "9607edbee4c1e5a30ff88549ce8d9feb0b9bcbcb5e55033a9d76e86075465cbb"
+SRC_URI[md5sum] = "30f1ab20651d94442dd9a7f8c9e8d633"
+SRC_URI[sha256sum] = "042039928120fbf392e8c983d60f3d8ae1b88f90a9f8fd7188ddd9c26cad1e48"
 
 inherit pypi
 
meta/recipes-devtools/python/python3-subunit_1.4.0.bb renamed from meta/recipes-devtools/python/python3-subunit_1.3.0.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/python/python3-subunit_1.3.0.bb
rename to meta/recipes-devtools/python/python3-subunit_1.4.0.bb
Signature · 1 line
2.26.2
#14 lore raw

PATCH 15/70 python3-testtools: upgrade 2.3.0 -> 2.4.0

In reply to Alexander Kanavin
---
 meta/recipes-devtools/python/python-testtools.inc             | 4 ++--
 ...{python3-testtools_2.3.0.bb => python3-testtools_2.4.0.bb} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python3-testtools_2.3.0.bb => python3-testtools_2.4.0.bb} (100%)
meta/recipes-devtools/python/python-testtools.inc +2 -2
index d0b2e46d7b..f1f1e26468 100644
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e2c9d3e8ba7141c83bfef190e0b9379a"
 
 inherit pypi
 
-SRC_URI[md5sum] = "0f0feb915497816cb99e39437494217e"
-SRC_URI[sha256sum] = "5827ec6cf8233e0f29f51025addd713ca010061204fdea77484a2934690a0559"
+SRC_URI[md5sum] = "e8fc7185b47cfb908c641f8c4b2a6add"
+SRC_URI[sha256sum] = "64c974a6cca4385d05f4bbfa2deca1c39ce88ede31c3448bee86a7259a9a61c8"
 
 DEPENDS += " \
     ${PYTHON_PN}-pbr \
meta/recipes-devtools/python/python3-testtools_2.4.0.bb renamed from meta/recipes-devtools/python/python3-testtools_2.3.0.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/python/python3-testtools_2.3.0.bb
rename to meta/recipes-devtools/python/python3-testtools_2.4.0.bb
Signature · 1 line
2.26.2
#15 lore raw

PATCH 16/70 python3: upgrade 3.8.2 -> 3.8.3

In reply to Alexander Kanavin
---
 ...20-8492-Fix-AbstractBasicAuthHandler.patch | 248 ------------------
 ...-search-system-for-headers-libraries.patch |   8 +-
 ...fig-append-STAGING_LIBDIR-python-sys.patch |   2 +-
 ...tutils-prefix-is-inside-staging-area.patch |   2 +-
 .../{python3_3.8.2.bb => python3_3.8.3.bb}    |   5 +-
 5 files changed, 7 insertions(+), 258 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/files/0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch
 rename meta/recipes-devtools/python/{python3_3.8.2.bb => python3_3.8.3.bb} (98%)
meta/recipes-devtools/python/files/0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch deleted +0 -248
deleted file mode 100644
index e16b99bcb9..0000000000
@@ -1,248 +0,0 @@
-From 0b297d4ff1c0e4480ad33acae793fbaf4bf015b4 Mon Sep 17 00:00:00 2001
-From: Victor Stinner <[email protected]>
-Date: Thu, 2 Apr 2020 02:52:20 +0200
-Subject: [PATCH] bpo-39503: CVE-2020-8492: Fix AbstractBasicAuthHandler
- (GH-18284)
-
-Upstream-Status: Backport
-(https://github.com/python/cpython/commit/0b297d4ff1c0e4480ad33acae793fbaf4bf015b4)
-
-CVE: CVE-2020-8492
-
-The AbstractBasicAuthHandler class of the urllib.request module uses
-an inefficient regular expression which can be exploited by an
-attacker to cause a denial of service. Fix the regex to prevent the
-catastrophic backtracking. Vulnerability reported by Ben Caller
-and Matt Schwager.
-
-AbstractBasicAuthHandler of urllib.request now parses all
-WWW-Authenticate HTTP headers and accepts multiple challenges per
-header: use the realm of the first Basic challenge.
-
-Co-Authored-By: Serhiy Storchaka <[email protected]>
-Signed-off-by: Trevor Gamblin <[email protected]>
----
- Lib/test/test_urllib2.py                      | 90 ++++++++++++-------
- Lib/urllib/request.py                         | 69 ++++++++++----
- .../2020-03-25-16-02-16.bpo-39503.YmMbYn.rst  |  3 +
- .../2020-01-30-16-15-29.bpo-39503.B299Yq.rst  |  5 ++
- 4 files changed, 115 insertions(+), 52 deletions(-)
- create mode 100644 Misc/NEWS.d/next/Library/2020-03-25-16-02-16.bpo-39503.YmMbYn.rst
- create mode 100644 Misc/NEWS.d/next/Security/2020-01-30-16-15-29.bpo-39503.B299Yq.rst
-
-diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
-index 8abedaac98..e69ac3e213 100644
---- a/Lib/test/test_urllib2.py
-+++ b/Lib/test/test_urllib2.py
-@@ -1446,40 +1446,64 @@ class HandlerTests(unittest.TestCase):
-         bypass = {'exclude_simple': True, 'exceptions': []}
-         self.assertTrue(_proxy_bypass_macosx_sysconf('test', bypass))
- 
--    def test_basic_auth(self, quote_char='"'):
--        opener = OpenerDirector()
--        password_manager = MockPasswordManager()
--        auth_handler = urllib.request.HTTPBasicAuthHandler(password_manager)
--        realm = "ACME Widget Store"
--        http_handler = MockHTTPHandler(
--            401, 'WWW-Authenticate: Basic realm=%s%s%s\r\n\r\n' %
--            (quote_char, realm, quote_char))
--        opener.add_handler(auth_handler)
--        opener.add_handler(http_handler)
--        self._test_basic_auth(opener, auth_handler, "Authorization",
--                              realm, http_handler, password_manager,
--                              "http://acme.example.com/protected",
--                              "http://acme.example.com/protected",
--                              )
--
--    def test_basic_auth_with_single_quoted_realm(self):
--        self.test_basic_auth(quote_char="'")
--
--    def test_basic_auth_with_unquoted_realm(self):
--        opener = OpenerDirector()
--        password_manager = MockPasswordManager()
--        auth_handler = urllib.request.HTTPBasicAuthHandler(password_manager)
--        realm = "ACME Widget Store"
--        http_handler = MockHTTPHandler(
--            401, 'WWW-Authenticate: Basic realm=%s\r\n\r\n' % realm)
--        opener.add_handler(auth_handler)
--        opener.add_handler(http_handler)
--        with self.assertWarns(UserWarning):
-+    def check_basic_auth(self, headers, realm):
-+        with self.subTest(realm=realm, headers=headers):
-+            opener = OpenerDirector()
-+            password_manager = MockPasswordManager()
-+            auth_handler = urllib.request.HTTPBasicAuthHandler(password_manager)
-+            body = '\r\n'.join(headers) + '\r\n\r\n'
-+            http_handler = MockHTTPHandler(401, body)
-+            opener.add_handler(auth_handler)
-+            opener.add_handler(http_handler)
-             self._test_basic_auth(opener, auth_handler, "Authorization",
--                                realm, http_handler, password_manager,
--                                "http://acme.example.com/protected",
--                                "http://acme.example.com/protected",
--                                )
-+                                  realm, http_handler, password_manager,
-+                                  "http://acme.example.com/protected",
-+                                  "http://acme.example.com/protected")
-+
-+    def test_basic_auth(self):
-+        realm = "[email protected]"
-+        realm2 = "[email protected]"
-+        basic = f'Basic realm="{realm}"'
-+        basic2 = f'Basic realm="{realm2}"'
-+        other_no_realm = 'Otherscheme xxx'
-+        digest = (f'Digest realm="{realm2}", '
-+                  f'qop="auth, auth-int", '
-+                  f'nonce="dcd98b7102dd2f0e8b11d0f600bfb0c093", '
-+                  f'opaque="5ccc069c403ebaf9f0171e9517f40e41"')
-+        for realm_str in (
-+            # test "quote" and 'quote'
-+            f'Basic realm="{realm}"',
-+            f"Basic realm='{realm}'",
-+
-+            # charset is ignored
-+            f'Basic realm="{realm}", charset="UTF-8"',
-+
-+            # Multiple challenges per header
-+            f'{basic}, {basic2}',
-+            f'{basic}, {other_no_realm}',
-+            f'{other_no_realm}, {basic}',
-+            f'{basic}, {digest}',
-+            f'{digest}, {basic}',
-+        ):
-+            headers = [f'WWW-Authenticate: {realm_str}']
-+            self.check_basic_auth(headers, realm)
-+
-+        # no quote: expect a warning
-+        with support.check_warnings(("Basic Auth Realm was unquoted",
-+                                     UserWarning)):
-+            headers = [f'WWW-Authenticate: Basic realm={realm}']
-+            self.check_basic_auth(headers, realm)
-+
-+        # Multiple headers: one challenge per header.
-+        # Use the first Basic realm.
-+        for challenges in (
-+            [basic,  basic2],
-+            [basic,  digest],
-+            [digest, basic],
-+        ):
-+            headers = [f'WWW-Authenticate: {challenge}'
-+                       for challenge in challenges]
-+            self.check_basic_auth(headers, realm)
- 
-     def test_proxy_basic_auth(self):
-         opener = OpenerDirector()
-diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
-index 7fe50535da..2a3d71554f 100644
---- a/Lib/urllib/request.py
-+++ b/Lib/urllib/request.py
-@@ -937,8 +937,15 @@ class AbstractBasicAuthHandler:
- 
-     # allow for double- and single-quoted realm values
-     # (single quotes are a violation of the RFC, but appear in the wild)
--    rx = re.compile('(?:.*,)*[ \t]*([^ \t]+)[ \t]+'
--                    'realm=(["\']?)([^"\']*)\\2', re.I)
-+    rx = re.compile('(?:^|,)'   # start of the string or ','
-+                    '[ \t]*'    # optional whitespaces
-+                    '([^ \t]+)' # scheme like "Basic"
-+                    '[ \t]+'    # mandatory whitespaces
-+                    # realm=xxx
-+                    # realm='xxx'
-+                    # realm="xxx"
-+                    'realm=(["\']?)([^"\']*)\\2',
-+                    re.I)
- 
-     # XXX could pre-emptively send auth info already accepted (RFC 2617,
-     # end of section 2, and section 1.2 immediately after "credentials"
-@@ -950,27 +957,51 @@ class AbstractBasicAuthHandler:
-         self.passwd = password_mgr
-         self.add_password = self.passwd.add_password
- 
-+    def _parse_realm(self, header):
-+        # parse WWW-Authenticate header: accept multiple challenges per header
-+        found_challenge = False
-+        for mo in AbstractBasicAuthHandler.rx.finditer(header):
-+            scheme, quote, realm = mo.groups()
-+            if quote not in ['"', "'"]:
-+                warnings.warn("Basic Auth Realm was unquoted",
-+                              UserWarning, 3)
-+
-+            yield (scheme, realm)
-+
-+            found_challenge = True
-+
-+        if not found_challenge:
-+            if header:
-+                scheme = header.split()[0]
-+            else:
-+                scheme = ''
-+            yield (scheme, None)
-+
-     def http_error_auth_reqed(self, authreq, host, req, headers):
-         # host may be an authority (without userinfo) or a URL with an
-         # authority
--        # XXX could be multiple headers
--        authreq = headers.get(authreq, None)
-+        headers = headers.get_all(authreq)
-+        if not headers:
-+            # no header found
-+            return
- 
--        if authreq:
--            scheme = authreq.split()[0]
--            if scheme.lower() != 'basic':
--                raise ValueError("AbstractBasicAuthHandler does not"
--                                 " support the following scheme: '%s'" %
--                                 scheme)
--            else:
--                mo = AbstractBasicAuthHandler.rx.search(authreq)
--                if mo:
--                    scheme, quote, realm = mo.groups()
--                    if quote not in ['"',"'"]:
--                        warnings.warn("Basic Auth Realm was unquoted",
--                                      UserWarning, 2)
--                    if scheme.lower() == 'basic':
--                        return self.retry_http_basic_auth(host, req, realm)
-+        unsupported = None
-+        for header in headers:
-+            for scheme, realm in self._parse_realm(header):
-+                if scheme.lower() != 'basic':
-+                    unsupported = scheme
-+                    continue
-+
-+                if realm is not None:
-+                    # Use the first matching Basic challenge.
-+                    # Ignore following challenges even if they use the Basic
-+                    # scheme.
-+                    return self.retry_http_basic_auth(host, req, realm)
-+
-+        if unsupported is not None:
-+            raise ValueError("AbstractBasicAuthHandler does not "
-+                             "support the following scheme: %r"
-+                             % (scheme,))
- 
-     def retry_http_basic_auth(self, host, req, realm):
-         user, pw = self.passwd.find_user_password(realm, host)
-diff --git a/Misc/NEWS.d/next/Library/2020-03-25-16-02-16.bpo-39503.YmMbYn.rst b/Misc/NEWS.d/next/Library/2020-03-25-16-02-16.bpo-39503.YmMbYn.rst
-new file mode 100644
-index 0000000000..be80ce79d9
---- /dev/null
-+++ b/Misc/NEWS.d/next/Library/2020-03-25-16-02-16.bpo-39503.YmMbYn.rst
-@@ -0,0 +1,3 @@
-+:class:`~urllib.request.AbstractBasicAuthHandler` of :mod:`urllib.request`
-+now parses all WWW-Authenticate HTTP headers and accepts multiple challenges
-+per header: use the realm of the first Basic challenge.
-diff --git a/Misc/NEWS.d/next/Security/2020-01-30-16-15-29.bpo-39503.B299Yq.rst b/Misc/NEWS.d/next/Security/2020-01-30-16-15-29.bpo-39503.B299Yq.rst
-new file mode 100644
-index 0000000000..9f2800581c
---- /dev/null
-+++ b/Misc/NEWS.d/next/Security/2020-01-30-16-15-29.bpo-39503.B299Yq.rst
-@@ -0,0 +1,5 @@
-+CVE-2020-8492: The :class:`~urllib.request.AbstractBasicAuthHandler` class of the
-+:mod:`urllib.request` module uses an inefficient regular expression which can
-+be exploited by an attacker to cause a denial of service. Fix the regex to
-+prevent the catastrophic backtracking. Vulnerability reported by Ben Caller
-+and Matt Schwager.
--- 
-2.24.1
-
meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch +3 -5
index acf8e1e9b5..3e471b9a49 100644
@@ -1,16 +1,17 @@
-From 85e8f86ad2b7dec0848cd55b8e810a5e2722b20a Mon Sep 17 00:00:00 2001
+From b880e78bf4a1852e260188e6df3ec6034403d2fc Mon Sep 17 00:00:00 2001
 From: Jeremy Puhlman <[email protected]>
 Date: Wed, 4 Mar 2020 00:06:42 +0000
 Subject: [PATCH] Don't search system for headers/libraries
 
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Jeremy Puhlman <[email protected]>
+
 ---
  setup.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 9da1b3a..59782c0 100644
+index 7208cd0..c0bd0ad 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -674,8 +674,8 @@ class PyBuildExt(build_ext):
@@ -24,6 +25,3 @@ index 9da1b3a..59782c0 100644
          # lib_dirs and inc_dirs are used to search for files;
          # if a file is found in one of those directories, it can
          # be assumed that no additional -I,-L directives are needed.
--- 
-2.24.1
-
meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch +1 -1
index e7af3c6f5c..2b68c0acc2 100644
@@ -1,4 +1,4 @@
-From 7ada9c749f6beb51c13a3debc850755e911548a6 Mon Sep 17 00:00:00 2001
+From bc59d49efff41051034d7fbf5d0c8505e4c3134b 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/12-distutils-prefix-is-inside-staging-area.patch +1 -1
index 61ac3e71dc..820fb98ed8 100644
@@ -1,4 +1,4 @@
-From 251347fc970a397a9cd63ed3f87c5e6c52e15187 Mon Sep 17 00:00:00 2001
+From 064187668fcbefdd39a8cde372bf651124c3e578 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_3.8.3.bb renamed from meta/recipes-devtools/python/python3_3.8.2.bb +2 -3
similarity index 98%
rename from meta/recipes-devtools/python/python3_3.8.2.bb
rename to meta/recipes-devtools/python/python3_3.8.3.bb
index 0474f07214..4367923b55 100644
@@ -32,7 +32,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
            file://0001-configure.ac-fix-LIBPL.patch \
            file://0001-python3-Do-not-hardcode-lib-for-distutils.patch \
            file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \
-           file://0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch \
            "
 
 SRC_URI_append_class-native = " \
@@ -41,8 +40,8 @@ SRC_URI_append_class-native = " \
            file://0001-Don-t-search-system-for-headers-libraries.patch \
            "
 
-SRC_URI[md5sum] = "e9d6ebc92183a177b8e8a58cad5b8d67"
-SRC_URI[sha256sum] = "2646e7dc233362f59714c6193017bb2d6f7b38d6ab4a0cb5fbac5c36c4d845df"
+SRC_URI[md5sum] = "3000cf50aaa413052aef82fd2122ca78"
+SRC_URI[sha256sum] = "dfab5ec723c218082fe3d5d7ae17ecbdebffa9a1aea4d64aa3a2ecdd2e795864"
 
 # exclude pre-releases for both python 2.x and 3.x
 UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
Signature · 1 line
2.26.2
#16 lore raw

PATCH 17/70 strace: upgrade 5.5 -> 5.6

In reply to Alexander Kanavin
---
 .../strace/{strace_5.5.bb => strace_5.6.bb}                 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/strace/{strace_5.5.bb => strace_5.6.bb} (90%)
meta/recipes-devtools/strace/strace_5.6.bb renamed from meta/recipes-devtools/strace/strace_5.5.bb +3 -3
similarity index 90%
rename from meta/recipes-devtools/strace/strace_5.5.bb
rename to meta/recipes-devtools/strace/strace_5.6.bb
index ae552da028..53679cd0d2 100644
@@ -15,8 +15,8 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
            file://uintptr_t.patch \
            file://0001-strace-fix-reproducibilty-issues.patch \
            "
-SRC_URI[md5sum] = "dbce2e84632b39a4ed86b9fc60447af9"
-SRC_URI[sha256sum] = "9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff"
+SRC_URI[md5sum] = "f8e0394d4e537b3faadf0a72f5d1d17e"
+SRC_URI[sha256sum] = "189968eeae06ed9e20166ec55a830943c84374676a457c9fe010edc7541f1b01"
 
 inherit autotools ptest
 
@@ -27,7 +27,7 @@ PACKAGECONFIG_class-target ??= "\
 PACKAGECONFIG[bluez] = "ac_cv_header_bluetooth_bluetooth_h=yes,ac_cv_header_bluetooth_bluetooth_h=no,bluez5"
 PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind"
 
-EXTRA_OECONF += "--enable-mpers=no"
+EXTRA_OECONF += "--enable-mpers=no --disable-gcc-Werror"
 
 CFLAGS_append_libc-musl = " -Dsigcontext_struct=sigcontext"
 
Signature · 1 line
2.26.2
#17 lore raw

Re: [OE-core] [PATCH 17/70] strace: upgrade 5.5 -> 5.6

Quoted 35 lines · Alexander Kanavin
---
 .../strace/{strace_5.5.bb => strace_5.6.bb}                 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/strace/{strace_5.5.bb => strace_5.6.bb}

(90%)

meta/recipes-devtools/strace/strace_5.6.bb renamed from meta/recipes-devtools/strace/strace_5.5.bb +0 -2
similarity index 90%
rename from meta/recipes-devtools/strace/strace_5.5.bb
rename to meta/recipes-devtools/strace/strace_5.6.bb
index ae552da028..53679cd0d2 100644
@@ -15,8 +15,8 @@ SRC_URI = "
 https://strace.io/files/${PV}/strace-${PV}.tar.xz \
            file://uintptr_t.patch \
            file://0001-strace-fix-reproducibilty-issues.patch \
            "
-SRC_URI[md5sum] = "dbce2e84632b39a4ed86b9fc60447af9"
-SRC_URI[sha256sum] =

"9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff"

meta/recipes-devtools/strace/strace_5.6.bb renamed from meta/recipes-devtools/strace/strace_5.5.bb +2 -0
+SRC_URI[md5sum] = "f8e0394d4e537b3faadf0a72f5d1d17e"
+SRC_URI[sha256sum] =

"189968eeae06ed9e20166ec55a830943c84374676a457c9fe010edc7541f1b01"

inherit autotools ptest

meta/recipes-devtools/strace/strace_5.6.bb renamed from meta/recipes-devtools/strace/strace_5.5.bb +0 -0
@@ -27,7 +27,7 @@ PACKAGECONFIG_class-target ??= "\
 PACKAGECONFIG[bluez] =

"ac_cv_header_bluetooth_bluetooth_h=yes,ac_cv_header_bluetooth_bluetooth_h=no,bluez5"
PACKAGECONFIG[libunwind] =
"--with-libunwind,--without-libunwind,libunwind"

meta/recipes-devtools/strace/strace_5.6.bb PACKAGECONFIG_class-target ??= "\ · line 30

Quoted 2 lines
meta/recipes-devtools/strace/strace_5.6.bb renamed from meta/recipes-devtools/strace/strace_5.5.bb +1 -1
-EXTRA_OECONF += "--enable-mpers=no"
+EXTRA_OECONF += "--enable-mpers=no --disable-gcc-Werror"

Why is this needed ? Perhaps description in comment will help

Quoted 8 lines

CFLAGS_append_libc-musl = " -Dsigcontext_struct=sigcontext"

--
2.26.2

#18 lore raw

Re: [OE-core] [PATCH 17/70] strace: upgrade 5.5 -> 5.6

Upstream builds with -Werror by default, which this switch disables.

Alex

Quoted 56 lines · Khem Raj
Quoted 35 lines · Alexander Kanavin
---
 .../strace/{strace_5.5.bb => strace_5.6.bb}                 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/strace/{strace_5.5.bb => strace_5.6.bb}

(90%)

meta/recipes-devtools/strace/strace_5.6.bb renamed from meta/recipes-devtools/strace/strace_5.5.bb +0 -2
similarity index 90%
rename from meta/recipes-devtools/strace/strace_5.5.bb
rename to meta/recipes-devtools/strace/strace_5.6.bb
index ae552da028..53679cd0d2 100644
@@ -15,8 +15,8 @@ SRC_URI = "
 https://strace.io/files/${PV}/strace-${PV}.tar.xz \
            file://uintptr_t.patch \
            file://0001-strace-fix-reproducibilty-issues.patch \
            "
-SRC_URI[md5sum] = "dbce2e84632b39a4ed86b9fc60447af9"
-SRC_URI[sha256sum] =

"9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff"

meta/recipes-devtools/strace/strace_5.6.bb renamed from meta/recipes-devtools/strace/strace_5.5.bb +2 -0
+SRC_URI[md5sum] = "f8e0394d4e537b3faadf0a72f5d1d17e"
+SRC_URI[sha256sum] =

"189968eeae06ed9e20166ec55a830943c84374676a457c9fe010edc7541f1b01"

inherit autotools ptest

meta/recipes-devtools/strace/strace_5.6.bb renamed from meta/recipes-devtools/strace/strace_5.5.bb +0 -0
@@ -27,7 +27,7 @@ PACKAGECONFIG_class-target ??= "\
 PACKAGECONFIG[bluez] =

"ac_cv_header_bluetooth_bluetooth_h=yes,ac_cv_header_bluetooth_bluetooth_h=no,bluez5"
PACKAGECONFIG[libunwind] =
"--with-libunwind,--without-libunwind,libunwind"

meta/recipes-devtools/strace/strace_5.6.bb PACKAGECONFIG_class-target ??= "\ · line 30

Quoted 2 lines
meta/recipes-devtools/strace/strace_5.6.bb renamed from meta/recipes-devtools/strace/strace_5.5.bb +1 -1
-EXTRA_OECONF += "--enable-mpers=no"
+EXTRA_OECONF += "--enable-mpers=no --disable-gcc-Werror"

Why is this needed ? Perhaps description in comment will help

Quoted 8 lines

CFLAGS_append_libc-musl = " -Dsigcontext_struct=sigcontext"

--
2.26.2

#19 lore raw

Re: [OE-core] [PATCH 17/70] strace: upgrade 5.5 -> 5.6

Quoted 3 lines · Alexander Kanavin

Upstream builds with -Werror by default, which this switch disables.

I gathered as much, However, it will be good to document the errors or even better
let upstream know about them since they maybe interested to fix them.

Quoted 50 lines

Alex

Quoted 47 lines · Khem Raj
Quoted 26 lines · Alexander Kanavin
---
 .../strace/{strace_5.5.bb => strace_5.6.bb}                 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/strace/{strace_5.5.bb => strace_5.6.bb} (90%)
meta/recipes-devtools/strace/strace_5.6.bb renamed from meta/recipes-devtools/strace/strace_5.5.bb +2 -2
similarity index 90%
rename from meta/recipes-devtools/strace/strace_5.5.bb
rename to meta/recipes-devtools/strace/strace_5.6.bb
index ae552da028..53679cd0d2 100644
@@ -15,8 +15,8 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
            file://uintptr_t.patch \
            file://0001-strace-fix-reproducibilty-issues.patch \
            "
-SRC_URI[md5sum] = "dbce2e84632b39a4ed86b9fc60447af9"
-SRC_URI[sha256sum] = "9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff"
+SRC_URI[md5sum] = "f8e0394d4e537b3faadf0a72f5d1d17e"
+SRC_URI[sha256sum] = "189968eeae06ed9e20166ec55a830943c84374676a457c9fe010edc7541f1b01"
 
 inherit autotools ptest
 

meta/recipes-devtools/strace/strace_5.6.bb PACKAGECONFIG_class-target ??= "\ · line 30

Quoted 5 lines
meta/recipes-devtools/strace/strace_5.6.bb renamed from meta/recipes-devtools/strace/strace_5.5.bb +1 -1
@@ -27,7 +27,7 @@ PACKAGECONFIG_class-target ??= "\
 PACKAGECONFIG[bluez] = "ac_cv_header_bluetooth_bluetooth_h=yes,ac_cv_header_bluetooth_bluetooth_h=no,bluez5"
 PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind"
 
-EXTRA_OECONF += "--enable-mpers=no"
+EXTRA_OECONF += "--enable-mpers=no --disable-gcc-Werror"

Why is this needed ? Perhaps description in comment will help

Quoted 8 lines
meta/recipes-devtools/strace/strace_5.6.bb renamed from meta/recipes-devtools/strace/strace_5.5.bb +0 -1
 CFLAGS_append_libc-musl = " -Dsigcontext_struct=sigcontext"
 
--

2.26.2

#20 lore raw

PATCH 18/70 vala: upgrade 0.46.6 -> 0.48.6

In reply to Alexander Kanavin
---
 meta/recipes-devtools/vala/{vala_0.46.6.bb => vala_0.48.6.bb} | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta/recipes-devtools/vala/{vala_0.46.6.bb => vala_0.48.6.bb} (57%)
meta/recipes-devtools/vala/vala_0.48.6.bb renamed from meta/recipes-devtools/vala/vala_0.46.6.bb +1 -2
similarity index 57%
rename from meta/recipes-devtools/vala/vala_0.46.6.bb
rename to meta/recipes-devtools/vala/vala_0.48.6.bb
index 66f620384c..9dace1348c 100644
@@ -4,5 +4,4 @@ SRC_URI += "file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.pat
            file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \
            "
 
-SRC_URI[md5sum] = "d9af125648505503b139ebc2d2c9eee5"
-SRC_URI[sha256sum] = "ef31649932872f094971d46453b21c60a41661670f98afa334062425b4aec47a"
+SRC_URI[sha256sum] = "d18d08ed030ce0e0f044f4c15c9df3c25b15beaf8700e45e43b736a6debf9707"
Signature · 1 line
2.26.2
#21 lore raw

Re: [OE-core] [PATCH 18/70] vala: upgrade 0.46.6 -> 0.48.6

gnome-calculator fails https://errors.yoctoproject.org/Errors/Details/414868/

Quoted 25 lines · Alexander Kanavin
---
 meta/recipes-devtools/vala/{vala_0.46.6.bb => vala_0.48.6.bb} | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta/recipes-devtools/vala/{vala_0.46.6.bb => vala_0.48.6.bb} (57%)
meta/recipes-devtools/vala/vala_0.48.6.bb renamed from meta/recipes-devtools/vala/vala_0.46.6.bb +1 -3
similarity index 57%
rename from meta/recipes-devtools/vala/vala_0.46.6.bb
rename to meta/recipes-devtools/vala/vala_0.48.6.bb
index 66f620384c..9dace1348c 100644
@@ -4,5 +4,4 @@ SRC_URI += "file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.pat
            file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \
            "
 
-SRC_URI[md5sum] = "d9af125648505503b139ebc2d2c9eee5"
-SRC_URI[sha256sum] = "ef31649932872f094971d46453b21c60a41661670f98afa334062425b4aec47a"
+SRC_URI[sha256sum] = "d18d08ed030ce0e0f044f4c15c9df3c25b15beaf8700e45e43b736a6debf9707"
--

2.26.2

#23 lore raw

PATCH 19/70 cups: upgrade 2.3.1 -> 2.3.3

In reply to Alexander Kanavin
---
 meta/recipes-extended/cups/cups_2.3.1.bb | 6 ------
 meta/recipes-extended/cups/cups_2.3.3.bb | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 meta/recipes-extended/cups/cups_2.3.1.bb
 create mode 100644 meta/recipes-extended/cups/cups_2.3.3.bb
meta/recipes-extended/cups/cups_2.3.1.bb deleted +0 -6
deleted file mode 100644
index f5230faf81..0000000000
@@ -1,6 +0,0 @@
-require cups.inc
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI[md5sum] = "8ad8897c97cf4d90f20dac4318f47421"
-SRC_URI[sha256sum] = "1bca9d89507e3f68cbc84482fe46ae8d5333af5bc2b9061347b2007182ac77ce"
meta/recipes-extended/cups/cups_2.3.3.bb new file +6 -0
new file mode 100644
index 0000000000..5caeb6f58b
@@ -0,0 +1,6 @@
+require cups.inc
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+SRC_URI[md5sum] = "412434ceefbdf3ec71bc9188a035f589"
+SRC_URI[sha256sum] = "261fd948bce8647b6d5cb2a1784f0c24cc52b5c4e827b71d726020bcc502f3ee"
Signature · 1 line
2.26.2
#24 lore raw

PATCH 20/70 gawk: upgrade 5.0.1 -> 5.1.0

In reply to Alexander Kanavin
---
 meta/recipes-extended/gawk/{gawk_5.0.1.bb => gawk_5.1.0.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/gawk/{gawk_5.0.1.bb => gawk_5.1.0.bb} (91%)
meta/recipes-extended/gawk/gawk_5.1.0.bb renamed from meta/recipes-extended/gawk/gawk_5.0.1.bb +2 -2
similarity index 91%
rename from meta/recipes-extended/gawk/gawk_5.0.1.bb
rename to meta/recipes-extended/gawk/gawk_5.1.0.bb
index e79ccfdebf..0d005cd43b 100644
@@ -19,8 +19,8 @@ SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \
            file://run-ptest \
 "
 
-SRC_URI[md5sum] = "c5441c73cc451764055ee65e9a4292bb"
-SRC_URI[sha256sum] = "625bf3718e25a84dc4486135d5cb5388174682362c70107fd13f21572f5603bb"
+SRC_URI[md5sum] = "f719bc9966df28e67fc6ebc405e7ea03"
+SRC_URI[sha256sum] = "03a0360edcd84bec156fe211bbc4fc8c78790973ce4e8b990a11d778d40b1a26"
 
 inherit autotools gettext texinfo update-alternatives
 
Signature · 1 line
2.26.2
#25 lore raw

PATCH 21/70 libsolv: upgrade 0.7.10 -> 0.7.14

In reply to Alexander Kanavin
---
 .../libsolv/{libsolv_0.7.10.bb => libsolv_0.7.14.bb}          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/libsolv/{libsolv_0.7.10.bb => libsolv_0.7.14.bb} (84%)
meta/recipes-extended/libsolv/libsolv_0.7.14.bb renamed from meta/recipes-extended/libsolv/libsolv_0.7.10.bb +2 -2
similarity index 84%
rename from meta/recipes-extended/libsolv/libsolv_0.7.10.bb
rename to meta/recipes-extended/libsolv/libsolv_0.7.14.bb
index 265a27c00d..5179d4565a 100644
@@ -10,7 +10,7 @@ DEPENDS = "expat zlib"
 SRC_URI = "git://github.com/openSUSE/libsolv.git \
 "
 
-SRCREV = "605dd2645ef899e2b7c95709476fb51e28d7e378"
+SRCREV = "b264537ea43ce39d93d8d97fcca16e97825beaa0"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
 
@@ -19,7 +19,7 @@ S = "${WORKDIR}/git"
 inherit cmake
 
 PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGE_CLASSES','package_rpm','rpm','',d)}"
-PACKAGECONFIG[rpm] = "-DENABLE_RPMMD=ON -DENABLE_RPMDB=ON,,rpm"
+PACKAGECONFIG[rpm] = "-DENABLE_RPMMD=ON -DENABLE_RPMDB=ON -DENABLE_RPMDB_BDB=ON,,rpm"
 
 EXTRA_OECMAKE = "-DMULTI_SEMANTICS=ON -DENABLE_COMPLEX_DEPS=ON"
 
Signature · 1 line
2.26.2
#26 lore raw

PATCH 22/70 man-pages: upgrade 5.05 -> 5.06

In reply to Alexander Kanavin
---
 .../man-pages/{man-pages_5.05.bb => man-pages_5.06.bb}        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/man-pages/{man-pages_5.05.bb => man-pages_5.06.bb} (87%)
meta/recipes-extended/man-pages/man-pages_5.06.bb renamed from meta/recipes-extended/man-pages/man-pages_5.05.bb +2 -2
similarity index 87%
rename from meta/recipes-extended/man-pages/man-pages_5.05.bb
rename to meta/recipes-extended/man-pages/man-pages_5.06.bb
index b95872eb4d..0d632e6170 100644
@@ -7,8 +7,8 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://README;md5=794f701617cc03fe50c53257660d8ec4"
 SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz"
 
-SRC_URI[md5sum] = "cdad5deb15117e60a6d9e3a6bdc035b5"
-SRC_URI[sha256sum] = "43c33d2eea9ba989c18eef90298cf6d5521ff038deb51cda0ecd0fdc3cec2b7d"
+SRC_URI[md5sum] = "ebddb52ea013c160f07fd0a4a7e9266d"
+SRC_URI[sha256sum] = "da4e939c624bec4bab8ca1702e5f54bbc70505090d90967fd5e12bc1453f19b0"
 
 inherit manpages
 
Signature · 1 line
2.26.2
#27 lore raw

PATCH 23/70 msmtp: upgrade 1.8.8 -> 1.8.10

In reply to Alexander Kanavin
---
 .../msmtp/{msmtp_1.8.8.bb => msmtp_1.8.10.bb}                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/msmtp/{msmtp_1.8.8.bb => msmtp_1.8.10.bb} (86%)
meta/recipes-extended/msmtp/msmtp_1.8.10.bb renamed from meta/recipes-extended/msmtp/msmtp_1.8.8.bb +2 -2
similarity index 86%
rename from meta/recipes-extended/msmtp/msmtp_1.8.8.bb
rename to meta/recipes-extended/msmtp/msmtp_1.8.10.bb
index ca359a1507..42cf6309e9 100644
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 UPSTREAM_CHECK_URI = "https://marlam.de/msmtp/download/"
 
 SRC_URI = "https://marlam.de/${BPN}/releases/${BP}.tar.xz"
-SRC_URI[md5sum] = "016e432d12e12dc5d73960e2bc67f0fb"
-SRC_URI[sha256sum] = "eccb53e48f025f7e6f60210316df61cf6097a491728341c1e375fc1acc6459e5"
+SRC_URI[md5sum] = "168430e48f351b5a157ad930d7db3ecc"
+SRC_URI[sha256sum] = "caba7f39d19df7a31782fe7336dd640c61ea33b92f987bd5423bca9683482f10"
 
 inherit gettext autotools update-alternatives pkgconfig
 
Signature · 1 line
2.26.2
#28 lore raw

PATCH 24/70 stress-ng: upgrade 0.11.01 -> 0.11.12

In reply to Alexander Kanavin
---
 .../stress-ng/{stress-ng_0.11.01.bb => stress-ng_0.11.12.bb}   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta/recipes-extended/stress-ng/{stress-ng_0.11.01.bb => stress-ng_0.11.12.bb} (83%)
meta/recipes-extended/stress-ng/stress-ng_0.11.12.bb renamed from meta/recipes-extended/stress-ng/stress-ng_0.11.01.bb +1 -2
similarity index 83%
rename from meta/recipes-extended/stress-ng/stress-ng_0.11.01.bb
rename to meta/recipes-extended/stress-ng/stress-ng_0.11.12.bb
index 3486be1b03..ba93efc4c8 100644
@@ -8,8 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 SRC_URI = "https://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \
            file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \
            "
-SRC_URI[md5sum] = "a558fc7fb9d0a851afe6de09080b5401"
-SRC_URI[sha256sum] = "9fe19548c87aa1a1b9b2be3b359ec2621b88bcb16998b77527549a7736f65494"
+SRC_URI[sha256sum] = "0ccf437ca1876a3e8a55986c6481697045203a17f5994cb2f5096cd461d18031"
 
 DEPENDS = "coreutils-native"
 
Signature · 1 line
2.26.2
#29 lore raw

PATCH 25/70 stress-ng: mark as incompatible with musl

In reply to Alexander Kanavin

Newer versions make use of ustat() which is absent in musl.

---
 meta/recipes-extended/stress-ng/stress-ng_0.11.12.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-extended/stress-ng/stress-ng_0.11.12.bb +2 -0
index ba93efc4c8..45f4bb41ad 100644
@@ -22,3 +22,5 @@ inherit bash-completion
 do_install() {
     oe_runmake DESTDIR=${D} install
 }
+
+COMPATIBLE_HOST_libc-musl = 'null'
Signature · 1 line
2.26.2
#30 lore raw

Re: [OE-core] [PATCH 25/70] stress-ng: mark as incompatible with musl

Quoted 2 lines · Alexander Kanavin

Newer versions make use of ustat() which is absent in musl.

https://www.man7.org/linux/man-pages/man2/ustat.2.html

Says it’s removed from glibc 2.28 as well and yes musl never shipped ustat.h so I wonder how it still
Works on glibc

Quoted 22 lines
---
 meta/recipes-extended/stress-ng/stress-ng_0.11.12.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-extended/stress-ng/stress-ng_0.11.12.bb +2 -1
index ba93efc4c8..45f4bb41ad 100644
@@ -22,3 +22,5 @@ inherit bash-completion
 do_install() {
     oe_runmake DESTDIR=${D} install
 }
+
+COMPATIBLE_HOST_libc-musl = 'null'
--

2.26.2

#31 lore raw

Re: [OE-core] [PATCH 25/70] stress-ng: mark as incompatible with musl

Quoted 5 lines · Khem Raj

On Sun, May 31, 2020 at 8:54 AM Alexander Kanavin <[email protected]> wrote:

Quoted 9 lines
Quoted 2 lines

Newer versions make use of ustat() which is absent in musl.

https://www.man7.org/linux/man-pages/man2/ustat.2.html

Says it’s removed from glibc 2.28 as well and yes musl never shipped ustat.h so I wonder how it still
Works on glibc

I think stress-ng pokes into members of struct ustat (daddr_t in particular), which works on glibc, but doesn't work on musl.

Alex

#32 lore raw

PATCH 26/70 sudo: upgrade 1.8.31 -> 1.9.0

In reply to Alexander Kanavin

License-Update: additional copyright statements, all BSD

---
 meta/recipes-extended/sudo/sudo.inc                          | 2 +-
 meta/recipes-extended/sudo/{sudo_1.8.31.bb => sudo_1.9.0.bb} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-extended/sudo/{sudo_1.8.31.bb => sudo_1.9.0.bb} (92%)
meta/recipes-extended/sudo/sudo.inc +1 -1
index 5d27d46928..86a18be7e2 100644
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sudo.ws"
 BUGTRACKER = "http://www.sudo.ws/bugs/"
 SECTION = "admin"
 LICENSE = "ISC & BSD & Zlib"
-LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=4d1b44b1576eea036d78b8cc961aa93d \
+LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=828cd502ad216ff869bf83adf3301e02 \
                     file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=03e35317699ba00b496251e0dfe9f109 \
                     file://lib/util/reallocarray.c;beginline=3;endline=15;md5=397dd45c7683e90b9f8bf24638cf03bf \
                     file://lib/util/fnmatch.c;beginline=3;endline=27;md5=004d7d2866ba1f5b41174906849d2e0f \
meta/recipes-extended/sudo/sudo_1.9.0.bb renamed from meta/recipes-extended/sudo/sudo_1.8.31.bb +2 -2
similarity index 92%
rename from meta/recipes-extended/sudo/sudo_1.8.31.bb
rename to meta/recipes-extended/sudo/sudo_1.9.0.bb
index 39d8817c32..76266537b6 100644
@@ -7,8 +7,8 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \
 
 PAM_SRC_URI = "file://sudo.pam"
 
-SRC_URI[md5sum] = "ce17ff6e72a70f8d5dabba8abf3cd2de"
-SRC_URI[sha256sum] = "7ea8d97a3cee4c844e0887ea7a1bd80eb54cc98fd77966776cb1a80653ad454f"
+SRC_URI[md5sum] = "060b91a6b171cb7ce587222664549b2c"
+SRC_URI[sha256sum] = "ab231439c5dfdf4ecbef74f10d5f7e9686c2255c2f3887085b5c5e13281bf95c"
 
 DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"
Signature · 1 line
2.26.2
#33 lore raw

PATCH 27/70 adwaita-icon-theme: upgrade 3.34.3 -> 3.36.1

In reply to Alexander Kanavin
---
 .../0001-Don-t-use-AC_CANONICAL_HOST.patch                  | 6 +++---
 ...ta-icon-theme_3.34.3.bb => adwaita-icon-theme_3.36.1.bb} | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename meta/recipes-gnome/gnome/{adwaita-icon-theme_3.34.3.bb => adwaita-icon-theme_3.36.1.bb} (92%)
meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch +3 -3
index 372f144be0..5da3fbf6d8 100644
@@ -1,4 +1,4 @@
-From 4409423752885f76326d05c1266698155f47c5f9 Mon Sep 17 00:00:00 2001
+From 0a867caa8803a78f7cf3a204c4c358bc63daaf28 Mon Sep 17 00:00:00 2001
 From: Jussi Kukkonen <[email protected]>
 Date: Tue, 30 May 2017 14:55:49 +0300
 Subject: [PATCH] Don't use AC_CANONICAL_HOST
@@ -14,12 +14,12 @@ Signed-off-by: Jussi Kukkonen <[email protected]>
  1 file changed, 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 4a84501..52dbb8e 100644
+index e749112..58790e8 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -3,7 +3,6 @@ AC_PREREQ(2.53)
  
- AC_INIT([adwaita-icon-theme], [3.34.3],
+ AC_INIT([adwaita-icon-theme], [3.36.1],
          [http://bugzilla.gnome.org/enter_bug.cgi?product=adwaita-icon-theme])
 -AC_CANONICAL_HOST
  AC_CONFIG_MACRO_DIR([m4])
meta/recipes-gnome/gnome/adwaita-icon-theme_3.36.1.bb renamed from meta/recipes-gnome/gnome/adwaita-icon-theme_3.34.3.bb +2 -2
similarity index 92%
rename from meta/recipes-gnome/gnome/adwaita-icon-theme_3.34.3.bb
rename to meta/recipes-gnome/gnome/adwaita-icon-theme_3.36.1.bb
index 3a2727b701..473e1fc0be 100644
@@ -14,8 +14,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
            file://0001-Run-installation-commands-as-shell-jobs.patch \
            "
 
-SRC_URI[md5sum] = "9aea4ad9bc002aacad155ee0748b357f"
-SRC_URI[sha256sum] = "e7c2d8c259125d5f35ec09522b88c8fe7ecf625224ab0811213ef0a95d90b908"
+SRC_URI[md5sum] = "c61ca9d6b3ce70a9ab66dcff945923ff"
+SRC_URI[sha256sum] = "e498518627044dfd7db7d79a5b3d437848caf1991ef4ef036a2d3a2ac2c1f14d"
 
 DEPENDS += "librsvg-native"
 
Signature · 1 line
2.26.2
#34 lore raw

PATCH 28/70 gtk+3: upgrade 3.24.14 -> 3.24.20

In reply to Alexander Kanavin
---
 meta/recipes-gnome/gtk+/gtk+3.inc             |  1 +
 .../gtk+/gtk+3/sort-resources.patch           | 19 -------------------
 .../{gtk+3_3.24.14.bb => gtk+3_3.24.20.bb}    |  7 +++----
 3 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch
 rename meta/recipes-gnome/gtk+/{gtk+3_3.24.14.bb => gtk+3_3.24.20.bb} (79%)
meta/recipes-gnome/gtk+/gtk+3.inc +1 -0
index 6154154004..e1ecf504a0 100644
@@ -106,6 +106,7 @@ FILES_${PN}_append = " ${bindir}/gtk-update-icon-cache-3.0 \
 FILES_${PN}-dev += " \
                     ${datadir}/gtk-3.0/gtkbuilder.rng \
                     ${datadir}/gtk-3.0/include \
+                    ${datadir}/gtk-3.0/valgrind \
                     ${datadir}/gettext/its \
                     ${libdir}/gtk-3.0/include \
                     ${libdir}/gtk-3.0/${LIBV}/loaders/*.la \
meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch deleted +0 -19
deleted file mode 100644
index 7f87372c52..0000000000
@@ -1,19 +0,0 @@
-If the resources file isn't sorted in some way then libgdk.so will differ
-depending on the inode order of the resource files.
-
-Upstream-Status: Pending
-Signed-off-by: Ross Burton <[email protected]>
-
-diff --git a/gdk/Makefile.am b/gdk/Makefile.am
-index e25b57ba50..26f2d57c6e 100644
---- a/gdk/Makefile.am
-+++ b/gdk/Makefile.am
-@@ -465,7 +465,7 @@ stamp-gc-h: $(top_builddir)/config.status
- # Resources
- #
- 
--glsl_sources := $(wildcard $(srcdir)/resources/glsl/*.glsl)
-+glsl_sources := $(sort $(wildcard $(srcdir)/resources/glsl/*.glsl))
- 
- gdk.gresource.xml: Makefile.am
- 	$(AM_V_GEN) echo "<?xml version='1.0' encoding='UTF-8'?>" > $@; \
meta/recipes-gnome/gtk+/gtk+3_3.24.20.bb renamed from meta/recipes-gnome/gtk+/gtk+3_3.24.14.bb +3 -4
similarity index 79%
rename from meta/recipes-gnome/gtk+/gtk+3_3.24.14.bb
rename to meta/recipes-gnome/gtk+/gtk+3_3.24.20.bb
index ab1f87c22e..e5744a4b05 100644
@@ -7,10 +7,9 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar
            file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \
            file://0003-Add-disable-opengl-configure-option.patch \
            file://link_fribidi.patch \
-           file://sort-resources.patch \
-          "
-SRC_URI[md5sum] = "62e39212fa0a84016a3392a9d291faf8"
-SRC_URI[sha256sum] = "1c4d69f93ab884fd80c6b95115bfbc12d51ecd029178b6dad3672fdc5ff91e88"
+           "
+SRC_URI[md5sum] = "b302acc0a4b42e2980ef18628f9ce951"
+SRC_URI[sha256sum] = "2dac69f716e8d04ba7a95091589e2baaec95dcace932cb15839163db479b1df3"
 
 S = "${WORKDIR}/gtk+-${PV}"
 
Signature · 1 line
2.26.2
#35 lore raw

PATCH 29/70 cogl-1.0: upgrade 1.22.4 -> 1.22.6

In reply to Alexander Kanavin
---
 meta/recipes-graphics/cogl/cogl-1.0_1.22.4.bb | 6 ------
 meta/recipes-graphics/cogl/cogl-1.0_1.22.6.bb | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 meta/recipes-graphics/cogl/cogl-1.0_1.22.4.bb
 create mode 100644 meta/recipes-graphics/cogl/cogl-1.0_1.22.6.bb
meta/recipes-graphics/cogl/cogl-1.0_1.22.4.bb deleted +0 -6
deleted file mode 100644
index 8e61c19f5d..0000000000
@@ -1,6 +0,0 @@
-require cogl-1.0.inc
-
-SRC_URI[archive.md5sum] = "31755015a865c4af51ac84f6e53af8ab"
-SRC_URI[archive.sha256sum] = "5217bf94cbca3df63268a3b79d017725382b9e592b891d1e7dc6212590ce0de0"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84"
meta/recipes-graphics/cogl/cogl-1.0_1.22.6.bb new file +6 -0
new file mode 100644
index 0000000000..86bbdbff69
@@ -0,0 +1,6 @@
+require cogl-1.0.inc
+
+SRC_URI[archive.md5sum] = "7bcc01edb5462d4d08d01bf893feddb0"
+SRC_URI[archive.sha256sum] = "6d134bd3e48c067507167c001200b275997fb9c68b08b48ff038211c8c251b75"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84"
Signature · 1 line
2.26.2
#36 lore raw

PATCH 30/70 mesa: upgrade 20.0.2 -> 20.0.7

In reply to Alexander Kanavin
---
 meta/recipes-graphics/mesa/{mesa_20.0.2.bb => mesa_20.0.7.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/mesa/{mesa_20.0.2.bb => mesa_20.0.7.bb} (88%)
meta/recipes-graphics/mesa/mesa_20.0.7.bb renamed from meta/recipes-graphics/mesa/mesa_20.0.2.bb +2 -2
similarity index 88%
rename from meta/recipes-graphics/mesa/mesa_20.0.2.bb
rename to meta/recipes-graphics/mesa/mesa_20.0.7.bb
index ee0260e073..420565808e 100644
@@ -9,8 +9,8 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
            file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
            "
 
-SRC_URI[md5sum] = "31ca59cd92c38cb8e1a58b62b01c3e08"
-SRC_URI[sha256sum] = "aa54f1cb669550606aab8ceb475105d15aeb814fca5a778ce70d0fd10e98e86f"
+SRC_URI[md5sum] = "609cb7664204e031d4c65c602c652a28"
+SRC_URI[sha256sum] = "fe6e258fe772c3cd2ac01741bf7408058c3ac02d66acff9a6e669bd72e3ea178"
 
 UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
 
Signature · 1 line
2.26.2
#37 lore raw

PATCH 31/70 mesa: merge the .bb content into .inc

In reply to Alexander Kanavin

This allows automated version updates to the recipe, as mesa-gl.bb no longer has to include the main mesa.bb.

Bump mesa-gl to 20.0.7 at the same time.

---
 .../{mesa-gl_20.0.2.bb => mesa-gl_20.0.7.bb}  |  2 +-
 meta/recipes-graphics/mesa/mesa.inc           | 22 +++++++++++++++++++
 meta/recipes-graphics/mesa/mesa_20.0.7.bb     | 22 -------------------
 3 files changed, 23 insertions(+), 23 deletions(-)
 rename meta/recipes-graphics/mesa/{mesa-gl_20.0.2.bb => mesa-gl_20.0.7.bb} (96%)
meta/recipes-graphics/mesa/mesa-gl_20.0.7.bb renamed from meta/recipes-graphics/mesa/mesa-gl_20.0.2.bb +1 -1
similarity index 96%
rename from meta/recipes-graphics/mesa/mesa-gl_20.0.2.bb
rename to meta/recipes-graphics/mesa/mesa-gl_20.0.7.bb
index c7897cdaf3..e50782be1c 100644
@@ -1,4 +1,4 @@
-require mesa_${PV}.bb
+require mesa.inc
 
 SUMMARY += " (OpenGL only, no EGL/GLES)"
 
meta/recipes-graphics/mesa/mesa.inc +22 -0
index bb43a9a8b6..965e12d17e 100644
@@ -14,6 +14,28 @@ LIC_FILES_CHKSUM = "file://docs/license.html;md5=c1843d93c460bbf778d6037ce324f9f
 
 PE = "2"
 
+SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
+           file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \
+           file://0002-meson.build-make-TLS-ELF-optional.patch \
+           file://0003-Allow-enable-DRI-without-DRI-drivers.patch \
+           file://0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch \
+           file://0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch \
+           file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
+           "
+
+SRC_URI[md5sum] = "609cb7664204e031d4c65c602c652a28"
+SRC_URI[sha256sum] = "fe6e258fe772c3cd2ac01741bf7408058c3ac02d66acff9a6e669bd72e3ea178"
+
+UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
+
+#because we cannot rely on the fact that all apps will use pkgconfig,
+#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
+do_install_append() {
+    if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
+        sed -i -e 's/^#elif defined(__unix__) && defined(EGL_NO_X11)$/#elif defined(__unix__) \&\& defined(EGL_NO_X11) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
+    fi
+}
+
 DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native zlib chrpath-replacement-native python3-mako-native gettext-native"
 EXTRANATIVEPATH += "chrpath-native"
 PROVIDES = " \
meta/recipes-graphics/mesa/mesa_20.0.7.bb +0 -22
index 420565808e..d17d9eb04b 100644
@@ -1,23 +1 @@
 require ${BPN}.inc
-
-SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
-           file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \
-           file://0002-meson.build-make-TLS-ELF-optional.patch \
-           file://0003-Allow-enable-DRI-without-DRI-drivers.patch \
-           file://0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch \
-           file://0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch \
-           file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
-           "
-
-SRC_URI[md5sum] = "609cb7664204e031d4c65c602c652a28"
-SRC_URI[sha256sum] = "fe6e258fe772c3cd2ac01741bf7408058c3ac02d66acff9a6e669bd72e3ea178"
-
-UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
-
-#because we cannot rely on the fact that all apps will use pkgconfig,
-#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
-do_install_append() {
-    if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
-        sed -i -e 's/^#elif defined(__unix__) && defined(EGL_NO_X11)$/#elif defined(__unix__) \&\& defined(EGL_NO_X11) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
-    fi
-}
Signature · 1 line
2.26.2
#38 lore raw

PATCH 32/70 piglit: upgrade to latest revision

In reply to Alexander Kanavin
---
 meta/recipes-graphics/piglit/piglit_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/piglit/piglit_git.bb +1 -1
index 58d10d6b9b..47950c8633 100644
@@ -10,7 +10,7 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https \
            "
 UPSTREAM_CHECK_COMMITS = "1"
 
-SRCREV = "6126c2d4e476c7770d216ffa1932c10e2a5a7813"
+SRCREV = "5cc4fd749375f37e8e8725a86072d8cff7173b98"
 # (when PV goes above 1.0 remove the trailing r)
 PV = "1.0+gitr${SRCPV}"
 
Signature · 1 line
2.26.2
#39 lore raw

PATCH 33/70 waffle: upgrade 1.6.0 -> 1.6.1

In reply to Alexander Kanavin
---
 .../waffle/{waffle_1.6.0.bb => waffle_1.6.1.bb}               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/waffle/{waffle_1.6.0.bb => waffle_1.6.1.bb} (92%)
meta/recipes-graphics/waffle/waffle_1.6.1.bb renamed from meta/recipes-graphics/waffle/waffle_1.6.0.bb +2 -2
similarity index 92%
rename from meta/recipes-graphics/waffle/waffle_1.6.0.bb
rename to meta/recipes-graphics/waffle/waffle_1.6.1.bb
index a620295978..3f3c0e9028 100644
@@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \
                     file://include/waffle/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf"
 
 SRC_URI = "http://waffle-gl.org/files/release/${BPN}-${PV}/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "61bfc1a478e840825f33ddb4057115e7"
-SRC_URI[sha256sum] = "d9c899f710c50cfdd00f5f4cdfeaef0687d8497362239bdde93bed6c909c81d7"
+SRC_URI[md5sum] = "c91529e579483f44fb330052872b9c73"
+SRC_URI[sha256sum] = "31565649ff0e2d8dff1b8f7f2264ab7a78452063c7e04adfc4ce03e64b655080"
 
 UPSTREAM_CHECK_URI = "http://www.waffle-gl.org/releases.html"
 
Signature · 1 line
2.26.2
#40 lore raw

PATCH 34/70 pixman: upgrade 0.38.4 -> 0.40.0

In reply to Alexander Kanavin
---
 ...-for-FE_INVALID-definition-before-us.patch | 33 -------------------
 .../{pixman_0.38.4.bb => pixman_0.40.0.bb}    |  5 ++-
 2 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch
 rename meta/recipes-graphics/xorg-lib/{pixman_0.38.4.bb => pixman_0.40.0.bb} (85%)
meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch deleted +0 -33
deleted file mode 100644
index 23cbf53a41..0000000000
@@ -1,33 +0,0 @@
-From 0ccd906b904d21536d5ab41c6196760e3e5d72cb Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Tue, 17 May 2016 17:30:00 -0700
-Subject: [PATCH] test/utils: Check for FE_INVALID definition before use
-
-Some architectures e.g. nios2 do not support all exceptions
-
-Signed-off-by: Khem Raj <[email protected]>
----
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/pixman/pixman/merge_requests/24]
-
- test/utils.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/test/utils.c b/test/utils.c
-index f8e42a5..fe32b1e 100644
---- a/test/utils.c
-+++ b/test/utils.c
-@@ -978,9 +978,11 @@ enable_invalid_exceptions (void)
- {
- #ifdef HAVE_FENV_H
- #ifdef HAVE_FEENABLEEXCEPT
-+#ifdef FE_INVALID
-     feenableexcept (FE_INVALID);
- #endif
- #endif
-+#endif
- }
- 
- void *
--- 
-2.8.2
-
meta/recipes-graphics/xorg-lib/pixman_0.40.0.bb renamed from meta/recipes-graphics/xorg-lib/pixman_0.38.4.bb +2 -3
similarity index 85%
rename from meta/recipes-graphics/xorg-lib/pixman_0.38.4.bb
rename to meta/recipes-graphics/xorg-lib/pixman_0.40.0.bb
index 22e19ba069..5a3bb22ec3 100644
@@ -9,10 +9,9 @@ DEPENDS = "zlib"
 
 SRC_URI = "https://www.cairographics.org/releases/${BP}.tar.gz \
            file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \
-           file://0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch \
            "
-SRC_URI[md5sum] = "267a7af290f93f643a1bc74490d9fdd1"
-SRC_URI[sha256sum] = "da66d6fd6e40aee70f7bd02e4f8f76fc3f006ec879d346bae6a723025cfbdde7"
+SRC_URI[md5sum] = "73858c0862dd9896fb5f62ae267084a4"
+SRC_URI[sha256sum] = "6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc"
 
 # see http://cairographics.org/releases/ - only even minor versions are stable
 UPSTREAM_CHECK_REGEX = "pixman-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)"
Signature · 1 line
2.26.2
#41 lore raw

Re: [OE-core] [PATCH 34/70] pixman: upgrade 0.38.4 -> 0.40.0

Quoted 7 lines · Alexander Kanavin
---
 ...-for-FE_INVALID-definition-before-us.patch | 33 -------------------
 .../{pixman_0.38.4.bb => pixman_0.40.0.bb}    |  5 ++-
 2 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644

meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch

Why is this patch being removed ?

Quoted 77 lines
 rename meta/recipes-graphics/xorg-lib/{pixman_0.38.4.bb =>

pixman_0.40.0.bb} (85%)

diff --git a/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch b/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch deleted file mode 100644
index 23cbf53a41..0000000000
---
a/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch +++ /dev/null

meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch deleted +0 -10
@@ -1,33 +0,0 @@
-From 0ccd906b904d21536d5ab41c6196760e3e5d72cb Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Tue, 17 May 2016 17:30:00 -0700
-Subject: [PATCH] test/utils: Check for FE_INVALID definition before use
-
-Some architectures e.g. nios2 do not support all exceptions
-
-Signed-off-by: Khem Raj <[email protected]>
----
-Upstream-Status: Submitted [

https://gitlab.freedesktop.org/pixman/pixman/merge_requests/24]

meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch deleted +0 -23
-
- test/utils.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/test/utils.c b/test/utils.c
-index f8e42a5..fe32b1e 100644
---- a/test/utils.c
-+++ b/test/utils.c
-@@ -978,9 +978,11 @@ enable_invalid_exceptions (void)
- {
- #ifdef HAVE_FENV_H
- #ifdef HAVE_FEENABLEEXCEPT
-+#ifdef FE_INVALID
-     feenableexcept (FE_INVALID);
- #endif
- #endif
-+#endif
- }
-
- void *
---
-2.8.2
-
meta/recipes-graphics/xorg-lib/pixman_0.40.0.bb renamed from meta/recipes-graphics/xorg-lib/pixman_0.38.4.bb +0 -3
similarity index 85%
rename from meta/recipes-graphics/xorg-lib/pixman_0.38.4.bb
rename to meta/recipes-graphics/xorg-lib/pixman_0.40.0.bb
index 22e19ba069..5a3bb22ec3 100644
@@ -9,10 +9,9 @@ DEPENDS = "zlib"
 
 SRC_URI = "https://www.cairographics.org/releases/${BP}.tar.gz \
 
 file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \
-
 file://0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch \
            "
-SRC_URI[md5sum] = "267a7af290f93f643a1bc74490d9fdd1"
-SRC_URI[sha256sum] =

"da66d6fd6e40aee70f7bd02e4f8f76fc3f006ec879d346bae6a723025cfbdde7"

meta/recipes-graphics/xorg-lib/pixman_0.40.0.bb renamed from meta/recipes-graphics/xorg-lib/pixman_0.38.4.bb +2 -0
+SRC_URI[md5sum] = "73858c0862dd9896fb5f62ae267084a4"
+SRC_URI[sha256sum] =

"6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc"

 # see http://cairographics.org/releases/ - only even minor versions are
stable
 UPSTREAM_CHECK_REGEX = "pixman-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)"
--
2.26.2
#42 lore raw

Re: [OE-core] [PATCH 34/70] pixman: upgrade 0.38.4 -> 0.40.0

The patch has been merged upstream - easy to establish by clicking on the link inside it.

Alex

Quoted 95 lines · Khem Raj
Quoted 7 lines · Alexander Kanavin
---
 ...-for-FE_INVALID-definition-before-us.patch | 33 -------------------
 .../{pixman_0.38.4.bb => pixman_0.40.0.bb}    |  5 ++-
 2 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644

meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch

Why is this patch being removed ?

Quoted 77 lines
 rename meta/recipes-graphics/xorg-lib/{pixman_0.38.4.bb =>

pixman_0.40.0.bb} (85%)

diff --git a/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch b/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch deleted file mode 100644
index 23cbf53a41..0000000000
---
a/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch +++ /dev/null

meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch deleted +0 -10
@@ -1,33 +0,0 @@
-From 0ccd906b904d21536d5ab41c6196760e3e5d72cb Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Tue, 17 May 2016 17:30:00 -0700
-Subject: [PATCH] test/utils: Check for FE_INVALID definition before use
-
-Some architectures e.g. nios2 do not support all exceptions
-
-Signed-off-by: Khem Raj <[email protected]>
----
-Upstream-Status: Submitted [

https://gitlab.freedesktop.org/pixman/pixman/merge_requests/24]

meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch deleted +0 -23
-
- test/utils.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/test/utils.c b/test/utils.c
-index f8e42a5..fe32b1e 100644
---- a/test/utils.c
-+++ b/test/utils.c
-@@ -978,9 +978,11 @@ enable_invalid_exceptions (void)
- {
- #ifdef HAVE_FENV_H
- #ifdef HAVE_FEENABLEEXCEPT
-+#ifdef FE_INVALID
-     feenableexcept (FE_INVALID);
- #endif
- #endif
-+#endif
- }
-
- void *
---
-2.8.2
-
meta/recipes-graphics/xorg-lib/pixman_0.40.0.bb renamed from meta/recipes-graphics/xorg-lib/pixman_0.38.4.bb +0 -3
similarity index 85%
rename from meta/recipes-graphics/xorg-lib/pixman_0.38.4.bb
rename to meta/recipes-graphics/xorg-lib/pixman_0.40.0.bb
index 22e19ba069..5a3bb22ec3 100644
@@ -9,10 +9,9 @@ DEPENDS = "zlib"
 
 SRC_URI = "https://www.cairographics.org/releases/${BP}.tar.gz \
 
 file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \
-
 file://0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch \
            "
-SRC_URI[md5sum] = "267a7af290f93f643a1bc74490d9fdd1"
-SRC_URI[sha256sum] =

"da66d6fd6e40aee70f7bd02e4f8f76fc3f006ec879d346bae6a723025cfbdde7"

meta/recipes-graphics/xorg-lib/pixman_0.40.0.bb renamed from meta/recipes-graphics/xorg-lib/pixman_0.38.4.bb +2 -0
+SRC_URI[md5sum] = "73858c0862dd9896fb5f62ae267084a4"
+SRC_URI[sha256sum] =

"6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc"

 # see http://cairographics.org/releases/ - only even minor versions are
stable
 UPSTREAM_CHECK_REGEX = "pixman-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)"
--
2.26.2
#43 lore raw

PATCH 35/70 kmod: upgrade 26 -> 27

In reply to Alexander Kanavin
---
 meta/recipes-kernel/kmod/kmod.inc             |  7 ++---
 .../kmod/0001-build-Stop-using-dolt.patch     | 28 -------------------
 2 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 meta/recipes-kernel/kmod/kmod/0001-build-Stop-using-dolt.patch
meta/recipes-kernel/kmod/kmod.inc +3 -4
index 334453838e..b7c5cbef12 100644
@@ -14,15 +14,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
                    "
 inherit autotools gtk-doc pkgconfig manpages
 
-SRCREV = "58133a96c894c043e48c74ddf0bfe8db90bac62f"
+SRCREV = "819a125ca756003dce2d11624035b7fb605a8e99"
 # Lookout for PV bump too when SRCREV is changed
-PV = "26"
+PV = "27"
 
 SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \
            file://depmod-search.conf \
-           file://0001-build-Stop-using-dolt.patch \
            file://avoid_parallel_tests.patch \
-          "
+           "
 
 S = "${WORKDIR}/git"
 
meta/recipes-kernel/kmod/kmod/0001-build-Stop-using-dolt.patch deleted +0 -28
deleted file mode 100644
index c915ad5e8a..0000000000
@@ -1,28 +0,0 @@
-From f8b8d7b330433511d19a936ddfc7b7d1af5490b5 Mon Sep 17 00:00:00 2001
-From: Adrian Bunk <[email protected]>
-Date: Wed, 20 Feb 2019 14:22:04 +0200
-Subject: build: Stop using dolt
-
-This does regress "make -12" from 0.7s to 0.9s on my
-Coffee Lake machine, but even on slower hardware this
-will not amount to a noticable slowdown.
-
-On the other hand using dolt can create problems for
-people doing cross-compilation, e.g. Yocto has two
-hacks just for dolt in kmod:
-https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-kernel/kmod/kmod.inc?id=a17abae00785c76cfffe5381a22fb2c86b982e82
-
-Signed-off-by: Adrian Bunk <[email protected]>
-Upstream-Status: Backport
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,7 +17,6 @@ AM_MAINTAINER_MODE([enable])
- AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules tar-pax no-dist-gzip dist-xz subdir-objects color-tests parallel-tests])
- AM_SILENT_RULES([yes])
- LT_INIT([disable-static pic-only])
--DOLT
- 
- AS_IF([test "x$enable_static" = "xyes"], [AC_MSG_ERROR([--enable-static is not supported by kmod])])
- AS_IF([test "x$enable_largefile" = "xno"], [AC_MSG_ERROR([--disable-largefile is not supported by kmod])])
-
Signature · 1 line
2.26.2
#44 lore raw

PATCH 36/70 powertop: upgrade 2.10 -> 2.12

In reply to Alexander Kanavin
---
 .../powertop/{powertop_2.10.bb => powertop_2.12.bb}        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
 rename meta/recipes-kernel/powertop/{powertop_2.10.bb => powertop_2.12.bb} (81%)
meta/recipes-kernel/powertop/powertop_2.12.bb renamed from meta/recipes-kernel/powertop/powertop_2.10.bb +4 -3
similarity index 81%
rename from meta/recipes-kernel/powertop/powertop_2.10.bb
rename to meta/recipes-kernel/powertop/powertop_2.12.bb
index f1b0e92b2b..f085d9b482 100644
@@ -2,18 +2,18 @@ SUMMARY = "Power usage tool"
 DESCRIPTION = "Linux tool to diagnose issues with power consumption and power management."
 HOMEPAGE = "https://01.org/powertop/"
 BUGTRACKER = "https://app.devzing.com/powertopbugs/bugzilla"
-DEPENDS = "ncurses libnl pciutils"
+DEPENDS = "ncurses libnl pciutils autoconf-archive"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
 
 SRC_URI = "git://github.com/fenrus75/powertop;protocol=https \
     file://0001-wakeup_xxx.h-include-limits.h.patch \
 "
-SRCREV = "e8765b5475b22b7a2b6e9e8a031c68a268a0b0b3"
+SRCREV = "6988eaaa5bbcfff1dd86f757006c6c48cec965c5"
 
 S = "${WORKDIR}/git"
 
-inherit autotools gettext pkgconfig
+inherit autotools gettext pkgconfig bash-completion
 
 # we do not want libncursesw if we can
 do_configure_prepend() {
@@ -22,6 +22,7 @@ do_configure_prepend() {
     mkdir -p ${B}/src/tuning/
     echo "${PV}" > ${S}/version-long
     echo "${PV}" > ${S}/version-short
+    cp ${STAGING_DATADIR}/aclocal/ax_require_defined.m4 ${S}/m4/
 }
 
 inherit update-alternatives
Signature · 1 line
2.26.2
#45 lore raw

PATCH 37/70 alsa-plugins: upgrade 1.2.1 -> 1.2.2

In reply to Alexander Kanavin

License-Update: copyright years, formatting

---
 ...lsa-plugins_1.2.1.bb => alsa-plugins_1.2.2.bb} | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
 rename meta/recipes-multimedia/alsa/{alsa-plugins_1.2.1.bb => alsa-plugins_1.2.2.bb} (93%)
meta/recipes-multimedia/alsa/alsa-plugins_1.2.2.bb renamed from meta/recipes-multimedia/alsa/alsa-plugins_1.2.1.bb +7 -8
similarity index 93%
rename from meta/recipes-multimedia/alsa/alsa-plugins_1.2.1.bb
rename to meta/recipes-multimedia/alsa/alsa-plugins_1.2.2.bb
index d092b158f2..52dee30126 100644
@@ -13,16 +13,15 @@ SECTION = "multimedia"
 # license for libsamplerate, the samplerate plugin may be used under the terms
 # of LGPLv2.1 like the rest of the plugins.
 LICENSE = "LGPLv2.1 & GPLv2+"
-LIC_FILES_CHKSUM = "\
-        file://COPYING;md5=a916467b91076e631dd8edb7424769c7 \
-        file://COPYING.GPL;md5=59530bdf33659b29e73d4adb9f9f6552 \
-        file://m4/attributes.m4;endline=33;md5=b25958da44c02231e3641f1bccef53eb \
-        file://rate/rate_samplerate.c;endline=35;md5=fd77bce85f4a338c0e8ab18430b69fae \
-"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7 \
+                    file://COPYING.GPL;md5=59530bdf33659b29e73d4adb9f9f6552 \
+                    file://m4/attributes.m4;endline=33;md5=bb8c6b2a67ac15156961e242fec33e50 \
+                    file://rate/rate_samplerate.c;endline=35;md5=fd77bce85f4a338c0e8ab18430b69fae \
+                    "
 
 SRC_URI = "https://www.alsa-project.org/files/pub/plugins/${BP}.tar.bz2"
-SRC_URI[md5sum] = "5b11cd3ec92e5f9190ec378565b529e8"
-SRC_URI[sha256sum] = "4d94de7ad41734b8604a652521200bb6554fcf0c2c00fdbd302b1710d76548da"
+SRC_URI[md5sum] = "8455e3c6fbc47f62f070afabc14ba575"
+SRC_URI[sha256sum] = "1c0f06450c928d711719686c9dbece2d480184f36fab11b8f0534cb7b41e337d"
 
 DEPENDS += "alsa-lib"
 
Signature · 1 line
2.26.2
#46 lore raw

PATCH 38/70 alsa-tools: upgrade 1.1.7 -> 1.2.2

In reply to Alexander Kanavin
---
 .../alsa/{alsa-tools_1.1.7.bb => alsa-tools_1.2.2.bb}         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/alsa/{alsa-tools_1.1.7.bb => alsa-tools_1.2.2.bb} (95%)
meta/recipes-multimedia/alsa/alsa-tools_1.2.2.bb renamed from meta/recipes-multimedia/alsa/alsa-tools_1.1.7.bb +2 -2
similarity index 95%
rename from meta/recipes-multimedia/alsa/alsa-tools_1.1.7.bb
rename to meta/recipes-multimedia/alsa/alsa-tools_1.2.2.bb
index c1f4acdb03..0838be8798 100644
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=59530bdf33659b29e73d4adb9f9f65
 
 SRC_URI = "https://www.alsa-project.org/files/pub/tools/${BP}.tar.bz2"
 
-SRC_URI[md5sum] = "475bdf6457bcf55c8c895d653ee56a54"
-SRC_URI[sha256sum] = "a0243328a8f6f691a3055c484fd8d3326393096325e93743b246029d327c4ef6"
+SRC_URI[md5sum] = "4e6187d2c3a8c73a9d75d66a72faed27"
+SRC_URI[sha256sum] = "bfd3c7aae1289269605d3da02279159b10e3dabdd31e658cbceaa30170957349"
 
 inherit autotools-brokensep pkgconfig
 # brokensep as as10k1 (and probably more) fail out of tree
Signature · 1 line
2.26.2
#47 lore raw

PATCH 39/70 alsa-utils: split the content into .inc

In reply to Alexander Kanavin

This allows including the .inc from alsa-utils-scripts which unbreaks automated version updates.

Bump alsa-utils-scripts to 1.2.2 at the same time.

---
 .../alsa/alsa-utils-scripts_1.2.2.bb          |   2 +-
 meta/recipes-multimedia/alsa/alsa-utils.inc   | 105 +++++++++++++++++
 .../alsa/alsa-utils_1.2.2.bb                  | 106 +-----------------
 3 files changed, 107 insertions(+), 106 deletions(-)
 create mode 100644 meta/recipes-multimedia/alsa/alsa-utils.inc
meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.2.bb +1 -1
index fef79d9c9c..048fef68a5 100644
@@ -1,4 +1,4 @@
-require alsa-utils_${PV}.bb
+require alsa-utils.inc
 
 SUMMARY = "Shell scripts that show help info and create ALSA configuration files"
 PROVIDES = "alsa-utils-alsaconf"
meta/recipes-multimedia/alsa/alsa-utils.inc new file +105 -0

105 lines not on this page · raw message

meta/recipes-multimedia/alsa/alsa-utils_1.2.2.bb +1 -105

106 lines not on this page · raw message

Signature · 1 line
2.26.2
#48 lore raw

PATCH 40/70 alsa-topology/ucm-conf: update to 1.2.2

In reply to Alexander Kanavin

Tarballs have a proper subdirectory now, so subdir option isn't needed anymore.

---
 ...-topology-conf_1.2.1.bb => alsa-topology-conf_1.2.2.bb} | 7 ++-----
 .../{alsa-ucm-conf_1.2.1.2.bb => alsa-ucm-conf_1.2.2.bb}   | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)
 rename meta/recipes-multimedia/alsa/{alsa-topology-conf_1.2.1.bb => alsa-topology-conf_1.2.2.bb} (61%)
 rename meta/recipes-multimedia/alsa/{alsa-ucm-conf_1.2.1.2.bb => alsa-ucm-conf_1.2.2.bb} (63%)
meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.2.bb renamed from meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.1.bb +2 -5
similarity index 61%
rename from meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.1.bb
rename to meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.2.bb
index add1f309ec..2901794cb9 100644
@@ -4,11 +4,8 @@ BUGTRACKER = "https://alsa-project.org/wiki/Bug_Tracking"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=20d74d74db9741697903372ad001d3b4"
 
-# The tarball doesn't have any toplevel directory. The subdir option tells
-# Bitbake to unpack the archive to the correct place.
-SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2;subdir=${BP}"
-SRC_URI[md5sum] = "7fdf5fff3f1e0603456e719f6033e922"
-SRC_URI[sha256sum] = "354a43f4031c98bef1349ac722d83b2603ef439f81a1ab1eba8814c28243a9b2"
+SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2"
+SRC_URI[sha256sum] = "b472d6b567c78173bd69543d9cffc9e379c80eb763c3afc8d5b24d5610d19425"
 
 inherit allarch
 
meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.2.bb renamed from meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.1.2.bb +2 -5
similarity index 63%
rename from meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.1.2.bb
rename to meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.2.bb
index 469d1f7a95..1a524d49b2 100644
@@ -4,11 +4,8 @@ BUGTRACKER = "https://alsa-project.org/wiki/Bug_Tracking"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=20d74d74db9741697903372ad001d3b4"
 
-# The tarball doesn't have any toplevel directory. The subdir option tells
-# Bitbake to unpack the archive to the correct place.
-SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2;subdir=${BP}"
-SRC_URI[md5sum] = "b7fa43cfd79df978184a6333766d2a50"
-SRC_URI[sha256sum] = "ea8a86875f4cf430d49a662a04a6d6c606c5c9d67e54cb944c4d77b24554062f"
+SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2"
+SRC_URI[sha256sum] = "7ebfd929bc85a51f16fa3c8c4db13faa2ea6ff2b2266fc36d6198bdafe73c40c"
 
 inherit allarch
 
Signature · 1 line
2.26.2
#49 lore raw

PATCH 41/70 x264: upgrade to latest revision

In reply to Alexander Kanavin
---
 meta/recipes-multimedia/x264/x264_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-multimedia/x264/x264_git.bb +1 -1
index 39429a8809..1ff5348b9e 100644
@@ -14,7 +14,7 @@ SRC_URI = "git://github.com/mirror/x264;branch=stable \
            "
 UPSTREAM_CHECK_COMMITS = "1"
 
-SRCREV = "1771b556ee45207f8711744ccbd5d42a3949b14c"
+SRCREV = "296494a4011f58f32adc54304a2654627558c59a"
 
 PV = "r2991+git${SRCPV}"
 
Signature · 1 line
2.26.2
#50 lore raw

Re: [OE-core] [PATCH 41/70] x264: upgrade to latest revision

Quoted 11 lines · Alexander Kanavin
---
 meta/recipes-multimedia/x264/x264_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes- renamed from meta/recipes-multimedia/x264/x264_git.bb +0 -0

multimedia/x264/x264_git.bb
index 39429a8809..1ff5348b9e 100644

meta/recipes-multimedia/x264/x264_git.bb SRC_URI = · line 20

Quoted 8 lines
meta/recipes-multimedia/x264/x264_git.bb +1 -1
@@ -14,7 +14,7 @@ SRC_URI =
 "git://github.com/mirror/x264;branch=stable \
            "
 UPSTREAM_CHECK_COMMITS = "1"
 
-SRCREV = "1771b556ee45207f8711744ccbd5d42a3949b14c"
+SRCREV = "296494a4011f58f32adc54304a2654627558c59a"
 
 PV = "r2991+git${SRCPV}"

PV will also need to be changed in this case to r2999+git${SRCPV}.

Thanks,

Anuj

#51 lore raw

Re: [OE-core] [PATCH 41/70] x264: upgrade to latest revision

Quoted 9 lines · Anuj

meta/recipes-multimedia/x264/x264_git.bb SRC_URI = "git://github.com/mirror/x264;branch=stable \ · line 19

Quoted 6 lines

UPSTREAM_CHECK_COMMITS = "1"

meta/recipes-multimedia/x264/x264_git.bb +1 -1
-SRCREV = "1771b556ee45207f8711744ccbd5d42a3949b14c"
+SRCREV = "296494a4011f58f32adc54304a2654627558c59a"
 
 PV = "r2991+git${SRCPV}"

PV will also need to be changed in this case to r2999+git${SRCPV}.

I wonder if basing PV on svn revisions is still beneficial - we pull directly from github, rather than svn, and I don't think anyone is interested in what the svn revision is. Upstream does not tag releases.

Alex

#52 lore raw

Re: [OE-core] [PATCH 41/70] x264: upgrade to latest revision

Quoted 7 lines · Alexander Kanavin
Quoted 5 lines · Anuj
Quoted 5 lines

UPSTREAM_CHECK_COMMITS = "1"

meta/recipes-multimedia/x264/x264_git.bb +1 -1
-SRCREV = "1771b556ee45207f8711744ccbd5d42a3949b14c"
+SRCREV = "296494a4011f58f32adc54304a2654627558c59a"
Quoted 9 lines
Quoted 4 lines
Quoted 1 line

PV = "r2991+git${SRCPV}"

PV will also need to be changed in this case to r2999+git${SRCPV}.

I wonder if basing PV on svn revisions is still beneficial - we pull directly from github, rather than svn, and I don't think anyone is interested in what the svn revision is. Upstream does not tag releases.

Since it is set to denote svn rev not updating will add to confusion so please update it

Quoted 4 lines

Alex

#53 lore raw

Re: [OE-core] [PATCH 41/70] x264: upgrade to latest revision

I was thinking of simply dropping the revision from PV, and setting PE to 1 or so.

Alex

Quoted 30 lines · Khem Raj
Quoted 7 lines · Alexander Kanavin
Quoted 5 lines · Anuj
Quoted 5 lines

UPSTREAM_CHECK_COMMITS = "1"

meta/recipes-multimedia/x264/x264_git.bb +1 -1
-SRCREV = "1771b556ee45207f8711744ccbd5d42a3949b14c"
+SRCREV = "296494a4011f58f32adc54304a2654627558c59a"
Quoted 9 lines
Quoted 4 lines
Quoted 1 line

PV = "r2991+git${SRCPV}"

PV will also need to be changed in this case to r2999+git${SRCPV}.

I wonder if basing PV on svn revisions is still beneficial - we pull directly from github, rather than svn, and I don't think anyone is interested in what the svn revision is. Upstream does not tag releases.

Since it is set to denote svn rev not updating will add to confusion so please update it

Quoted 4 lines

Alex

#54 lore raw

Re: [OE-core] [PATCH 41/70] x264: upgrade to latest revision

Quoted 3 lines · Alexander Kanavin

I was thinking of simply dropping the revision from PV, and setting PE to 1 or so.

it seems gitlab is the new location for this so if SVN rev is redundant info, then perhaps
bumping PE and dropping it from SRCREV is ok.

Quoted 28 lines

Alex

Quoted 25 lines · Khem Raj
Quoted 8 lines · Alexander Kanavin
Quoted 6 lines · Anuj
Quoted 6 lines

UPSTREAM_CHECK_COMMITS = "1"

meta/recipes-multimedia/x264/x264_git.bb +1 -1
-SRCREV = "1771b556ee45207f8711744ccbd5d42a3949b14c"
+SRCREV = "296494a4011f58f32adc54304a2654627558c59a"
Quoted 6 lines
Quoted 3 lines
Quoted 1 line

PV = "r2991+git${SRCPV}"

PV will also need to be changed in this case to r2999+git${SRCPV}.

I wonder if basing PV on svn revisions is still beneficial - we pull directly from github, rather than svn, and I don't think anyone is interested in what the svn revision is. Upstream does not tag releases.

Since it is set to denote svn rev not updating will add to confusion so please update it

Quoted 4 lines

Alex

#55 lore raw

PATCH 42/70 puzzles: upgrade to latest revision

In reply to Alexander Kanavin
---
 meta/recipes-sato/puzzles/puzzles_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-sato/puzzles/puzzles_git.bb +1 -1
index 41b78d6fe1..1e530519f3 100644
@@ -17,7 +17,7 @@ SRC_URI = "git://git.tartarus.org/simon/puzzles.git \
            "
 
 UPSTREAM_CHECK_COMMITS = "1"
-SRCREV = "79a5378b5adc46ee33ba34d55738f916fb8adfc9"
+SRCREV = "66b9e8c7de0eecb3d85d9a1766fab1082848448b"
 PE = "2"
 PV = "0.0+git${SRCPV}"
 
Signature · 1 line
2.26.2
#56 lore raw

PATCH 43/70 libcap: upgrade 2.33 -> 2.34

In reply to Alexander Kanavin
---
 ...hread_yield-with-standard-sched_yiel.patch | 24 -------------------
 .../libcap/{libcap_2.33.bb => libcap_2.34.bb} |  7 +++---
 2 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 meta/recipes-support/libcap/files/0004-psx.c-replace-pthread_yield-with-standard-sched_yiel.patch
 rename meta/recipes-support/libcap/{libcap_2.33.bb => libcap_2.34.bb} (86%)
meta/recipes-support/libcap/files/0004-psx.c-replace-pthread_yield-with-standard-sched_yiel.patch deleted +0 -24
deleted file mode 100644
index 848ceb2c0c..0000000000
@@ -1,24 +0,0 @@
-From a2c4cdb05d0e382101b13944c09c4375e8d7de5f Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Tue, 31 Mar 2020 13:39:28 +0200
-Subject: [PATCH] psx.c: replace pthread_yield() with standard sched_yield()
-
-This was causing failures when building with musl C library in
-particular.
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <[email protected]>
----
-diff --git a/libcap/psx.c b/libcap/psx.c
-index 04d250f..7e4ac10 100644
---- a/libcap/psx.c
-+++ b/libcap/psx.c
-@@ -533,7 +533,7 @@ long int __psx_syscall(long int syscall_nr, ...) {
- 	if (!waiting) {
- 	    break;
- 	}
--	pthread_yield();
-+	sched_yield();
-     }
- 
-     errno = restore_errno;
meta/recipes-support/libcap/libcap_2.34.bb renamed from meta/recipes-support/libcap/libcap_2.33.bb +3 -4
similarity index 86%
rename from meta/recipes-support/libcap/libcap_2.33.bb
rename to meta/recipes-support/libcap/libcap_2.34.bb
index bec492ca5f..a3bd969d2b 100644
@@ -11,10 +11,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${
            file://0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch \
            file://0002-tests-do-not-run-target-executables.patch \
            file://0001-tests-do-not-statically-link-a-test.patch \
-           file://0004-psx.c-replace-pthread_yield-with-standard-sched_yiel.patch \
            "
-SRC_URI[md5sum] = "dcc6220b4a9bf260050b20c07edcddf4"
-SRC_URI[sha256sum] = "08edeaba2757021aeec45c4eeec52566675e0e0f5d4f057284d729e04f2643d6"
+SRC_URI[md5sum] = "66028a8080a0891c54b202bb5e749035"
+SRC_URI[sha256sum] = "aecdd42015955068d3d94b7caa9590fcb2de5df53ce53c61a21b912bfc0b1611"
 
 UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/"
 
@@ -26,7 +25,7 @@ do_configure() {
 	# libcap uses := for compilers, fortunately, it gives us a hint
 	# on what should be replaced with ?=
 	sed -e 's,:=,?=,g' -i Make.Rules
-	sed -e 's,^BUILD_CFLAGS ?= $(.*CFLAGS),BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules
+	sed -e 's,^BUILD_CFLAGS ?= ,BUILD_CFLAGS := $(BUILD_CFLAGS) ,' -i Make.Rules
 }
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
Signature · 1 line
2.26.2
#57 lore raw

PATCH 44/70 libical: upgrade 3.0.7 -> 3.0.8

In reply to Alexander Kanavin
---
 .../libical/{libical_3.0.7.bb => libical_3.0.8.bb}            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/libical/{libical_3.0.7.bb => libical_3.0.8.bb} (93%)
meta/recipes-support/libical/libical_3.0.8.bb renamed from meta/recipes-support/libical/libical_3.0.7.bb +2 -2
similarity index 93%
rename from meta/recipes-support/libical/libical_3.0.7.bb
rename to meta/recipes-support/libical/libical_3.0.8.bb
index a50473e9ec..efb9433412 100644
@@ -12,8 +12,8 @@ SRC_URI = " \
     https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \
     file://0001-Use-our-hand-build-native-src-generator.patch \
 "
-SRC_URI[md5sum] = "8a5d07a7fba9e73a85e67f76258bf042"
-SRC_URI[sha256sum] = "0abe66df1ea826e57db7f281c704ede834c84139012e6c686ea7adafd4e763fc"
+SRC_URI[md5sum] = "41bd1f1fcdcb4779cea478bb55cf07bf"
+SRC_URI[sha256sum] = "09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f"
 UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases"
 
 inherit cmake pkgconfig
Signature · 1 line
2.26.2
#58 lore raw

PATCH 45/70 libunwind: upgrade 1.3.1 -> 1.4.0

In reply to Alexander Kanavin
---
 .../libunwind/musl-header-conflict.patch      | 27 ++++++++++++-------
 ...{libunwind_1.3.1.bb => libunwind_1.4.0.bb} |  4 +--
 2 files changed, 19 insertions(+), 12 deletions(-)
 rename meta/recipes-support/libunwind/{libunwind_1.3.1.bb => libunwind_1.4.0.bb} (87%)
meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch +17 -10
index 79f63fd84e..63b78a8a30 100644
@@ -1,4 +1,7 @@
-If you:
+From 49b21f0fe5fb93b30b94cc449429fd33de0652a7 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <[email protected]>
+Date: Thu, 18 Aug 2016 14:46:32 +0100
+Subject: [PATCH] If you:
 
 TCLIBC=musl bitbake unwind
 TCLIBC=musl bitbake gcc-runtime -c cleansstate
@@ -6,12 +9,12 @@ TCLIBC=musl bitbake gcc-runtime
 
 you will see libstdc++ fail to build due to finding libunwind's header file.
 
-Khem: "When we build any of gcc components they expect to use internal version 
-and that works with glibc based gcc since the search headers first look into gcc 
-headers, however with musl the gcc headers are searched after the standard 
+Khem: "When we build any of gcc components they expect to use internal version
+and that works with glibc based gcc since the search headers first look into gcc
+headers, however with musl the gcc headers are searched after the standard
 headers ( which is by design the right thing )."
 
-This patch hacks around the issue by looking for a define used during gcc-runtime's 
+This patch hacks around the issue by looking for a define used during gcc-runtime's
 build and skipping to the internal header in that case.
 
 [YOCTO #10129]
@@ -20,11 +23,15 @@ RP 2016/8/18
 
 Upstream-Status: Inappropriate [really need to fix gcc]
 
-Index: git/include/unwind.h
-===================================================================
---- git.orig/include/unwind.h
-+++ git/include/unwind.h
-@@ -23,6 +23,10 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER L
+---
+ include/unwind.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/include/unwind.h b/include/unwind.h
+index 7cf128d..31c2871 100644
+--- a/include/unwind.h
++++ b/include/unwind.h
+@@ -23,6 +23,10 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
  
meta/recipes-support/libunwind/libunwind_1.4.0.bb renamed from meta/recipes-support/libunwind/libunwind_1.3.1.bb +2 -2
similarity index 87%
rename from meta/recipes-support/libunwind/libunwind_1.3.1.bb
rename to meta/recipes-support/libunwind/libunwind_1.4.0.bb
index 037e04c3c0..f50205f1b9 100644
@@ -10,8 +10,8 @@ SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV
            "
 SRC_URI_append_libc-musl = " file://musl-header-conflict.patch"
 
-SRC_URI[md5sum] = "a04f69d66d8e16f8bf3ab72a69112cd6"
-SRC_URI[sha256sum] = "43997a3939b6ccdf2f669b50fdb8a4d3205374728c2923ddc2354c65260214f8"
+SRC_URI[md5sum] = "5114504c74ac3992ac06aa551cd55678"
+SRC_URI[sha256sum] = "df59c931bd4d7ebfd83ee481c943edf015138089b8e50abed8d9c57ba9338435"
 
 EXTRA_OECONF_append_libc-musl = " --disable-documentation --disable-tests --enable-static"
 
Signature · 1 line
2.26.2
#59 lore raw

Re: [OE-core] [PATCH 45/70] libunwind: upgrade 1.3.1 -> 1.4.0

Fails to build on musl

https://errors.yoctoproject.org/Errors/Details/414866/

Quoted 81 lines · Alexander Kanavin
---
 .../libunwind/musl-header-conflict.patch      | 27 ++++++++++++-------
 ...{libunwind_1.3.1.bb => libunwind_1.4.0.bb} |  4 +--
 2 files changed, 19 insertions(+), 12 deletions(-)
 rename meta/recipes-support/libunwind/{libunwind_1.3.1.bb => libunwind_1.4.0.bb} (87%)
meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch +17 -10
index 79f63fd84e..63b78a8a30 100644
@@ -1,4 +1,7 @@
-If you:
+From 49b21f0fe5fb93b30b94cc449429fd33de0652a7 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <[email protected]>
+Date: Thu, 18 Aug 2016 14:46:32 +0100
+Subject: [PATCH] If you:
 
 TCLIBC=musl bitbake unwind
 TCLIBC=musl bitbake gcc-runtime -c cleansstate
@@ -6,12 +9,12 @@ TCLIBC=musl bitbake gcc-runtime
 
 you will see libstdc++ fail to build due to finding libunwind's header file.
 
-Khem: "When we build any of gcc components they expect to use internal version
-and that works with glibc based gcc since the search headers first look into gcc
-headers, however with musl the gcc headers are searched after the standard
+Khem: "When we build any of gcc components they expect to use internal version
+and that works with glibc based gcc since the search headers first look into gcc
+headers, however with musl the gcc headers are searched after the standard
 headers ( which is by design the right thing )."
 
-This patch hacks around the issue by looking for a define used during gcc-runtime's
+This patch hacks around the issue by looking for a define used during gcc-runtime's
 build and skipping to the internal header in that case.
 
 [YOCTO #10129]
@@ -20,11 +23,15 @@ RP 2016/8/18
 
 Upstream-Status: Inappropriate [really need to fix gcc]
 
-Index: git/include/unwind.h
-===================================================================
---- git.orig/include/unwind.h
-+++ git/include/unwind.h
-@@ -23,6 +23,10 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER L
+---
+ include/unwind.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/include/unwind.h b/include/unwind.h
+index 7cf128d..31c2871 100644
+--- a/include/unwind.h
++++ b/include/unwind.h
+@@ -23,6 +23,10 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
meta/recipes-support/libunwind/libunwind_1.4.0.bb renamed from meta/recipes-support/libunwind/libunwind_1.3.1.bb +2 -3
similarity index 87%
rename from meta/recipes-support/libunwind/libunwind_1.3.1.bb
rename to meta/recipes-support/libunwind/libunwind_1.4.0.bb
index 037e04c3c0..f50205f1b9 100644
@@ -10,8 +10,8 @@ SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV
            "
 SRC_URI_append_libc-musl = " file://musl-header-conflict.patch"
 
-SRC_URI[md5sum] = "a04f69d66d8e16f8bf3ab72a69112cd6"
-SRC_URI[sha256sum] = "43997a3939b6ccdf2f669b50fdb8a4d3205374728c2923ddc2354c65260214f8"
+SRC_URI[md5sum] = "5114504c74ac3992ac06aa551cd55678"
+SRC_URI[sha256sum] = "df59c931bd4d7ebfd83ee481c943edf015138089b8e50abed8d9c57ba9338435"
 
 EXTRA_OECONF_append_libc-musl = " --disable-documentation --disable-tests --enable-static"
 
--

2.26.2

#60 lore raw

Re: [OE-core] [PATCH 45/70] libunwind: upgrade 1.3.1 -> 1.4.0

Seems like an arm-specific item, as x86 musl builds passed fine on the AB.

Alex

Quoted 106 lines · Khem Raj

Fails to build on musl

https://errors.yoctoproject.org/Errors/Details/414866/

Quoted 7 lines · Alexander Kanavin
---
 .../libunwind/musl-header-conflict.patch      | 27 ++++++++++++-------
 ...{libunwind_1.3.1.bb => libunwind_1.4.0.bb} |  4 +--
 2 files changed, 19 insertions(+), 12 deletions(-)
 rename meta/recipes-support/libunwind/{libunwind_1.3.1.bb =>

libunwind_1.4.0.bb} (87%)

Quoted 2 lines

diff --git

a/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch b/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch

Quoted 13 lines

index 79f63fd84e..63b78a8a30 100644

meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch +4 -1
@@ -1,4 +1,7 @@
-If you:
+From 49b21f0fe5fb93b30b94cc449429fd33de0652a7 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <[email protected]>
+Date: Thu, 18 Aug 2016 14:46:32 +0100
+Subject: [PATCH] If you:
 
 TCLIBC=musl bitbake unwind
 TCLIBC=musl bitbake gcc-runtime -c cleansstate

meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch TCLIBC=musl bitbake gcc-runtime · line 10

Quoted 2 lines
meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch +0 -0
@@ -6,12 +9,12 @@ TCLIBC=musl bitbake gcc-runtime
 
 you will see libstdc++ fail to build due to finding libunwind's header

file.

meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch TCLIBC=musl bitbake gcc-runtime · line 8

Quoted 2 lines
meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch +0 -1
-Khem: "When we build any of gcc components they expect to use internal

version

meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch TCLIBC=musl bitbake gcc-runtime · line 9

Quoted 1 line
meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch +0 -1
-and that works with glibc based gcc since the search headers first look

into gcc

meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch TCLIBC=musl bitbake gcc-runtime · line 10

Quoted 1 line
meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch +0 -1
-headers, however with musl the gcc headers are searched after the

standard

meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch TCLIBC=musl bitbake gcc-runtime · line 11

Quoted 1 line
meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch +1 -0
+Khem: "When we build any of gcc components they expect to use internal

version

meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch TCLIBC=musl bitbake gcc-runtime · line 12

Quoted 1 line
meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch +1 -0
+and that works with glibc based gcc since the search headers first look

into gcc

meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch TCLIBC=musl bitbake gcc-runtime · line 13

Quoted 1 line
meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch +1 -0
+headers, however with musl the gcc headers are searched after the

standard

meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch TCLIBC=musl bitbake gcc-runtime

Quoted 3 lines
meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch +0 -1
 headers ( which is by design the right thing )."
 
-This patch hacks around the issue by looking for a define used during

gcc-runtime's

meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch TCLIBC=musl bitbake gcc-runtime · line 16

Quoted 1 line
meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch +1 -0
+This patch hacks around the issue by looking for a define used during

gcc-runtime's

Quoted 11 lines
meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch +0 -4
 build and skipping to the internal header in that case.
 
 [YOCTO #10129]
@@ -20,11 +23,15 @@ RP 2016/8/18
 
 Upstream-Status: Inappropriate [really need to fix gcc]
 
-Index: git/include/unwind.h
-===================================================================
---- git.orig/include/unwind.h
-+++ git/include/unwind.h

meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch RP 2016/8/18 · line 34

Quoted 10 lines
meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch +9 -1
-@@ -23,6 +23,10 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER L
+---
+ include/unwind.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/include/unwind.h b/include/unwind.h
+index 7cf128d..31c2871 100644
+--- a/include/unwind.h
++++ b/include/unwind.h
+@@ -23,6 +23,10 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

WHETHER IN AN ACTION

Review

Quoted 4 lines
meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch +0 -0
  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
(quoted diff) +0 -0

b/meta/recipes-support/libunwind/libunwind_1.4.0.bb

meta/recipes-support/libunwind/libunwind_1.4.0.bb SRC_URI = "

Quoted 7 lines

similarity index 87%
rename from meta/recipes-support/libunwind/libunwind_1.3.1.bb rename to meta/recipes-support/libunwind/libunwind_1.4.0.bb index 037e04c3c0..f50205f1b9 100644

meta/recipes-support/libunwind/libunwind_1.4.0.bb renamed from meta/recipes-support/libunwind/libunwind_1.3.1.bb +0 -0
@@ -10,8 +10,8 @@ SRC_URI = "

http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV

meta/recipes-support/libunwind/libunwind_1.4.0.bb SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV

Quoted 5 lines
meta/recipes-support/libunwind/libunwind_1.4.0.bb renamed from meta/recipes-support/libunwind/libunwind_1.3.1.bb +0 -2
            "
 SRC_URI_append_libc-musl = " file://musl-header-conflict.patch"
 
-SRC_URI[md5sum] = "a04f69d66d8e16f8bf3ab72a69112cd6"
-SRC_URI[sha256sum] =

"43997a3939b6ccdf2f669b50fdb8a4d3205374728c2923ddc2354c65260214f8"

meta/recipes-support/libunwind/libunwind_1.4.0.bb SRC_URI = " · line 14

Quoted 2 lines
meta/recipes-support/libunwind/libunwind_1.4.0.bb renamed from meta/recipes-support/libunwind/libunwind_1.3.1.bb +2 -0
+SRC_URI[md5sum] = "5114504c74ac3992ac06aa551cd55678"
+SRC_URI[sha256sum] =

"df59c931bd4d7ebfd83ee481c943edf015138089b8e50abed8d9c57ba9338435"

meta/recipes-support/libunwind/libunwind_1.4.0.bb SRC_URI = " · line 15

Quoted 2 lines
meta/recipes-support/libunwind/libunwind_1.4.0.bb renamed from meta/recipes-support/libunwind/libunwind_1.3.1.bb +0 -0
 EXTRA_OECONF_append_libc-musl = " --disable-documentation

--disable-tests --enable-static"

Quoted 5 lines
meta/recipes-support/libunwind/libunwind_1.4.0.bb renamed from meta/recipes-support/libunwind/libunwind_1.3.1.bb +0 -1
--

2.26.2

#61 lore raw

PATCH 46/70 rng-tools: upgrade 6.9 -> 6.10

In reply to Alexander Kanavin
---
 ...d9ce64f132e463b9091d0536913ddaf11516.patch | 42 +++++++++++++++
 ...6a5fd4efde8ef569b358e19b1fcbc7d0d938.patch | 51 +++++++++++++++++++
 .../{rng-tools_6.9.bb => rng-tools_6.10.bb}   | 11 ++--
 3 files changed, 100 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-support/rng-tools/rng-tools/a4b6d9ce64f132e463b9091d0536913ddaf11516.patch
 create mode 100644 meta/recipes-support/rng-tools/rng-tools/dab16a5fd4efde8ef569b358e19b1fcbc7d0d938.patch
 rename meta/recipes-support/rng-tools/{rng-tools_6.9.bb => rng-tools_6.10.bb} (87%)
meta/recipes-support/rng-tools/rng-tools/a4b6d9ce64f132e463b9091d0536913ddaf11516.patch new file +42 -0
new file mode 100644
index 0000000000..96301617b2
@@ -0,0 +1,42 @@
+From a4b6d9ce64f132e463b9091d0536913ddaf11516 Mon Sep 17 00:00:00 2001
+From: Neil Horman <[email protected]>
+Date: Thu, 30 Apr 2020 16:57:35 -0400
+Subject: [PATCH] Remove name conflict with libc encrypt
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Forgot to fixup the funciton name conflict with libcs encrypt() function
+on power systems
+
+Upstream-Status: Backport [https://github.com/nhorman/rng-tools/commit/a4b6d9ce64f132e463b9091d0536913ddaf11516]
+Signed-off-by: Alexander Kanavin <[email protected]>
+Signed-off-by: Neil Horman <[email protected]>
+Reported-by: Natanael Copa <[email protected]>
+Reported-by: "Milan P. Stanić" <[email protected]>
+---
+ rngd_darn.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/rngd_darn.c b/rngd_darn.c
+index 35df7a1..9345895 100644
+--- a/rngd_darn.c
++++ b/rngd_darn.c
+@@ -109,7 +109,7 @@ static int init_openssl(struct rng *ent_src)
+ 	return 0;
+ }
+ 
+-int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
++static int osslencrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
+             unsigned char *iv, unsigned char *ciphertext)
+ {
+         int len;
+@@ -150,7 +150,7 @@ static inline int openssl_mangle(unsigned char *tmp, struct rng *ent_src)
+         unsigned char ciphertext[CHUNK_SIZE * RDRAND_ROUNDS];
+ 
+         /* Encrypt the plaintext */
+-        ciphertext_len = encrypt (tmp, strlen(tmp), key, iv_buf,
++        ciphertext_len = osslencrypt (tmp, strlen(tmp), key, iv_buf,
+                               ciphertext);
+         printf("Calling mangle with len %d\n", ciphertext_len);
+         if (!ciphertext_len)
meta/recipes-support/rng-tools/rng-tools/dab16a5fd4efde8ef569b358e19b1fcbc7d0d938.patch new file +51 -0

51 lines not on this page · raw message

meta/recipes-support/rng-tools/rng-tools_6.10.bb renamed from meta/recipes-support/rng-tools/rng-tools_6.9.bb +7 -4
similarity index 87%
rename from meta/recipes-support/rng-tools/rng-tools_6.9.bb
rename to meta/recipes-support/rng-tools/rng-tools_6.10.bb
index 8c98a9aa3a..3f9720e406 100644
@@ -6,25 +6,28 @@ HOMEPAGE = "https://github.com/nhorman/rng-tools"
 BUGTRACKER = "https://github.com/nhorman/rng-tools/issues"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-DEPENDS = "sysfsutils"
+DEPENDS = "sysfsutils openssl"
 
 SRC_URI = "\
     git://github.com/nhorman/rng-tools.git \
+    file://a4b6d9ce64f132e463b9091d0536913ddaf11516.patch \
+    file://dab16a5fd4efde8ef569b358e19b1fcbc7d0d938.patch \
     file://init \
     file://default \
     file://rngd.service \
 "
-SRCREV = "4a865797a69dd38c64a86aa32884ecc9ba7b4d08"
+SRCREV = "0be82200a66d9321451e0a0785bfae350b9cffdc"
 
 S = "${WORKDIR}/git"
 
 inherit autotools update-rc.d systemd pkgconfig
 
-PACKAGECONFIG ??= "libgcrypt libjitterentropy"
+EXTRA_OECONF = "--without-rtlsdr"
+
+PACKAGECONFIG ??= "libjitterentropy"
 PACKAGECONFIG_libc-musl = "libargp libjitterentropy"
 
 PACKAGECONFIG[libargp] = "--with-libargp,--without-libargp,argp-standalone,"
-PACKAGECONFIG[libgcrypt] = "--with-libgcrypt,--without-libgcrypt,libgcrypt,"
 PACKAGECONFIG[libjitterentropy] = "--enable-jitterentropy,--disable-jitterentropy,libjitterentropy"
 PACKAGECONFIG[libp11] = "--with-pkcs11,--without-pkcs11,libp11 openssl"
 PACKAGECONFIG[nistbeacon] = "--with-nistbeacon,--without-nistbeacon,curl libxml2 openssl"
Signature · 1 line
2.26.2
#62 lore raw

Re: [OE-core] [PATCH 46/70] rng-tools: upgrade 6.9 -> 6.10

Quoted 5 lines · Alexander Kanavin
---
 ...d9ce64f132e463b9091d0536913ddaf11516.patch | 42 +++++++++++++++
 ...6a5fd4efde8ef569b358e19b1fcbc7d0d938.patch | 51 +++++++++++++++++++

...

Please use "git format-patch" for creating meaningful filenames.

Thanks
Adrian

#63 lore raw

Re: [OE-core] [PATCH 46/70] rng-tools: upgrade 6.9 -> 6.10

Quoted 9 lines · Adrian Bunk
Quoted 5 lines · Alexander Kanavin
---
 ...d9ce64f132e463b9091d0536913ddaf11516.patch | 42 +++++++++++++++
 ...6a5fd4efde8ef569b358e19b1fcbc7d0d938.patch | 51 +++++++++++++++++++

...

Please use "git format-patch" for creating meaningful filenames.

The filenames are this way because I downloaded both directly from github upstream, to use as backports. So they will disappear in due time.

Alex

#64 lore raw

PATCH 47/70 babeltrace: correct the git SRC_URI

In reply to Alexander Kanavin

The previous one seems to be gone.

---
 meta/recipes-kernel/lttng/babeltrace2_2.0.2.bb | 2 +-
 meta/recipes-kernel/lttng/babeltrace_1.5.8.bb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-kernel/lttng/babeltrace2_2.0.2.bb +1 -1
index 0791c654f9..7777f9b39b 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a458c13f18385b7bc5069a6d7b176e"
 
 DEPENDS = "glib-2.0 util-linux popt bison-native flex-native"
 
-SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0 \
+SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-2.0 \
 	   file://run-ptest \
 	   file://0001-tests-do-not-run-test-applications-from-.libs.patch \
            file://0001-Make-manpages-multilib-identical.patch \
meta/recipes-kernel/lttng/babeltrace_1.5.8.bb +1 -1
index 4d2492a170..9e5d3a7a97 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=76ba15dd76a248e1dd526bca0e2125fa"
 
 DEPENDS = "glib-2.0 util-linux popt bison-native flex-native"
 
-SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5 \
+SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-1.5 \
 	   file://run-ptest \
 	  "
 SRCREV = "054a54ae10b01a271afc4f19496c041b10fb414c"
Signature · 1 line
2.26.2
#65 lore raw

PATCH 48/70 libexif: update to 0.6.22

In reply to Alexander Kanavin
---
 .../libexif/libexif/CVE-2016-6328.patch       |  64 ----------
 .../libexif/libexif/CVE-2017-7544.patch       |  40 ------
 .../libexif/libexif/CVE-2018-20030.patch      | 115 ------------------
 .../recipes-support/libexif/libexif_0.6.21.bb |  17 ---
 .../recipes-support/libexif/libexif_0.6.22.bb |  19 +++
 5 files changed, 19 insertions(+), 236 deletions(-)
 delete mode 100644 meta/recipes-support/libexif/libexif/CVE-2016-6328.patch
 delete mode 100644 meta/recipes-support/libexif/libexif/CVE-2017-7544.patch
 delete mode 100644 meta/recipes-support/libexif/libexif/CVE-2018-20030.patch
 delete mode 100644 meta/recipes-support/libexif/libexif_0.6.21.bb
 create mode 100644 meta/recipes-support/libexif/libexif_0.6.22.bb
meta/recipes-support/libexif/libexif/CVE-2016-6328.patch deleted +0 -64
deleted file mode 100644
index a6f307439b..0000000000
@@ -1,64 +0,0 @@
-CVE: CVE-2016-6328
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <[email protected]>
-
-From 41bd04234b104312f54d25822f68738ba8d7133d Mon Sep 17 00:00:00 2001
-From: Marcus Meissner <[email protected]>
-Date: Tue, 25 Jul 2017 23:44:44 +0200
-Subject: [PATCH] fixes some (not all) buffer overreads during decoding pentax
- makernote entries.
-
-This should fix:
-https://sourceforge.net/p/libexif/bugs/125/ CVE-2016-6328
----
- libexif/pentax/mnote-pentax-entry.c | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/libexif/pentax/mnote-pentax-entry.c b/libexif/pentax/mnote-pentax-entry.c
-index d03d159..ea0429a 100644
---- a/libexif/pentax/mnote-pentax-entry.c
-+++ b/libexif/pentax/mnote-pentax-entry.c
-@@ -425,24 +425,34 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry,
- 		case EXIF_FORMAT_SHORT:
- 		  {
- 			const unsigned char *data = entry->data;
--		  	size_t k, len = strlen(val);
-+		  	size_t k, len = strlen(val), sizeleft;
-+
-+			sizeleft = entry->size;
- 		  	for(k=0; k<entry->components; k++) {
-+				if (sizeleft < 2)
-+					break;
- 				vs = exif_get_short (data, entry->order);
- 				snprintf (val+len, maxlen-len, "%i ", vs);
- 				len = strlen(val);
- 				data += 2;
-+				sizeleft -= 2;
- 			}
- 		  }
- 		  break;
- 		case EXIF_FORMAT_LONG:
- 		  {
- 			const unsigned char *data = entry->data;
--		  	size_t k, len = strlen(val);
-+		  	size_t k, len = strlen(val), sizeleft;
-+
-+			sizeleft = entry->size;
- 		  	for(k=0; k<entry->components; k++) {
-+				if (sizeleft < 4)
-+					break;
- 				vl = exif_get_long (data, entry->order);
- 				snprintf (val+len, maxlen-len, "%li", (long int) vl);
- 				len = strlen(val);
- 				data += 4;
-+				sizeleft -= 4;
- 			}
- 		  }
- 		  break;
-@@ -455,5 +465,5 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry,
- 		break;
- 	}
- 
--	return (val);
-+	return val;
- }
meta/recipes-support/libexif/libexif/CVE-2017-7544.patch deleted +0 -40
deleted file mode 100644
index e49481ff84..0000000000
@@ -1,40 +0,0 @@
-From 8a92f964a66d476ca8907234359e92a70fc1325b Mon Sep 17 00:00:00 2001
-From: Changqing Li <[email protected]>
-Date: Tue, 28 Aug 2018 15:12:10 +0800
-Subject: [PATCH] On saving makernotes, make sure the makernote container tags
- has a type with 1 byte components.
-
-Fixes (at least):
-	https://sourceforge.net/p/libexif/bugs/130
-	https://sourceforge.net/p/libexif/bugs/129
-
-Upstream-Status: Backport[https://github.com/libexif/libexif/commit/
-c39acd1692023b26290778a02a9232c873f9d71a#diff-830e348923810f00726700b083ec00cd]
-
-CVE: CVE-2017-7544
-
-Signed-off-by: Changqing Li <[email protected]>
----
- libexif/exif-data.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/libexif/exif-data.c b/libexif/exif-data.c
-index 67df4db..6bf89eb 100644
---- a/libexif/exif-data.c
-+++ b/libexif/exif-data.c
-@@ -255,6 +255,12 @@ exif_data_save_data_entry (ExifData *data, ExifEntry *e,
- 			exif_mnote_data_set_offset (data->priv->md, *ds - 6);
- 			exif_mnote_data_save (data->priv->md, &e->data, &e->size);
- 			e->components = e->size;
-+                        if (exif_format_get_size (e->format) != 1) {
-+				/* e->format is taken from input code,
-+				 * but we need to make sure it is a 1 byte
-+				 * entity due to the multiplication below. */
-+				e->format = EXIF_FORMAT_UNDEFINED;
-+			}
- 		}
- 	}
- 
--- 
-2.7.4
-
meta/recipes-support/libexif/libexif/CVE-2018-20030.patch deleted +0 -115

115 lines not on this page · raw message

meta/recipes-support/libexif/libexif_0.6.21.bb deleted +0 -17
deleted file mode 100644
index d847beab18..0000000000
@@ -1,17 +0,0 @@
-SUMMARY = "Library for reading extended image information (EXIF) from JPEG files"
-HOMEPAGE = "http://sourceforge.net/projects/libexif"
-SECTION = "libs"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2 \
-           file://CVE-2017-7544.patch \
-           file://CVE-2016-6328.patch \
-           file://CVE-2018-20030.patch"
-
-SRC_URI[md5sum] = "27339b89850f28c8f1c237f233e05b27"
-SRC_URI[sha256sum] = "16cdaeb62eb3e6dfab2435f7d7bccd2f37438d21c5218ec4e58efa9157d4d41a"
-
-inherit autotools gettext
-
-EXTRA_OECONF += "--disable-docs"
meta/recipes-support/libexif/libexif_0.6.22.bb new file +19 -0
new file mode 100644
index 0000000000..a520d5c9f9
@@ -0,0 +1,19 @@
+SUMMARY = "Library for reading extended image information (EXIF) from JPEG files"
+HOMEPAGE = "https://libexif.github.io/"
+SECTION = "libs"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad"
+
+def version_underscore(v):
+    return "_".join(v.split("."))
+
+SRC_URI = "https://github.com/libexif/libexif/releases/download/libexif-${@version_underscore("${PV}")}-release/libexif-${PV}.tar.xz \
+           "
+
+SRC_URI[sha256sum] = "5048f1c8fc509cc636c2f97f4b40c293338b6041a5652082d5ee2cf54b530c56"
+
+UPSTREAM_CHECK_URI = "https://github.com/libexif/libexif/releases/"
+
+inherit autotools gettext
+
+EXTRA_OECONF += "--disable-docs"
Signature · 1 line
2.26.2
#66 lore raw

PATCH 49/70 ppp: update 2.4.7 -> 2.4.8

In reply to Alexander Kanavin

Drop patches:
0001-ppp-Fix-compilation-errors-in-Makefile.patch - issue fixed upstream 0001-pppoe-include-netinet-in.h-before-linux-in.h.patch - backport cifdefroute.patch - superseded by new default route metric option ppp-2.4.7-DES-openssl.patch - openssl support added upstream

---
 .../ppp/ppp/0001-Fix-build-with-musl.patch    |  69 +---
 ...p-Fix-compilation-errors-in-Makefile.patch |  30 --
 ...clude-netinet-in.h-before-linux-in.h.patch |  54 ----
 .../ppp/ppp/cifdefroute.patch                 | 297 ------------------
 .../makefile-remove-hard-usr-reference.patch  |  32 +-
 .../ppp/ppp/makefile.patch                    |  72 +++--
 .../ppp/ppp/ppp-2.4.7-DES-openssl.patch       |  84 -----
 .../ppp/{ppp_2.4.7.bb => ppp_2.4.8.bb}        |  10 +-
 8 files changed, 78 insertions(+), 570 deletions(-)
 delete mode 100644 meta/recipes-connectivity/ppp/ppp/0001-ppp-Fix-compilation-errors-in-Makefile.patch
 delete mode 100644 meta/recipes-connectivity/ppp/ppp/0001-pppoe-include-netinet-in.h-before-linux-in.h.patch
 delete mode 100644 meta/recipes-connectivity/ppp/ppp/cifdefroute.patch
 delete mode 100644 meta/recipes-connectivity/ppp/ppp/ppp-2.4.7-DES-openssl.patch
 rename meta/recipes-connectivity/ppp/{ppp_2.4.7.bb => ppp_2.4.8.bb} (92%)
meta/recipes-connectivity/ppp/ppp/0001-Fix-build-with-musl.patch +15 -54
index 763e374488..65291368bd 100644
@@ -1,4 +1,4 @@
-From 52a1e41d7541b2c936285844c59bd1be21797860 Mon Sep 17 00:00:00 2001
+From e50cdaed07e51f2508f94eb1f34fe43776e4ca78 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 29 May 2015 14:57:05 -0700
 Subject: [PATCH] Fix build with musl
@@ -6,18 +6,16 @@ Subject: [PATCH] Fix build with musl
 There are several assumption about glibc
 
 Signed-off-by: Khem Raj <[email protected]>
----
 Upstream-Status: Pending
-
+---
  include/net/ppp_defs.h                  | 2 ++
  pppd/Makefile.linux                     | 2 +-
- pppd/magic.h                            | 6 +++---
- pppd/plugins/rp-pppoe/config.h          | 5 ++++-
+ pppd/plugins/rp-pppoe/config.h          | 3 ++-
  pppd/plugins/rp-pppoe/plugin.c          | 1 -
  pppd/plugins/rp-pppoe/pppoe-discovery.c | 8 ++++----
  pppd/plugins/rp-pppoe/pppoe.h           | 2 +-
  pppd/sys-linux.c                        | 3 ++-
- 8 files changed, 17 insertions(+), 12 deletions(-)
+ 7 files changed, 12 insertions(+), 9 deletions(-)
 
 diff --git a/include/net/ppp_defs.h b/include/net/ppp_defs.h
 index b06eda5..dafa36c 100644
@@ -33,11 +31,11 @@ index b06eda5..dafa36c 100644
   * The basic PPP frame.
   */
 diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
-index 8ab2102..d7e2564 100644
+index 4e485a1..76411bc 100644
 --- a/pppd/Makefile.linux
 +++ b/pppd/Makefile.linux
-@@ -126,7 +126,7 @@ LIBS	+= -lcrypt
- #endif
+@@ -131,7 +131,7 @@ LIBS	+= -lcrypt
+ endif
  
  ifdef USE_LIBUTIL
 -CFLAGS	+= -DHAVE_LOGWTMP=1
@@ -45,24 +43,8 @@ index 8ab2102..d7e2564 100644
  LIBS	+= -lutil
  endif
  
-diff --git a/pppd/magic.h b/pppd/magic.h
-index c81213b..9d399e3 100644
---- a/pppd/magic.h
-+++ b/pppd/magic.h
-@@ -42,8 +42,8 @@
-  * $Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp $
-  */
- 
--void magic_init __P((void));	/* Initialize the magic number generator */
--u_int32_t magic __P((void));	/* Returns the next magic number */
-+void magic_init (void);	/* Initialize the magic number generator */
-+u_int32_t magic (void);	/* Returns the next magic number */
- 
- /* Fill buffer with random bytes */
--void random_bytes __P((unsigned char *buf, int len));
-+void random_bytes (unsigned char *buf, int len);
 diff --git a/pppd/plugins/rp-pppoe/config.h b/pppd/plugins/rp-pppoe/config.h
-index 5703087..fff032e 100644
+index a708859..4a16a88 100644
 --- a/pppd/plugins/rp-pppoe/config.h
 +++ b/pppd/plugins/rp-pppoe/config.h
 @@ -78,8 +78,9 @@
@@ -76,18 +58,8 @@ index 5703087..fff032e 100644
  /* Define if you have the <net/if.h> header file.  */
  #define HAVE_NET_IF_H 1
  
-@@ -102,7 +103,9 @@
- #define HAVE_NETPACKET_PACKET_H 1
- 
- /* Define if you have the <sys/cdefs.h> header file.  */
-+#ifdef __GLIBC__
- #define HAVE_SYS_CDEFS_H 1
-+#endif
- 
- /* Define if you have the <sys/dlpi.h> header file.  */
- /* #undef HAVE_SYS_DLPI_H */
 diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c
-index a8c2bb4..ca34d79 100644
+index 44e0c31..93c0906 100644
 --- a/pppd/plugins/rp-pppoe/plugin.c
 +++ b/pppd/plugins/rp-pppoe/plugin.c
 @@ -46,7 +46,6 @@ static char const RCSID[] =
@@ -99,10 +71,10 @@ index a8c2bb4..ca34d79 100644
  #include <linux/ppp_defs.h>
  #include <linux/if_pppox.h>
 diff --git a/pppd/plugins/rp-pppoe/pppoe-discovery.c b/pppd/plugins/rp-pppoe/pppoe-discovery.c
-index 3d3bf4e..d42f619 100644
+index f19c6d8..f45df2c 100644
 --- a/pppd/plugins/rp-pppoe/pppoe-discovery.c
 +++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c
-@@ -27,10 +27,6 @@
+@@ -29,10 +29,6 @@
  #include <linux/if_packet.h>
  #endif
  
@@ -113,22 +85,11 @@ index 3d3bf4e..d42f619 100644
  #ifdef HAVE_ASM_TYPES_H
  #include <asm/types.h>
  #endif
-@@ -47,6 +43,10 @@
- #include <net/if_arp.h>
- #endif
- 
-+#ifndef __GLIBC__
-+#define error(x...) fprintf(stderr, x)
-+#endif
-+
- char *xstrdup(const char *s);
- void usage(void);
- 
 diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h
-index 9ab2eee..75b9004 100644
+index a4e7d5c..de191c8 100644
 --- a/pppd/plugins/rp-pppoe/pppoe.h
 +++ b/pppd/plugins/rp-pppoe/pppoe.h
-@@ -92,7 +92,7 @@ typedef unsigned long UINT32_t;
+@@ -90,7 +90,7 @@ typedef unsigned long UINT32_t;
  #ifdef HAVE_SYS_SOCKET_H
  #include <sys/socket.h>
  #endif
@@ -138,7 +99,7 @@ index 9ab2eee..75b9004 100644
  #endif
  #endif
 diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c
-index a105505..49b0273 100644
+index a0531e9..84ee394 100644
 --- a/pppd/sys-linux.c
 +++ b/pppd/sys-linux.c
 @@ -112,7 +112,7 @@
@@ -159,5 +120,5 @@ index a105505..49b0273 100644
  /*
   *    This is in linux/include/net/ipv6.h.
 -- 
-2.1.4
+2.17.1
 
meta/recipes-connectivity/ppp/ppp/0001-ppp-Fix-compilation-errors-in-Makefile.patch deleted +0 -30
deleted file mode 100644
index ea4969b366..0000000000
@@ -1,30 +0,0 @@
-From ba0f6058d1f25b2b60fc31ab2656bf12a71ffdab Mon Sep 17 00:00:00 2001
-From: Lu Chong <[email protected]>
-Date: Tue, 5 Nov 2013 17:32:56 +0800
-Subject: [PATCH] ppp: Fix compilation errors in Makefile
-
-Make can't exit while compilation error occurs in subdir for plugins building.
-
-Upstream-Status: Pending
-
-Signed-off-by: Lu Chong <[email protected]>
----
- pppd/plugins/Makefile.linux          |    1 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
-index 0a7ec7b..2a2c15a 100644
---- a/pppd/plugins/Makefile.linux
-+++ b/pppd/plugins/Makefile.linux
-@@ -20,7 +20,7 @@ include .depend
- endif
- 
- all:	$(PLUGINS)
--	for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all; done
-+	for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all || exit 1; done
- 
- %.so: %.c
- 	$(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^
--- 
-1.7.9.5
-
meta/recipes-connectivity/ppp/ppp/0001-pppoe-include-netinet-in.h-before-linux-in.h.patch deleted +0 -54

54 lines not on this page · raw message

meta/recipes-connectivity/ppp/ppp/cifdefroute.patch deleted +0 -297

297 lines not on this page · raw message

meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch +14 -18
index 8a69396cc7..614a474c37 100644
@@ -1,3 +1,8 @@
+From 505705d0e1b55ce3fdc10d0e5eab5488f869adb6 Mon Sep 17 00:00:00 2001
+From: Andreas Oberritter <[email protected]>
+Date: Thu, 1 Jul 2010 14:34:12 +0800
+Subject: [PATCH] ppp: Upgraded to version 2.4.5
+
 The patch comes from OpenEmbedded.
 Rebased for ppp-2.4.5. Dongxiao Xu <[email protected]>
 
@@ -6,24 +11,15 @@ Signed-off-by: Andreas Oberritter <[email protected]>
 
 Upstream-Status: Inappropriate [configuration]
 
-Index: ppp-2.4.7/pppd/Makefile.linux
-===================================================================
---- ppp-2.4.7.orig/pppd/Makefile.linux
-+++ ppp-2.4.7/pppd/Makefile.linux
-@@ -120,10 +120,10 @@ CFLAGS   += -DHAS_SHADOW
- #LIBS     += -lshadow $(LIBS)
- endif
- 
--ifneq ($(wildcard /usr/include/crypt.h),)
-+#ifneq ($(wildcard /usr/include/crypt.h),)
- CFLAGS  += -DHAVE_CRYPT_H=1
- LIBS	+= -lcrypt
--endif
-+#endif
- 
- ifdef USE_LIBUTIL
- CFLAGS	+= -DHAVE_LOGWTMP=1
-@@ -177,10 +177,10 @@ LIBS	+= -ldl
+---
+ pppd/Makefile.linux | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
+index 4e485a1..44c4193 100644
+--- a/pppd/Makefile.linux
++++ b/pppd/Makefile.linux
+@@ -188,10 +188,10 @@ LIBS	+= -ldl
  endif
  
  ifdef FILTER
meta/recipes-connectivity/ppp/ppp/makefile.patch +46 -26

116 lines not on this page · raw message

meta/recipes-connectivity/ppp/ppp/ppp-2.4.7-DES-openssl.patch deleted +0 -84

84 lines not on this page · raw message

meta/recipes-connectivity/ppp/ppp_2.4.8.bb renamed from meta/recipes-connectivity/ppp/ppp_2.4.7.bb +3 -7
similarity index 92%
rename from meta/recipes-connectivity/ppp/ppp_2.4.7.bb
rename to meta/recipes-connectivity/ppp/ppp_2.4.8.bb
index 60c56dd0bd..f9c60d6bad 100644
@@ -13,7 +13,6 @@ LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77
 
 SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \
            file://makefile.patch \
-           file://cifdefroute.patch \
            file://pppd-resolv-varrun.patch \
            file://makefile-remove-hard-usr-reference.patch \
            file://pon \
@@ -27,20 +26,17 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \
            file://pap \
            file://ppp_on_boot \
            file://provider \
-           file://0001-ppp-Fix-compilation-errors-in-Makefile.patch \
            file://[email protected] \
            file://fix-CVE-2015-3310.patch \
-           file://0001-pppoe-include-netinet-in.h-before-linux-in.h.patch \
            file://0001-ppp-Remove-unneeded-include.patch \
-           file://ppp-2.4.7-DES-openssl.patch \
            file://0001-pppd-Fix-bounds-check-in-EAP-code.patch \
-"
+           "
 
 SRC_URI_append_libc-musl = "\
            file://0001-Fix-build-with-musl.patch \
 "
-SRC_URI[md5sum] = "78818f40e6d33a1d1de68a1551f6595a"
-SRC_URI[sha256sum] = "02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30"
+SRC_URI[md5sum] = "2ca8342b9804be15103fd3f687af701c"
+SRC_URI[sha256sum] = "f6bf89beae26b2943dff8f1003533d6a5a4909a0fa6edfbec44fe039bbe61bc6"
 
 inherit autotools-brokensep systemd
 
Signature · 1 line
2.26.2
#67 lore raw

PATCH 50/70 gettext: update 0.20.1 -> 0.20.2

In reply to Alexander Kanavin
---
 ...aviour-of-for-msgfmt-on-PO-files-wit.patch |  87 --------
 ...nt.c-timsort.h-fix-formatting-issues.patch |  71 ------
 ...t-env.in-do-not-add-C-CXX-parameters.patch |   0
 ...01-tests-autopoint-3-unset-MAKEFLAGS.patch |   0
 .../add-with-bisonlocaledir.patch             |   0
 .../parallel.patch                            |   0
 .../run-ptest                                 |   0
 .../serial-tests-config.patch                 |   0
 .../use-pkgconfig.patch                       |  36 +---
 .../COPYING                                   |   0
 .../Makefile.in.in                            |  12 +-
 .../aclocal/gettext.m4                        |   8 +-
 .../aclocal/host-cpu-c-abi.m4                 |  45 +++-
 .../aclocal/iconv.m4                          |   2 +-
 .../aclocal/intlmacosx.m4                     |  33 ++-
 .../aclocal/lib-ld.m4                         |   2 +-
 .../aclocal/lib-link.m4                       | 154 +++++++------
 .../aclocal/lib-prefix.m4                     | 203 ++++++++++++------
 .../aclocal/nls.m4                            |  10 +-
 .../aclocal/po.m4                             |   8 +-
 .../aclocal/progtest.m4                       |   8 +-
 .../config.rpath                              |   2 +-
 .../remove-potcdate.sin                       |   0
 ....1.bb => gettext-minimal-native_0.20.2.bb} |   0
 .../{gettext_0.20.1.bb => gettext_0.20.2.bb}  |   8 +-
 25 files changed, 319 insertions(+), 370 deletions(-)
 delete mode 100644 meta/recipes-core/gettext/gettext-0.20.1/0001-msgmerge-Fix-behaviour-of-for-msgfmt-on-PO-files-wit.patch
 delete mode 100644 meta/recipes-core/gettext/gettext-0.20.1/cr-statement.c-timsort.h-fix-formatting-issues.patch
 rename meta/recipes-core/gettext/{gettext-0.20.1 => gettext-0.20.2}/0001-init-env.in-do-not-add-C-CXX-parameters.patch (100%)
 rename meta/recipes-core/gettext/{gettext-0.20.1 => gettext-0.20.2}/0001-tests-autopoint-3-unset-MAKEFLAGS.patch (100%)
 rename meta/recipes-core/gettext/{gettext-0.20.1 => gettext-0.20.2}/add-with-bisonlocaledir.patch (100%)
 rename meta/recipes-core/gettext/{gettext-0.20.1 => gettext-0.20.2}/parallel.patch (100%)
 rename meta/recipes-core/gettext/{gettext-0.20.1 => gettext-0.20.2}/run-ptest (100%)
 rename meta/recipes-core/gettext/{gettext-0.20.1 => gettext-0.20.2}/serial-tests-config.patch (100%)
 rename meta/recipes-core/gettext/{gettext-0.20.1 => gettext-0.20.2}/use-pkgconfig.patch (95%)
 rename meta/recipes-core/gettext/{gettext-minimal-0.20.1 => gettext-minimal-0.20.2}/COPYING (100%)
 rename meta/recipes-core/gettext/{gettext-minimal-0.20.1 => gettext-minimal-0.20.2}/Makefile.in.in (99%)
 rename meta/recipes-core/gettext/{gettext-minimal-0.20.1 => gettext-minimal-0.20.2}/aclocal/gettext.m4 (98%)
 rename meta/recipes-core/gettext/{gettext-minimal-0.20.1 => gettext-minimal-0.20.2}/aclocal/host-cpu-c-abi.m4 (94%)
 rename meta/recipes-core/gettext/{gettext-minimal-0.20.1 => gettext-minimal-0.20.2}/aclocal/iconv.m4 (99%)
 rename meta/recipes-core/gettext/{gettext-minimal-0.20.1 => gettext-minimal-0.20.2}/aclocal/intlmacosx.m4 (70%)
 rename meta/recipes-core/gettext/{gettext-minimal-0.20.1 => gettext-minimal-0.20.2}/aclocal/lib-ld.m4 (98%)
 rename meta/recipes-core/gettext/{gettext-minimal-0.20.1 => gettext-minimal-0.20.2}/aclocal/lib-link.m4 (85%)
 rename meta/recipes-core/gettext/{gettext-minimal-0.20.1 => gettext-minimal-0.20.2}/aclocal/lib-prefix.m4 (54%)
 rename meta/recipes-core/gettext/{gettext-minimal-0.20.1 => gettext-minimal-0.20.2}/aclocal/nls.m4 (77%)
 rename meta/recipes-core/gettext/{gettext-minimal-0.20.1 => gettext-minimal-0.20.2}/aclocal/po.m4 (98%)
 rename meta/recipes-core/gettext/{gettext-minimal-0.20.1 => gettext-minimal-0.20.2}/aclocal/progtest.m4 (92%)
 rename meta/recipes-core/gettext/{gettext-minimal-0.20.1 => gettext-minimal-0.20.2}/config.rpath (99%)
 rename meta/recipes-core/gettext/{gettext-minimal-0.20.1 => gettext-minimal-0.20.2}/remove-potcdate.sin (100%)
 rename meta/recipes-core/gettext/{gettext-minimal-native_0.20.1.bb => gettext-minimal-native_0.20.2.bb} (100%)
 rename meta/recipes-core/gettext/{gettext_0.20.1.bb => gettext_0.20.2.bb} (96%)
meta/recipes-core/gettext/gettext-0.20.1/0001-msgmerge-Fix-behaviour-of-for-msgfmt-on-PO-files-wit.patch deleted +0 -87
deleted file mode 100644
index 2245889386..0000000000
@@ -1,87 +0,0 @@
-From 75e315fdec82d1a17ebcd9e0712d109323578d68 Mon Sep 17 00:00:00 2001
-From: Bruno Haible <[email protected]>
-Date: Sun, 19 May 2019 11:10:06 +0200
-Subject: [PATCH] msgmerge: Fix behaviour of --for-msgfmt on PO files with no
- translations.
-
-msgmerge: Fix behaviour of --for-msgfmt on PO files with no translations.
-
-Reported by Don Lawrence <[email protected]>
-in <https://lists.freedesktop.org/archives/p11-glue/2019-May/000700.html>
-via Daiki Ueno
-in <https://lists.gnu.org/archive/html/bug-gettext/2019-05/msg00124.html>.
-
-* gettext-tools/src/msgmerge.c (main): Treat force_po like true if for_msgfmt
-is true.
-* gettext-tools/tests/msgmerge-26: Add test of PO file with no translations.
-
-Upstream-Status: Backport [https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commitdiff;h=2336451ed68d91ff4b5ae1acbc1eca30e47a86a9]
-Signed-off-by: Khem Raj <[email protected]>
----
- gettext-tools/src/msgmerge.c    |  4 ++--
- gettext-tools/tests/msgmerge-26 | 36 ++++++++++++++++++++++++++++++---
- 2 files changed, 35 insertions(+), 5 deletions(-)
-
-diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c
-index cd762c0..92c9b7a 100644
---- a/gettext-tools/src/msgmerge.c
-+++ b/gettext-tools/src/msgmerge.c
-@@ -520,8 +520,8 @@ There is NO WARRANTY, to the extent permitted by law.\n\
-   else
-     {
-       /* Write the merged message list out.  */
--      msgdomain_list_print (result, output_file, output_syntax, force_po,
--                            false);
-+      msgdomain_list_print (result, output_file, output_syntax,
-+                            for_msgfmt || force_po, false);
-     }
- 
-   exit (EXIT_SUCCESS);
-diff --git a/gettext-tools/tests/msgmerge-26 b/gettext-tools/tests/msgmerge-26
-index cd3862e..b86f7a0 100755
---- a/gettext-tools/tests/msgmerge-26
-+++ b/gettext-tools/tests/msgmerge-26
-@@ -73,7 +73,37 @@ msgstr "Papaya"
- EOF
- 
- : ${DIFF=diff}
--${DIFF} mm-test26.ok mm-test26.out
--result=$?
-+${DIFF} mm-test26.ok mm-test26.out || Exit 1
- 
--exit $result
-+# Test with a PO file that has no translated messages.
-+
-+cat <<\EOF > mm-test26a.in1
-+msgid ""
-+msgstr ""
-+"Content-Type: text/plain; charset=UTF-8\n"
-+
-+msgid "Hello world"
-+msgstr "Hallo Welt"
-+EOF
-+
-+cat <<\EOF > mm-test26a.in2
-+msgid ""
-+msgstr ""
-+"Content-Type: text/plain; charset=ASCII\n"
-+
-+msgid "Hello, world!"
-+msgstr ""
-+EOF
-+
-+: ${MSGMERGE=msgmerge}
-+${MSGMERGE} --for-msgfmt -o mm-test26a.tmp mm-test26a.in1 mm-test26a.in2 \
-+    || Exit 1
-+LC_ALL=C tr -d '\r' < mm-test26a.tmp > mm-test26a.out || Exit 1
-+
-+cat <<\EOF > mm-test26a.ok
-+msgid ""
-+msgstr "Content-Type: text/plain; charset=UTF-8\n"
-+EOF
-+
-+: ${DIFF=diff}
-+${DIFF} mm-test26a.ok mm-test26a.out || Exit 1
--- 
-2.24.1
-
meta/recipes-core/gettext/gettext-0.20.1/cr-statement.c-timsort.h-fix-formatting-issues.patch deleted +0 -71

71 lines not on this page · raw message

meta/recipes-core/gettext/gettext-0.20.2/0001-init-env.in-do-not-add-C-CXX-parameters.patch renamed from meta/recipes-core/gettext/gettext-0.20.1/0001-init-env.in-do-not-add-C-CXX-parameters.patch +0 -0
similarity index 100%
rename from meta/recipes-core/gettext/gettext-0.20.1/0001-init-env.in-do-not-add-C-CXX-parameters.patch
rename to meta/recipes-core/gettext/gettext-0.20.2/0001-init-env.in-do-not-add-C-CXX-parameters.patch
meta/recipes-core/gettext/gettext-0.20.2/0001-tests-autopoint-3-unset-MAKEFLAGS.patch renamed from meta/recipes-core/gettext/gettext-0.20.1/0001-tests-autopoint-3-unset-MAKEFLAGS.patch +0 -0
similarity index 100%
rename from meta/recipes-core/gettext/gettext-0.20.1/0001-tests-autopoint-3-unset-MAKEFLAGS.patch
rename to meta/recipes-core/gettext/gettext-0.20.2/0001-tests-autopoint-3-unset-MAKEFLAGS.patch
meta/recipes-core/gettext/gettext-0.20.2/add-with-bisonlocaledir.patch renamed from meta/recipes-core/gettext/gettext-0.20.1/add-with-bisonlocaledir.patch +0 -0
similarity index 100%
rename from meta/recipes-core/gettext/gettext-0.20.1/add-with-bisonlocaledir.patch
rename to meta/recipes-core/gettext/gettext-0.20.2/add-with-bisonlocaledir.patch
meta/recipes-core/gettext/gettext-0.20.2/parallel.patch renamed from meta/recipes-core/gettext/gettext-0.20.1/parallel.patch +0 -0
similarity index 100%
rename from meta/recipes-core/gettext/gettext-0.20.1/parallel.patch
rename to meta/recipes-core/gettext/gettext-0.20.2/parallel.patch
meta/recipes-core/gettext/gettext-0.20.2/run-ptest renamed from meta/recipes-core/gettext/gettext-0.20.1/run-ptest +0 -0
similarity index 100%
rename from meta/recipes-core/gettext/gettext-0.20.1/run-ptest
rename to meta/recipes-core/gettext/gettext-0.20.2/run-ptest
meta/recipes-core/gettext/gettext-0.20.2/serial-tests-config.patch renamed from meta/recipes-core/gettext/gettext-0.20.1/serial-tests-config.patch +0 -0
similarity index 100%
rename from meta/recipes-core/gettext/gettext-0.20.1/serial-tests-config.patch
rename to meta/recipes-core/gettext/gettext-0.20.2/serial-tests-config.patch
meta/recipes-core/gettext/gettext-0.20.2/use-pkgconfig.patch renamed from meta/recipes-core/gettext/gettext-0.20.1/use-pkgconfig.patch +11 -25
similarity index 95%
rename from meta/recipes-core/gettext/gettext-0.20.1/use-pkgconfig.patch
rename to meta/recipes-core/gettext/gettext-0.20.2/use-pkgconfig.patch
index d3f3fe8e2f..feb56719d7 100644
@@ -1,4 +1,4 @@
-From ef414b06be80c6f605731abc9e674e396b80ec9e Mon Sep 17 00:00:00 2001
+From c832880c5242b454a2c9e61b6a2dc26aecdc51bd 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
@@ -15,14 +15,14 @@ Signed-off-by: Ross Burton <[email protected]>
 
 ---
  gettext-tools/gnulib-m4/libxml.m4             |  99 +----------------
- .../gnulib-local/lib/term-styled-ostream.oo.c |  12 +-
+ .../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-local/m4/libglib.m4       | 100 +++---------------
  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(-)
+ libtextstyle/gnulib-m4/libglib.m4             | 100 +++---------------
+ libtextstyle/lib/term-styled-ostream.c        |  12 +--
+ libtextstyle/lib/term-styled-ostream.oo.c     |  12 +--
+ 8 files changed, 83 insertions(+), 450 deletions(-)
 
 diff --git a/gettext-tools/gnulib-m4/libxml.m4 b/gettext-tools/gnulib-m4/libxml.m4
 index 05b9550..031ee65 100644
@@ -289,17 +289,10 @@ index bc53cc6..10b2455 100644
    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
+index 5853772..767fba2 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.
+@@ -6,100 +6,26 @@ dnl with or without modifications, as long as this notice is preserved.
  
  dnl From Bruno Haible.
  
@@ -535,17 +528,10 @@ index bc53cc6..10b2455 100644
    AC_SUBST([LTLIBCROCO])
    AC_SUBST([INCCROCO])
 diff --git a/libtextstyle/gnulib-m4/libglib.m4 b/libtextstyle/gnulib-m4/libglib.m4
-index bef6fa3..8841755 100644
+index 5853772..767fba2 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.
+@@ -6,100 +6,26 @@ dnl with or without modifications, as long as this notice is preserved.
  
  dnl From Bruno Haible.
  
meta/recipes-core/gettext/gettext-minimal-0.20.2/COPYING renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/COPYING +0 -0
similarity index 100%
rename from meta/recipes-core/gettext/gettext-minimal-0.20.1/COPYING
rename to meta/recipes-core/gettext/gettext-minimal-0.20.2/COPYING
meta/recipes-core/gettext/gettext-minimal-0.20.2/Makefile.in.in renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/Makefile.in.in +7 -5
similarity index 99%
rename from meta/recipes-core/gettext/gettext-minimal-0.20.1/Makefile.in.in
rename to meta/recipes-core/gettext/gettext-minimal-0.20.2/Makefile.in.in
index fdb6ad3588..de980e040a 100644
@@ -1,13 +1,13 @@
 # Makefile for PO directory in any package using GNU gettext.
 # Copyright (C) 1995-2000 Ulrich Drepper <[email protected]>
-# Copyright (C) 2000-2019 Free Software Foundation, Inc.
+# Copyright (C) 2000-2020 Free Software Foundation, Inc.
 #
 # 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.
 #
-# Origin: gettext-0.20
+# Origin: gettext-0.20.2
 GETTEXT_MACRO_VERSION = 0.20
 
 PACKAGE = @PACKAGE@
@@ -90,6 +90,9 @@ DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
 
 # Makevars gets inserted here. (Don't remove this line!)
 
+all: all-@USE_NLS@
+
+
 .SUFFIXES:
 .SUFFIXES: .po .gmo .sed .sin .nop .po-create .po-update
 
@@ -107,7 +110,8 @@ DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
 # the .pot file. This eliminates the need to update the .po files when the
 # .pot file has changed, which would be troublesome if the .po files are put
 # under version control.
-.po.gmo: $(srcdir)/$(DOMAIN).pot
+$(GMOFILES): $(srcdir)/$(DOMAIN).pot
+.po.gmo:
 	@lang=`echo $* | sed -e 's,.*/,,'`; \
 	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
 	echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \
@@ -123,8 +127,6 @@ DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
 	mv t-$@ $@
 
 
-all: all-@USE_NLS@
-
 all-yes: $(srcdir)/stamp-po
 all-no:
 
meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/gettext.m4 renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/gettext.m4 +4 -4
similarity index 98%
rename from meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/gettext.m4
rename to meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/gettext.m4
index e7832418ea..4f25a27d93 100644
@@ -1,15 +1,15 @@
-# gettext.m4 serial 70 (gettext-0.20)
-dnl Copyright (C) 1995-2014, 2016, 2018 Free Software Foundation, Inc.
+# gettext.m4 serial 71 (gettext-0.20.2)
+dnl Copyright (C) 1995-2014, 2016, 2018-2020 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
 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 the GNU General Public License or the GNU Lesser 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 by the GNU Lesser 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.
 
meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/host-cpu-c-abi.m4 renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/host-cpu-c-abi.m4 +38 -7

78 lines not on this page · raw message

meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/iconv.m4 renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/iconv.m4 +1 -1
similarity index 99%
rename from meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/iconv.m4
rename to meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/iconv.m4
index a285e9daa5..e593b7270a 100644
@@ -1,5 +1,5 @@
 # iconv.m4 serial 21
-dnl Copyright (C) 2000-2002, 2007-2014, 2016-2019 Free Software Foundation,
+dnl Copyright (C) 2000-2002, 2007-2014, 2016-2020 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/intlmacosx.m4 renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/intlmacosx.m4 +13 -20
similarity index 70%
rename from meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/intlmacosx.m4
rename to meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/intlmacosx.m4
index 30e6f50e0a..ebd9937c1a 100644
@@ -1,15 +1,15 @@
-# intlmacosx.m4 serial 6 (gettext-0.20)
-dnl Copyright (C) 2004-2014, 2016, 2019 Free Software Foundation, Inc.
+# intlmacosx.m4 serial 8 (gettext-0.20.2)
+dnl Copyright (C) 2004-2014, 2016, 2019-2020 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
 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 the GNU General Public License or the GNU Lesser 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 by the GNU Lesser 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.
 
@@ -33,21 +33,15 @@ AC_DEFUN([gt_INTL_MACOSX],
     AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
       [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
   fi
-  dnl Check for API introduced in Mac OS X 10.5.
-  AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
-    [gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_LINK_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <CoreFoundation/CFLocale.h>]],
-          [[CFLocaleCopyCurrent();]])],
-       [gt_cv_func_CFLocaleCopyCurrent=yes],
-       [gt_cv_func_CFLocaleCopyCurrent=no])
-     LIBS="$gt_save_LIBS"])
-  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
-      [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
-  fi
+  dnl Don't check for the API introduced in Mac OS X 10.5, CFLocaleCopyCurrent,
+  dnl because in macOS 10.13.4 it has the following behaviour:
+  dnl When two or more languages are specified in the
+  dnl "System Preferences > Language & Region > Preferred Languages" panel,
+  dnl it returns en_CC where CC is the territory (even when English is not among
+  dnl the preferred languages!).  What we want instead is what
+  dnl CFLocaleCopyCurrent returned in earlier macOS releases and what
+  dnl CFPreferencesCopyAppValue still returns, namely ll_CC where ll is the
+  dnl first among the preferred languages and CC is the territory.
   AC_CACHE_CHECK([for CFLocaleCopyPreferredLanguages], [gt_cv_func_CFLocaleCopyPreferredLanguages],
     [gt_save_LIBS="$LIBS"
      LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
@@ -64,7 +58,6 @@ AC_DEFUN([gt_INTL_MACOSX],
   fi
   INTL_MACOSX_LIBS=
   if test $gt_cv_func_CFPreferencesCopyAppValue = yes \
-     || test $gt_cv_func_CFLocaleCopyCurrent = yes \
      || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
     INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
   fi
meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-ld.m4 renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-ld.m4 +1 -1
similarity index 98%
rename from meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-ld.m4
rename to meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-ld.m4
index a18719630d..98c348faff 100644
@@ -1,5 +1,5 @@
 # lib-ld.m4 serial 9
-dnl Copyright (C) 1996-2003, 2009-2019 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2003, 2009-2020 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.
meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-link.m4 renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-link.m4 +90 -64

269 lines not on this page · raw message

meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-prefix.m4 renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-prefix.m4 +137 -66

243 lines not on this page · raw message

meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/nls.m4 renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/nls.m4 +5 -5
similarity index 77%
rename from meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/nls.m4
rename to meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/nls.m4
index b62f614857..5a506fc4b5 100644
@@ -1,16 +1,16 @@
-# nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019 Free Software
-dnl Foundation, Inc.
+# nls.m4 serial 6 (gettext-0.20.2)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019-2020 Free
+dnl 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
 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 the GNU General Public License or the GNU Lesser 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 by the GNU Lesser 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.
 
meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/po.m4 renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/po.m4 +4 -4
similarity index 98%
rename from meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/po.m4
rename to meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/po.m4
index 143792dba5..3778fd7aac 100644
@@ -1,15 +1,15 @@
-# po.m4 serial 30 (gettext-0.20)
-dnl Copyright (C) 1995-2014, 2016, 2018-2019 Free Software Foundation, Inc.
+# po.m4 serial 31 (gettext-0.20.2)
+dnl Copyright (C) 1995-2014, 2016, 2018-2020 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
 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 the GNU General Public License or the GNU Lesser 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 by the GNU Lesser 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.
 
meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/progtest.m4 renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/progtest.m4 +4 -4
similarity index 92%
rename from meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/progtest.m4
rename to meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/progtest.m4
index 5f186b1490..f28010aed1 100644
@@ -1,15 +1,15 @@
-# progtest.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1996-2003, 2005, 2008-2019 Free Software Foundation, Inc.
+# progtest.m4 serial 8 (gettext-0.20.2)
+dnl Copyright (C) 1996-2003, 2005, 2008-2020 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
 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 the GNU General Public License or the GNU Lesser 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 by the GNU Lesser 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.
 
meta/recipes-core/gettext/gettext-minimal-0.20.2/config.rpath renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/config.rpath +1 -1
similarity index 99%
rename from meta/recipes-core/gettext/gettext-minimal-0.20.1/config.rpath
rename to meta/recipes-core/gettext/gettext-minimal-0.20.2/config.rpath
index be202c1a9e..24be79cfb6 100755
@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2019 Free Software Foundation, Inc.
+#   Copyright 1996-2020 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <[email protected]>, 1996
 #
meta/recipes-core/gettext/gettext-minimal-0.20.2/remove-potcdate.sin renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/remove-potcdate.sin +0 -0
similarity index 100%
rename from meta/recipes-core/gettext/gettext-minimal-0.20.1/remove-potcdate.sin
rename to meta/recipes-core/gettext/gettext-minimal-0.20.2/remove-potcdate.sin
meta/recipes-core/gettext/gettext-minimal-native_0.20.2.bb renamed from meta/recipes-core/gettext/gettext-minimal-native_0.20.1.bb +0 -0
similarity index 100%
rename from meta/recipes-core/gettext/gettext-minimal-native_0.20.1.bb
rename to meta/recipes-core/gettext/gettext-minimal-native_0.20.2.bb
meta/recipes-core/gettext/gettext_0.20.2.bb renamed from meta/recipes-core/gettext/gettext_0.20.1.bb +3 -5
similarity index 96%
rename from meta/recipes-core/gettext/gettext_0.20.1.bb
rename to meta/recipes-core/gettext/gettext_0.20.2.bb
index 85493e7595..fda11c44cc 100644
@@ -19,16 +19,14 @@ 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://run-ptest \
            file://serial-tests-config.patch \
-           file://0001-msgmerge-Fix-behaviour-of-for-msgfmt-on-PO-files-wit.patch \
            file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \
            file://0001-init-env.in-do-not-add-C-CXX-parameters.patch \
            "
-SRC_URI[md5sum] = "bb5b0c0caa028105f3ca1905ddc306e2"
-SRC_URI[sha256sum] = "66415634c6e8c3fa8b71362879ec7575e27da43da562c798a8a2f223e6e47f5c"
+SRC_URI[md5sum] = "30fec34a895fab4c02584449c500aac2"
+SRC_URI[sha256sum] = "ecb9d0908ca41d5ca5fef974323b3bba6bec19eebba0b44f396de98cfcc089f1"
 
 inherit autotools texinfo pkgconfig ptest
 
@@ -132,7 +130,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.20/"
+                GETTEXTDATADIR="${STAGING_DATADIR_NATIVE}/gettext-0.20.2/"
 
 }
 
Signature · 1 line
2.26.2
#68 lore raw

PATCH 51/70 ptest-runner: fix upstream version check

In reply to Alexander Kanavin
---
 meta/recipes-support/ptest-runner/ptest-runner_2.4.0.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-support/ptest-runner/ptest-runner_2.4.0.bb +1 -0
index 09fabdeebc..0a3186dac4 100644
@@ -12,6 +12,7 @@ PV = "2.4.0+git${SRCPV}"
 
 SRC_URI = "git://git.yoctoproject.org/ptest-runner2 \
 "
+UPSTREAM_VERSION_UNKNOWN = "1"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.26.2
#69 lore raw

PATCH 52/70 automake: 1.16.1 -> 1.16.2

In reply to Alexander Kanavin
---
 ...-in-shebangs-with-modern-use-warnings.patch | 18 +++++++++---------
 .../{automake_1.16.1.bb => automake_1.16.2.bb} |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)
 rename meta/recipes-devtools/automake/{automake_1.16.1.bb => automake_1.16.2.bb} (89%)
meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch +9 -9
index 1592c02cb9..0e84c4bf86 100644
@@ -1,4 +1,4 @@
-From 081385f4d4bba367afad3bff1fa034f5263305e6 Mon Sep 17 00:00:00 2001
+From 857c843d4bcf576467b505eb05a47f3e7d32caaa Mon Sep 17 00:00:00 2001
 From: Serhii Popovych <[email protected]>
 Date: Wed, 10 Feb 2016 17:07:32 +0000
 Subject: [PATCH] perl: Replace -w option in shebangs with modern "use
@@ -23,16 +23,16 @@ Signed-off-by: Robert Yang <[email protected]>
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/bin/aclocal.in b/bin/aclocal.in
-index b3715d9..461d453 100644
+index 9a20325..bd185d4 100644
 --- a/bin/aclocal.in
 +++ b/bin/aclocal.in
 @@ -1,4 +1,4 @@
 -#!@PERL@ -w
 +#!@PERL@
- # -*- perl -*-
+ # aclocal - create aclocal.m4 by scanning configure.ac      -*- perl -*-
  # @configure_input@
- 
-@@ -32,6 +32,7 @@ BEGIN
+ # Copyright (C) 1996-2020 Free Software Foundation, Inc.
+@@ -26,6 +26,7 @@ BEGIN
  }
  
  use strict;
@@ -41,16 +41,16 @@ index b3715d9..461d453 100644
  use Automake::Config;
  use Automake::General;
 diff --git a/bin/automake.in b/bin/automake.in
-index 8377d20..3a66965 100644
+index 5ed404a..d387b8e 100644
 --- a/bin/automake.in
 +++ b/bin/automake.in
 @@ -1,4 +1,4 @@
 -#!@PERL@ -w
 +#!@PERL@
- # -*- perl -*-
+ # automake - create Makefile.in from Makefile.am            -*- perl -*-
  # @configure_input@
- 
-@@ -28,6 +28,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+@@ -23,6 +23,7 @@
  package Automake;
  
  use strict;
meta/recipes-devtools/automake/automake_1.16.2.bb renamed from meta/recipes-devtools/automake/automake_1.16.1.bb +2 -2
similarity index 89%
rename from meta/recipes-devtools/automake/automake_1.16.1.bb
rename to meta/recipes-devtools/automake/automake_1.16.2.bb
index d82eed3c60..fd8ed0ed3b 100644
@@ -28,8 +28,8 @@ SRC_URI += "file://python-libdir.patch \
             file://0001-build-fix-race-in-parallel-builds.patch \
             "
 
-SRC_URI[md5sum] = "83cc2463a4080efd46a72ba2c9f6b8f5"
-SRC_URI[sha256sum] = "608a97523f97db32f1f5d5615c98ca69326ced2054c9f82e65bade7fc4c9dea8"
+SRC_URI[md5sum] = "f1a14f2ab2b0fb861a011e1d94e589e0"
+SRC_URI[sha256sum] = "b2f361094b410b4acbf4efba7337bdb786335ca09eb2518635a09fb7319ca5c1"
 
 PERL = "${USRBINPATH}/perl"
 PERL_class-native = "${USRBINPATH}/env perl"
Signature · 1 line
2.26.2
#70 lore raw

PATCH 53/70 bison: 3.5.4 -> 3.6.2

In reply to Alexander Kanavin

Drop dont-depend-on-help2man.patch.patch, as pre-build manpages are already packaged into source tarballs.

---
 .../bison/dont-depend-on-help2man.patch.patch | 44 -------------------
 .../bison/{bison_3.5.4.bb => bison_3.6.2.bb}  |  5 +--
 2 files changed, 2 insertions(+), 47 deletions(-)
 delete mode 100644 meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch.patch
 rename meta/recipes-devtools/bison/{bison_3.5.4.bb => bison_3.6.2.bb} (91%)
meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch.patch deleted +0 -44
deleted file mode 100644
index 8a41a3a762..0000000000
@@ -1,44 +0,0 @@
-From 31bb81ef15c42b10844eb8af8738f672076edf0e Mon Sep 17 00:00:00 2001
-From: Marko Lindqvist <[email protected]>
-Date: Tue, 21 Apr 2015 00:48:45 -0700
-Subject: [PATCH] doc/local.mk: dont-depend-on-help2man.patch
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Marko Lindqvist <[email protected]>
-
-Updated for bison 3.0.4
-
-Signed-off-by: Robert Yang <[email protected]>
-
----
- doc/local.mk | 9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/doc/local.mk b/doc/local.mk
-index d12836e..f9bf332 100644
---- a/doc/local.mk
-+++ b/doc/local.mk
-@@ -101,10 +101,7 @@ endif ! CROSS_COMPILING
- ## Man Pages.  ##
- ## ----------- ##
- 
--dist_man_MANS = $(top_srcdir)/doc/bison.1
--
--EXTRA_DIST += $(dist_man_MANS:.1=.x)
--MAINTAINERCLEANFILES += $(dist_man_MANS)
-+EXTRA_DIST += bison.x
- 
- # Differences to ignore when comparing the man page (the date).
- remove_time_stamp = \
-@@ -127,10 +124,6 @@ $(top_srcdir)/doc/bison.1: $(MAN_DEPS)
- 	fi
- 	$(AM_V_at)rm -f $@*.tmp
- 
--if ENABLE_YACC
--nodist_man_MANS = doc/yacc.1
--endif
--
- ## ----------------------------- ##
- ## Graphviz examples generation. ##
- ## ----------------------------- ##
meta/recipes-devtools/bison/bison_3.6.2.bb renamed from meta/recipes-devtools/bison/bison_3.5.4.bb +2 -3
similarity index 91%
rename from meta/recipes-devtools/bison/bison_3.5.4.bb
rename to meta/recipes-devtools/bison/bison_3.6.2.bb
index 124bc41d3e..2ec9381231 100644
@@ -10,11 +10,10 @@ SECTION = "devel"
 DEPENDS = "bison-native flex-native"
 
 SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \
-           file://dont-depend-on-help2man.patch.patch \
            file://add-with-bisonlocaledir.patch \
            file://0001-bison-fix-the-parallel-build.patch \
-"
-SRC_URI[sha256sum] = "4c17e99881978fa32c05933c5262457fa5b2b611668454f8dc2a695cd6b3720c"
+           "
+SRC_URI[sha256sum] = "4a164b5cc971b896ce976bf4b624fab7279e0729cf983a5135df7e4df0970f6e"
 
 # No point in hardcoding path to m4, just use PATH
 EXTRA_OECONF += "M4=m4"
Signature · 1 line
2.26.2
#71 lore raw

PATCH 54/70 cmake: update 3.16.5 -> 3.17.3

In reply to Alexander Kanavin

License-Update: copyright years

---
 ...e-native_3.16.5.bb => cmake-native_3.17.3.bb} |  0
 meta/recipes-devtools/cmake/cmake.inc            |  7 +++----
 ...eSystem-use-oe-environment-vars-to-load.patch |  2 +-
 ...0002-cmake-Prevent-the-detection-of-Qt5.patch | 16 ++++++++--------
 .../cmake/{cmake_3.16.5.bb => cmake_3.17.3.bb}   |  0
 5 files changed, 12 insertions(+), 13 deletions(-)
 rename meta/recipes-devtools/cmake/{cmake-native_3.16.5.bb => cmake-native_3.17.3.bb} (100%)
 rename meta/recipes-devtools/cmake/{cmake_3.16.5.bb => cmake_3.17.3.bb} (100%)
meta/recipes-devtools/cmake/cmake-native_3.17.3.bb renamed from meta/recipes-devtools/cmake/cmake-native_3.16.5.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake-native_3.16.5.bb
rename to meta/recipes-devtools/cmake/cmake-native_3.17.3.bb
meta/recipes-devtools/cmake/cmake.inc +3 -4
index 09949b566c..7f0307c15b 100644
@@ -10,8 +10,8 @@ HOMEPAGE = "http://www.cmake.org/"
 BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php"
 SECTION = "console/utils"
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://Copyright.txt;md5=622747147b46f22e1953876a7cba3323 \
-                    file://Source/cmake.h;md5=4494dee184212fc89c469c3acd555a14;beginline=1;endline=3 \
+LIC_FILES_CHKSUM = "file://Copyright.txt;md5=c721f56fce89ba2eadc2fdd8ba1f4d83 \
+                    file://Source/cmake.h;beginline=1;endline=3;md5=4494dee184212fc89c469c3acd555a14 \
                     "
 
 CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
@@ -22,7 +22,6 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
            file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \
 "
 
-SRC_URI[md5sum] = "d86ccaf3d2462b6b5947919abe5b9f15"
-SRC_URI[sha256sum] = "5f760b50b8ecc9c0c37135fae5fbf00a2fef617059aa9d61c1bb91653e5a8bfc"
+SRC_URI[sha256sum] = "0bd60d512275dc9f6ef2a2865426a184642ceb3761794e6b65bff233b91d8c40"
 
 UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch +1 -1
index e2a58d25e2..f5c1a212f5 100644
@@ -1,4 +1,4 @@
-From ab272d703ce77f323aa1285526559c9efbf85834 Mon Sep 17 00:00:00 2001
+From d4aa2dbdc69774ad668756586d59331ad215a2c6 Mon Sep 17 00:00:00 2001
 From: Cody P Schafer <[email protected]>
 Date: Thu, 27 Apr 2017 11:35:05 -0400
 Subject: [PATCH] CMakeDetermineSystem: use oe environment vars to load default
meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch +8 -8
index 61c8f27cd6..cf1dda7c9b 100644
@@ -1,4 +1,4 @@
-From 5a86c7fa987bd407f228176df2abeffd015be9ea Mon Sep 17 00:00:00 2001
+From 126994379ea75c8826874656bb55f955182ae911 Mon Sep 17 00:00:00 2001
 From: Otavio Salvador <[email protected]>
 Date: Wed, 17 Jan 2018 10:02:14 -0200
 Subject: [PATCH] cmake: Prevent the detection of Qt5
@@ -25,7 +25,7 @@ Signed-off-by: Otavio Salvador <[email protected]>
  7 files changed, 8 insertions(+), 9 deletions(-)
 
 diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
-index cb89d19..9e68981 100644
+index 98dd0e2..252302b 100644
 --- a/Source/QtDialog/CMakeLists.txt
 +++ b/Source/QtDialog/CMakeLists.txt
 @@ -3,7 +3,7 @@
@@ -38,18 +38,18 @@ index cb89d19..9e68981 100644
    include_directories(${Qt5Widgets_INCLUDE_DIRS})
    add_definitions(${Qt5Widgets_DEFINITONS})
 diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
-index 57fa7fc..d50c146 100644
+index aff7383..e220503 100644
 --- a/Tests/CMakeLists.txt
 +++ b/Tests/CMakeLists.txt
-@@ -1329,7 +1329,7 @@ ${CMake_SOURCE_DIR}/Utilities/Release/push.bash --dir dev -- '${CMake_BUILD_NIGH
+@@ -215,7 +215,7 @@ if(BUILD_TESTING)
      set(CMake_TEST_Qt5 1)
    endif()
    if(CMake_TEST_Qt5)
 -    find_package(Qt5Widgets QUIET NO_MODULE)
 +    #find_package(Qt5Widgets QUIET NO_MODULE)
    endif()
-   if(CMake_TEST_Qt5 AND Qt5Widgets_FOUND)
-     add_subdirectory(Qt5Autogen)
+ 
+   if(NOT CMake_TEST_EXTERNAL_CMAKE)
 diff --git a/Tests/Qt4And5Automoc/CMakeLists.txt b/Tests/Qt4And5Automoc/CMakeLists.txt
 index ad74961..a9dd74b 100644
 --- a/Tests/Qt4And5Automoc/CMakeLists.txt
@@ -96,10 +96,10 @@ index c08efc4..87e25d9 100644
  set(CMAKE_CXX_STANDARD 11)
  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin)
 diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
-index 6b2f117..1002005 100644
+index e9f8bca..3a2da34 100644
 --- a/Tests/RunCMake/CMakeLists.txt
 +++ b/Tests/RunCMake/CMakeLists.txt
-@@ -376,7 +376,7 @@ else()
+@@ -396,7 +396,7 @@ else()
  endif()
  
  find_package(Qt4 QUIET)
meta/recipes-devtools/cmake/cmake_3.17.3.bb renamed from meta/recipes-devtools/cmake/cmake_3.16.5.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake_3.16.5.bb
rename to meta/recipes-devtools/cmake/cmake_3.17.3.bb
Signature · 1 line
2.26.2
#72 lore raw

PATCH 55/70 gnu-config: update to latest revision

In reply to Alexander Kanavin
---
 meta/recipes-devtools/gnu-config/gnu-config_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/gnu-config/gnu-config_git.bb +2 -2
index 48b7e6d4a6..9d1874c7bc 100644
@@ -8,8 +8,8 @@ DEPENDS_class-native = "hostperl-runtime-native"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
-SRCREV = "5256817ace8493502ec88501a19e4051c2e220b0"
-PV = "20200117+git${SRCPV}"
+SRCREV = "e78c96e5288993aaea3ec44e5c6ee755c668da79"
+PV = "20200515+git${SRCPV}"
 
 SRC_URI = "git://git.savannah.gnu.org/config.git \
            file://gnu-configize.in"
Signature · 1 line
2.26.2
#73 lore raw

PATCH 56/70 jquery: update to 3.5.1

In reply to Alexander Kanavin
---
 .../jquery/{jquery_3.5.0.bb => jquery_3.5.1.bb}           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/jquery/{jquery_3.5.0.bb => jquery_3.5.1.bb} (67%)
meta/recipes-devtools/jquery/jquery_3.5.1.bb renamed from meta/recipes-devtools/jquery/jquery_3.5.0.bb +4 -4
similarity index 67%
rename from meta/recipes-devtools/jquery/jquery_3.5.0.bb
rename to meta/recipes-devtools/jquery/jquery_3.5.1.bb
index 5c6f9cddbe..b4d7e80afe 100644
@@ -2,7 +2,7 @@ SUMMARY = "jQuery is a fast, small, and feature-rich JavaScript library"
 HOMEPAGE = "https://jquery.com/"
 LICENSE = "MIT"
 SECTION = "devel"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/${BP}.js;startline=8;endline=10;md5=b1e67ece919e852643f1541a54492d65"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/${BP}.js;beginline=8;endline=10;md5=ebd7bc5d23ab165188e526a0c65d24bb"
 
 SRC_URI = "\
     https://code.jquery.com/${BP}.js;name=js \
@@ -10,9 +10,9 @@ SRC_URI = "\
     https://code.jquery.com/${BP}.min.map;name=map \
     "
 
-SRC_URI[js.sha256sum] = "aff01a147aeccc9b70a5efad1f2362fd709f3316296ec460d94aa7d31decdb37"
-SRC_URI[min.sha256sum] = "c4dccdd9ae25b64078e0c73f273de94f8894d5c99e4741645ece29aeefc9c5a4"
-SRC_URI[map.sha256sum] = "3149351c8cbc3fb230bbf6188617c7ffda77d9e14333f4f5f0aa1aae379df892"
+SRC_URI[js.sha256sum] = "416a3b2c3bf16d64f6b5b6d0f7b079df2267614dd6847fc2f3271b4409233c37"
+SRC_URI[min.sha256sum] = "f7f6a5894f1d19ddad6fa392b2ece2c5e578cbf7da4ea805b6885eb6985b6e3d"
+SRC_URI[map.sha256sum] = "511d6f6d3e7acec78cd2505f04282b6e01329b4c24931f39d91739d0d1ddeef8"
 
 UPSTREAM_CHECK_REGEX = "jquery-(?P<pver>\d+(\.\d+)+)\.js"
 
Signature · 1 line
2.26.2
#74 lore raw

PATCH 57/70 json-c: update 0.13.1 - > 0.14

In reply to Alexander Kanavin
---
 ...d-disable-werror-option-to-configure.patch | 45 -------------------
 .../{json-c_0.13.1.bb => json-c_0.14.bb}      | 11 ++---
 2 files changed, 3 insertions(+), 53 deletions(-)
 delete mode 100644 meta/recipes-devtools/json-c/json-c/add-disable-werror-option-to-configure.patch
 rename meta/recipes-devtools/json-c/{json-c_0.13.1.bb => json-c_0.14.bb} (67%)
meta/recipes-devtools/json-c/json-c/add-disable-werror-option-to-configure.patch deleted +0 -45
deleted file mode 100644
index 0c20c8458a..0000000000
@@ -1,45 +0,0 @@
-json-c: Backport --disable-werror patch to allow compilation under icecc
-
-icecc preprocesses source files locally before shipping them off to be compiled
-on remote hosts. This preprocessing removes comments, including /* fallthough */
-comments in switch statements that normally prevent an implicit-fallthrough
-warning, see https://github.com/icecc/icecream/issues/419
-
-Rather than turning off -Werror, the upstream project has implemented a
-configure option, --disable-werror, in response to Ross's
-https://github.com/json-c/json-c/issues/489
-
-This patch from
-https://github.com/json-c/json-c/commit/21c886534f8927fdc0fb5f8647394f3e0e0874b8
-
-Upstream-Status: Backport [Not yet released]
-Signed-off-by: Douglas Royds <[email protected]>
-
-From 21c886534f8927fdc0fb5f8647394f3e0e0874b8 Mon Sep 17 00:00:00 2001
-From: Pierce Lopez <[email protected]>
-Date: Sun, 9 Jun 2019 10:52:08 -0400
-Subject: [PATCH] build: add --disable-werror option to configure
-
-to omit -Werror compiler option
----
- configure.ac | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 272ea6af9c..798fd5b747 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -165,7 +165,12 @@ AS_IF([test "x$enable_Bsymbolic" = "xcheck"],
- AS_IF([test "x$enable_Bsymbolic" = "xyes"], [JSON_BSYMBOLIC_LDFLAGS=-Wl[,]-Bsymbolic-functions])
- AC_SUBST(JSON_BSYMBOLIC_LDFLAGS)
- 
--AX_APPEND_COMPILE_FLAGS([-Wall -Werror -Wcast-qual -Wno-error=deprecated-declarations])
-+AC_ARG_ENABLE([werror],
-+    AS_HELP_STRING([--disable-werror], [avoid treating compiler warnings as fatal errors]))
-+
-+AS_IF([test "x$enable_werror" != "xno"], [AX_APPEND_COMPILE_FLAGS([-Werror])])
-+
-+AX_APPEND_COMPILE_FLAGS([-Wall -Wcast-qual -Wno-error=deprecated-declarations])
- AX_APPEND_COMPILE_FLAGS([-Wextra -Wwrite-string -Wno-unused-parameter])
- AX_APPEND_COMPILE_FLAGS([-D_GNU_SOURCE])
- 
meta/recipes-devtools/json-c/json-c_0.14.bb renamed from meta/recipes-devtools/json-c/json-c_0.13.1.bb +3 -8
similarity index 67%
rename from meta/recipes-devtools/json-c/json-c_0.13.1.bb
rename to meta/recipes-devtools/json-c/json-c_0.14.bb
index 522879f21f..99fde873b1 100644
@@ -4,19 +4,14 @@ HOMEPAGE = "https://github.com/json-c/json-c/wiki"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2"
 
-SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz \
-           file://add-disable-werror-option-to-configure.patch \
-           "
-SRC_URI[md5sum] = "04969ad59cc37bddd83741a08b98f350"
-SRC_URI[sha256sum] = "b87e608d4d3f7bfdd36ef78d56d53c74e66ab278d318b71e6002a369d36f4873"
+SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz"
+SRC_URI[sha256sum] = "b377de08c9b23ca3b37d9a9828107dff1de5ce208ff4ebb35005a794f30c6870"
 
 UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
 UPSTREAM_CHECK_REGEX = "json-c-(?P<pver>\d+(\.\d+)+)-\d+"
 
 RPROVIDES_${PN} = "libjson"
 
-inherit autotools
-
-EXTRA_OECONF = "--disable-werror"
+inherit cmake
 
 BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.26.2
#75 lore raw

Re: [OE-core] [PATCH 57/70] json-c: update 0.13.1 - > 0.14

This breaks multipath-tools see
https://errors.yoctoproject.org/Errors/Details/414875/

perhaps https://www.spinics.net/lists/dm-devel/msg40646.html is now required for multipath-tools

Quoted 94 lines · Alexander Kanavin
---
 ...d-disable-werror-option-to-configure.patch | 45 -------------------
 .../{json-c_0.13.1.bb => json-c_0.14.bb}      | 11 ++---
 2 files changed, 3 insertions(+), 53 deletions(-)
 delete mode 100644 meta/recipes-devtools/json-c/json-c/add-disable-werror-option-to-configure.patch
 rename meta/recipes-devtools/json-c/{json-c_0.13.1.bb => json-c_0.14.bb} (67%)
meta/recipes-devtools/json-c/json-c/add-disable-werror-option-to-configure.patch deleted +0 -45
deleted file mode 100644
index 0c20c8458a..0000000000
@@ -1,45 +0,0 @@
-json-c: Backport --disable-werror patch to allow compilation under icecc
-
-icecc preprocesses source files locally before shipping them off to be compiled
-on remote hosts. This preprocessing removes comments, including /* fallthough */
-comments in switch statements that normally prevent an implicit-fallthrough
-warning, see https://github.com/icecc/icecream/issues/419
-
-Rather than turning off -Werror, the upstream project has implemented a
-configure option, --disable-werror, in response to Ross's
-https://github.com/json-c/json-c/issues/489
-
-This patch from
-https://github.com/json-c/json-c/commit/21c886534f8927fdc0fb5f8647394f3e0e0874b8
-
-Upstream-Status: Backport [Not yet released]
-Signed-off-by: Douglas Royds <[email protected]>
-
-From 21c886534f8927fdc0fb5f8647394f3e0e0874b8 Mon Sep 17 00:00:00 2001
-From: Pierce Lopez <[email protected]>
-Date: Sun, 9 Jun 2019 10:52:08 -0400
-Subject: [PATCH] build: add --disable-werror option to configure
-
-to omit -Werror compiler option
----
- configure.ac | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 272ea6af9c..798fd5b747 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -165,7 +165,12 @@ AS_IF([test "x$enable_Bsymbolic" = "xcheck"],
- AS_IF([test "x$enable_Bsymbolic" = "xyes"], [JSON_BSYMBOLIC_LDFLAGS=-Wl[,]-Bsymbolic-functions])
- AC_SUBST(JSON_BSYMBOLIC_LDFLAGS)
-
--AX_APPEND_COMPILE_FLAGS([-Wall -Werror -Wcast-qual -Wno-error=deprecated-declarations])
-+AC_ARG_ENABLE([werror],
-+    AS_HELP_STRING([--disable-werror], [avoid treating compiler warnings as fatal errors]))
-+
-+AS_IF([test "x$enable_werror" != "xno"], [AX_APPEND_COMPILE_FLAGS([-Werror])])
-+
-+AX_APPEND_COMPILE_FLAGS([-Wall -Wcast-qual -Wno-error=deprecated-declarations])
- AX_APPEND_COMPILE_FLAGS([-Wextra -Wwrite-string -Wno-unused-parameter])
- AX_APPEND_COMPILE_FLAGS([-D_GNU_SOURCE])
-
meta/recipes-devtools/json-c/json-c_0.14.bb renamed from meta/recipes-devtools/json-c/json-c_0.13.1.bb +3 -9
similarity index 67%
rename from meta/recipes-devtools/json-c/json-c_0.13.1.bb
rename to meta/recipes-devtools/json-c/json-c_0.14.bb
index 522879f21f..99fde873b1 100644
@@ -4,19 +4,14 @@ HOMEPAGE = "https://github.com/json-c/json-c/wiki"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2"
 
-SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz \
-           file://add-disable-werror-option-to-configure.patch \
-           "
-SRC_URI[md5sum] = "04969ad59cc37bddd83741a08b98f350"
-SRC_URI[sha256sum] = "b87e608d4d3f7bfdd36ef78d56d53c74e66ab278d318b71e6002a369d36f4873"
+SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz"
+SRC_URI[sha256sum] = "b377de08c9b23ca3b37d9a9828107dff1de5ce208ff4ebb35005a794f30c6870"
 
 UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
 UPSTREAM_CHECK_REGEX = "json-c-(?P<pver>\d+(\.\d+)+)-\d+"
 
 RPROVIDES_${PN} = "libjson"
 
-inherit autotools
-
-EXTRA_OECONF = "--disable-werror"
+inherit cmake
 
 BBCLASSEXTEND = "native nativesdk"
--

2.26.2

#76 lore raw

PATCH 58/70 libmodulemd: update 2.9.2 -> 2.9.4

In reply to Alexander Kanavin

Replace 0002-meson.build-do-not-install-python-gi-bindings.patch with an explicitly set meson option.

---
 ...ld-do-not-install-python-gi-bindings.patch | 23 -------------------
 .../libmodulemd/libmodulemd_git.bb            | 11 +++++----
 2 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd/0002-meson.build-do-not-install-python-gi-bindings.patch
meta/recipes-devtools/libmodulemd/libmodulemd/0002-meson.build-do-not-install-python-gi-bindings.patch deleted +0 -23
deleted file mode 100644
index a97fb73907..0000000000
@@ -1,23 +0,0 @@
-From d7eeac90fe02ccf5c5e4334e41ec75fc33803643 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Tue, 31 Mar 2020 16:12:28 +0200
-Subject: [PATCH] meson.build: do not install python gi bindings
-
-These are unnecessary for oe-core, and the install location
-is incorrectly determined using native python.
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index a8b02b4..8ff737b 100644
---- a/meson.build
-+++ b/meson.build
-@@ -171,4 +171,3 @@ configure_file(
- )
- 
- subdir('modulemd')
--subdir('bindings/python')
meta/recipes-devtools/libmodulemd/libmodulemd_git.bb +6 -5
index d440e60ee6..fda01b8ad8 100644
@@ -4,17 +4,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb"
 
 SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https \
            file://0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch \
-           file://0002-meson.build-do-not-install-python-gi-bindings.patch \
            "
 
-PV = "2.9.2"
-SRCREV = "780750eab8a0587b20d033f335301f16d00ab9c9"
+PV = "2.9.4"
+SRCREV = "c7254db07b21495fc9bd247c5b17ee20149c05e3"
 
 S = "${WORKDIR}/git"
 
-inherit meson gobject-introspection
+inherit meson gobject-introspection python3-dir
 
-EXTRA_OEMESON = "-Ddeveloper_build=false -Dwith_docs=false -Drpmio=disabled -Dlibmagic=disabled -Dwith_manpages=disabled"
+EXTRA_OEMESON = "-Ddeveloper_build=false -Dwith_docs=false -Drpmio=disabled -Dlibmagic=disabled -Dwith_manpages=disabled -Dgobject_overrides_dir_py3=${PYTHON_SITEPACKAGES_DIR}/gi/overrides"
 
 DEPENDS += "glib-2.0 libyaml glib-2.0-native python3"
 
@@ -23,3 +22,5 @@ BBCLASSEXTEND = "native nativesdk"
 GIR_MESON_OPTION = 'skip_introspection'
 GIR_MESON_ENABLE_FLAG = 'false'
 GIR_MESON_DISABLE_FLAG = 'true'
+
+FILES_${PN} += "${libdir}/${PYTHON_DIR}/*"
Signature · 1 line
2.26.2
#77 lore raw

PATCH 59/70 meson: upgrade 0.53.2 -> 0.54.2

In reply to Alexander Kanavin

Drop 0001-mesonbuild-environment.py-check-environment-for-vari.patch as upstream has refactored the code.

---
 meta/recipes-devtools/meson/meson.inc         |  6 +--
 .../0001-Make-CPU-family-warnings-fatal.patch | 10 ++---
 ...g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch | 41 +++++++++++++++++++
 ...onment.py-check-environment-for-vari.patch | 26 ------------
 ...pport-building-allarch-recipes-again.patch |  6 +--
 ...ction-determine-g-ir-scanner-and-g-i.patch | 40 ------------------
 .../meson/meson/0003-native_bindir.patch      | 26 ++++++------
 .../meson/meson/disable-rpath-handling.patch  | 25 +++++++----
 .../{meson_0.53.2.bb => meson_0.54.2.bb}      |  0
 ...on_0.53.2.bb => nativesdk-meson_0.54.2.bb} |  0
 10 files changed, 81 insertions(+), 99 deletions(-)
 create mode 100644 meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch
 delete mode 100644 meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-check-environment-for-vari.patch
 delete mode 100644 meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch
 rename meta/recipes-devtools/meson/{meson_0.53.2.bb => meson_0.54.2.bb} (100%)
 rename meta/recipes-devtools/meson/{nativesdk-meson_0.53.2.bb => nativesdk-meson_0.54.2.bb} (100%)
meta/recipes-devtools/meson/meson.inc +2 -4
index 0a58c971ae..12bc08648a 100644
@@ -9,16 +9,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${PV}.tar.gz \
            file://0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch \
-           file://0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch \
            file://0003-native_bindir.patch \
            file://0001-python-module-do-not-manipulate-the-environment-when.patch \
            file://disable-rpath-handling.patch \
            file://cross-prop-default.patch \
-           file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
            file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
+           file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \
            "
-SRC_URI[sha256sum] = "3e8f830f33184397c2eb0b651ec502adb63decb28978bdc84b3558d71284c21f"
-SRC_URI[md5sum] = "80303535995fcae72bdb887df102b421"
+SRC_URI[sha256sum] = "a7716eeae8f8dff002e4147642589ab6496ff839e4376a5aed761f83c1fa0455"
 
 SRC_URI_append_class-native = " \
     file://0001-Make-CPU-family-warnings-fatal.patch \
meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +5 -5
index 9ce31e5489..8b2263588c 100644
@@ -1,4 +1,4 @@
-From ee638fd4a299bfc53a2238e9f71ae310c8d97460 Mon Sep 17 00:00:00 2001
+From 830db2c7a136b2446d740c9ca025374352ffd16d Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Tue, 3 Jul 2018 13:59:09 +0100
 Subject: [PATCH] Make CPU family warnings fatal
@@ -12,10 +12,10 @@ Signed-off-by: Ross Burton <[email protected]>
  2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 0f277a7..24578ea 100644
+index 17058df..18bbf86 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
-@@ -192,7 +192,7 @@ class MachineInfo:
+@@ -225,7 +225,7 @@ class MachineInfo:
  
          cpu_family = literal['cpu_family']
          if cpu_family not in known_cpu_families:
@@ -25,10 +25,10 @@ index 0f277a7..24578ea 100644
          endian = literal['endian']
          if endian not in ('little', 'big'):
 diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index dc8b14f..3aab71e 100644
+index a2f78a4..59fcb07 100644
 --- a/mesonbuild/environment.py
 +++ b/mesonbuild/environment.py
-@@ -354,9 +354,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
+@@ -364,9 +364,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
          trial = 'parisc'
  
      if trial not in known_cpu_families:
meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch new file +41 -0

41 lines not on this page · raw message

meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-check-environment-for-vari.patch deleted +0 -26
deleted file mode 100644
index f4456235fe..0000000000
@@ -1,26 +0,0 @@
-From a72dc2b1cddcf180ce782860896deae0b12d5000 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Mon, 25 Mar 2019 18:52:48 +0100
-Subject: [PATCH] mesonbuild/environment.py: check environment for various
- binaries
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <[email protected]>
-
----
- mesonbuild/environment.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 9a029f4..0cfdf9c 100644
---- a/mesonbuild/environment.py
-+++ b/mesonbuild/environment.py
-@@ -448,7 +448,7 @@ class Environment:
-             config = MesonConfigFile.from_config_parser(
-                 coredata.load_configs(self.coredata.cross_files))
-             properties.host = Properties(config.get('properties', {}), False)
--            binaries.host = BinaryTable(config.get('binaries', {}), False)
-+            binaries.host = BinaryTable(config.get('binaries', {}), True)
-             if 'host_machine' in config:
-                 machines.host = MachineInfo.from_literal(config['host_machine'])
-             if 'target_machine' in config:
meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +3 -3
index ce18660756..18517a6e26 100644
@@ -1,4 +1,4 @@
-From 9c221c74bd306dfa6fec22c8f156eb9d4e4f7fcb Mon Sep 17 00:00:00 2001
+From 45df8f0a71c6b60cb98a336f8690af04965dfa9b Mon Sep 17 00:00:00 2001
 From: Peter Kjellerstedt <[email protected]>
 Date: Thu, 26 Jul 2018 16:32:49 +0200
 Subject: [PATCH] Support building allarch recipes again
@@ -13,10 +13,10 @@ Signed-off-by: Peter Kjellerstedt <[email protected]>
  1 file changed, 1 insertion(+)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 24578ea..216e71f 100644
+index 18bbf86..e76315e 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
-@@ -36,6 +36,7 @@ _T = typing.TypeVar('_T')
+@@ -36,6 +36,7 @@ _T = T.TypeVar('_T')
  
  
  known_cpu_families = (
meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch deleted +0 -40
deleted file mode 100644
index 61b26bb883..0000000000
@@ -1,40 +0,0 @@
-From 9ccaed380780178c4dab3a681f652ac7cd27452d Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Fri, 4 Aug 2017 16:18:47 +0300
-Subject: [PATCH] gobject-introspection: determine g-ir-scanner and
- g-ir-compiler paths from pkgconfig
-
-Do not hardcode the name of those binaries; gobject-introspection
-provides them via pkgconfig, and they can be set to something else
-(for example when cross-compiling).
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <[email protected]>
-
----
- mesonbuild/modules/gnome.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
-index 7c5a363..0002498 100644
---- a/mesonbuild/modules/gnome.py
-+++ b/mesonbuild/modules/gnome.py
-@@ -744,15 +744,15 @@ class GnomeModule(ExtensionModule):
-         if kwargs.get('install_dir'):
-             raise MesonException('install_dir is not supported with generate_gir(), see "install_dir_gir" and "install_dir_typelib"')
- 
--        giscanner = self.interpreter.find_program_impl('g-ir-scanner')
--        gicompiler = self.interpreter.find_program_impl('g-ir-compiler')
--
-         girtargets = [self._unwrap_gir_target(arg, state) for arg in args]
- 
-         if len(girtargets) > 1 and any([isinstance(el, build.Executable) for el in girtargets]):
-             raise MesonException('generate_gir only accepts a single argument when one of the arguments is an executable')
- 
-         self.gir_dep, pkgargs = self._get_gir_dep(state)
-+        giscanner = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {})
-+        gicompiler = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})
-+
- 
-         ns = kwargs.pop('namespace')
-         nsversion = kwargs.pop('nsversion')
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +13 -13
index dc822fb1fc..fb119ae852 100644
@@ -1,4 +1,4 @@
-From e76726321067748362b39937bd1e663a1a948ad5 Mon Sep 17 00:00:00 2001
+From da2091f6dfe978fc6140fc2d01bcafbbfae8d8db Mon Sep 17 00:00:00 2001
 From: Ricardo Ribalda Delgado <[email protected]>
 Date: Wed, 15 Nov 2017 15:05:01 +0100
 Subject: [PATCH] native_bindir
@@ -22,10 +22,10 @@ Signed-off-by: Ricardo Ribalda Delgado <[email protected]>
  2 files changed, 14 insertions(+), 11 deletions(-)
 
 diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
-index 40e304c..4b687df 100644
+index 50f4179..e1529d8 100644
 --- a/mesonbuild/dependencies/base.py
 +++ b/mesonbuild/dependencies/base.py
-@@ -184,7 +184,7 @@ class Dependency:
+@@ -157,7 +157,7 @@ class Dependency:
      def get_exe_args(self, compiler):
          return []
  
@@ -34,16 +34,16 @@ index 40e304c..4b687df 100644
          raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name))
  
      def get_configtool_variable(self, variable_name):
-@@ -247,7 +247,7 @@ class InternalDependency(Dependency):
-         self.sources = sources
+@@ -225,7 +225,7 @@ class InternalDependency(Dependency):
          self.ext_deps = ext_deps
+         self.variables = variables
  
 -    def get_pkgconfig_variable(self, variable_name, kwargs):
 +    def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False):
          raise DependencyException('Method "get_pkgconfig_variable()" is '
                                    'invalid for an internal dependency')
  
-@@ -673,15 +673,18 @@ class PkgConfigDependency(ExternalDependency):
+@@ -633,15 +633,18 @@ class PkgConfigDependency(ExternalDependency):
          return s.format(self.__class__.__name__, self.name, self.is_found,
                          self.version_reqs)
  
@@ -65,7 +65,7 @@ index 40e304c..4b687df 100644
          # Always copy the environment since we're going to modify it
          # with pkg-config variables
          if env is None:
-@@ -701,7 +704,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -667,7 +670,7 @@ class PkgConfigDependency(ExternalDependency):
          targs = tuple(args)
          cache = PkgConfigDependency.pkgbin_cache
          if (self.pkgbin, targs, fenv) not in cache:
@@ -74,7 +74,7 @@ index 40e304c..4b687df 100644
          return cache[(self.pkgbin, targs, fenv)]
  
      def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]:
-@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -876,7 +879,7 @@ class PkgConfigDependency(ExternalDependency):
                                        (self.name, out_raw))
          self.link_args, self.raw_link_args = self._search_libs(out, out_raw)
  
@@ -83,7 +83,7 @@ index 40e304c..4b687df 100644
          options = ['--variable=' + variable_name, self.name]
  
          if 'define_variable' in kwargs:
-@@ -920,7 +923,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -889,7 +892,7 @@ class PkgConfigDependency(ExternalDependency):
  
              options = ['--define-variable=' + '='.join(definition)] + options
  
@@ -93,10 +93,10 @@ index 40e304c..4b687df 100644
          if ret != 0:
              if self.required:
 diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
-index da411ef..856506a 100644
+index 741f0b8..134dd54 100644
 --- a/mesonbuild/dependencies/ui.py
 +++ b/mesonbuild/dependencies/ui.py
-@@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency):
+@@ -320,7 +320,7 @@ class QtBaseDependency(ExternalDependency):
          self.bindir = self.get_pkgconfig_host_bins(core)
          if not self.bindir:
              # If exec_prefix is not defined, the pkg-config file is broken
@@ -105,7 +105,7 @@ index da411ef..856506a 100644
              if prefix:
                  self.bindir = os.path.join(prefix, 'bin')
  
-@@ -508,7 +508,7 @@ class Qt4Dependency(QtBaseDependency):
+@@ -524,7 +524,7 @@ class Qt4Dependency(QtBaseDependency):
          applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease']
          for application in applications:
              try:
@@ -114,7 +114,7 @@ index da411ef..856506a 100644
              except MesonException:
                  pass
  
-@@ -518,7 +518,7 @@ class Qt5Dependency(QtBaseDependency):
+@@ -534,7 +534,7 @@ class Qt5Dependency(QtBaseDependency):
          QtBaseDependency.__init__(self, 'qt5', env, kwargs)
  
      def get_pkgconfig_host_bins(self, core):
meta/recipes-devtools/meson/meson/disable-rpath-handling.patch +17 -8
index 4b1fb57dd4..38e50d72f4 100644
@@ -1,4 +1,9 @@
-We need to allow our rpaths generated through the compiler flags to make it into 
+From 3af10fa8cd4e97181288d72227dea712290fd5e6 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <[email protected]>
+Date: Fri, 23 Nov 2018 15:28:28 +0000
+Subject: [PATCH] meson: Disable rpath stripping at install time
+
+We need to allow our rpaths generated through the compiler flags to make it into
 our binaries. Therefore disable the meson manipulations of these unless there
 is a specific directive to do something differently in the project.
 
@@ -6,13 +11,17 @@ RP 2018/11/23
 
 Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567]
 
-Index: meson-0.47.2/mesonbuild/minstall.py
-===================================================================
---- meson-0.47.2.orig/mesonbuild/minstall.py
-+++ meson-0.47.2/mesonbuild/minstall.py
-@@ -486,8 +486,11 @@ class Installer:
-                         printed_symlink_error = True
-             if os.path.isfile(outname):
+---
+ mesonbuild/minstall.py | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
+index ace0569..85bd8df 100644
+--- a/mesonbuild/minstall.py
++++ b/mesonbuild/minstall.py
+@@ -508,8 +508,11 @@ class Installer:
+             if file_copied:
+                 self.did_install_something = True
                  try:
 -                    depfixer.fix_rpath(outname, install_rpath, final_path,
 -                                       install_name_mappings, verbose=False)
meta/recipes-devtools/meson/meson_0.54.2.bb renamed from meta/recipes-devtools/meson/meson_0.53.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.53.2.bb
rename to meta/recipes-devtools/meson/meson_0.54.2.bb
meta/recipes-devtools/meson/nativesdk-meson_0.54.2.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.53.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.53.2.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.54.2.bb
Signature · 1 line
2.26.2
#78 lore raw

PATCH 60/70 shared-mime-info: fix upstream version check

In reply to Alexander Kanavin

Upstream has tagged a new 2.0 release properly, so no special arrangements are needed to pick that up.

---
 meta/recipes-support/shared-mime-info/shared-mime-info_git.bb | 3 ---
 1 file changed, 3 deletions(-)
meta/recipes-support/shared-mime-info/shared-mime-info_git.bb +0 -3
index 7a060b09ad..f0d5bc62e9 100644
@@ -12,9 +12,6 @@ SRCREV = "829b26d85e7d89a0caee03046c3bce373f04c80a"
 PV = "1.15"
 S = "${WORKDIR}/git"
 
-UPSTREAM_CHECK_GITTAGREGEX = "Release-(?P<pver>(\d+(\-\d+)+))"
-UPSTREAM_VERSION_UNKNOWN = "1"
-
 inherit autotools pkgconfig gettext python3native mime
 
 EXTRA_OECONF = "--disable-update-mimedb"
Signature · 1 line
2.26.2
#79 lore raw

PATCH 61/70 python3-setuptools: upgrade 45.2.0 -> 47.1.1

In reply to Alexander Kanavin
---
 ...ly-do-not-fetch-code-by-easy_install.patch |  6 +++---
 .../python/python-setuptools.inc              |  3 +--
 .../0001-change-shebang-to-python3.patch      | 21 ++++---------------
 ...45.2.0.bb => python3-setuptools_47.1.1.bb} |  0
 4 files changed, 8 insertions(+), 22 deletions(-)
 rename meta/recipes-devtools/python/{python3-setuptools_45.2.0.bb => python3-setuptools_47.1.1.bb} (100%)
meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch +3 -3
index 5f99cd2512..c7acdd2d55 100644
@@ -1,4 +1,4 @@
-From a8f871c9ebc4fcb99d4163b226aabeef26567099 Mon Sep 17 00:00:00 2001
+From f1d625cad6db3958507b8c6f3785788a1b17970c Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <[email protected]>
 Date: Tue, 17 Jul 2018 10:13:38 +0800
 Subject: [PATCH] conditionally do not fetch code by easy_install
@@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia <[email protected]>
  1 file changed, 5 insertions(+)
 
 diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
-index 426301d..55c8062 100644
+index 6bcdc98..0bf0c24 100644
 --- a/setuptools/command/easy_install.py
 +++ b/setuptools/command/easy_install.py
-@@ -649,6 +649,11 @@ class easy_install(Command):
+@@ -651,6 +651,11 @@ class easy_install(Command):
              os.path.exists(tmpdir) and rmtree(rmtree_safe(tmpdir))
  
      def easy_install(self, spec, deps=False):
meta/recipes-devtools/python/python-setuptools.inc +1 -2
index e9ad93dbee..eae6095e3a 100644
@@ -12,8 +12,7 @@ SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-e
 
 SRC_URI += "file://0001-change-shebang-to-python3.patch"
 
-SRC_URI[md5sum] = "0c956eea142af9c2b02d72e3c042af30"
-SRC_URI[sha256sum] = "89c6e6011ec2f6d57d43a3f9296c4ef022c2cbf49bab26b407fe67992ae3397f"
+SRC_URI[sha256sum] = "145fa62b9d7bb544fce16e9b5a9bf4ab2032d2f758b7cd674af09a92736aff74"
 
 DEPENDS += "${PYTHON_PN}"
 
meta/recipes-devtools/python/python3-setuptools/0001-change-shebang-to-python3.patch +4 -17
index 33af8daed7..5ed4cb8bef 100644
@@ -1,4 +1,4 @@
-From c39d0896930e25c224cc897660fc8511ccae30c8 Mon Sep 17 00:00:00 2001
+From f80880c6b8823f78937ade1cb9f395a6c60bf0ed Mon Sep 17 00:00:00 2001
 From: Changqing Li <[email protected]>
 Date: Thu, 23 Apr 2020 10:01:12 +0000
 Subject: [PATCH] change shebang to python3
@@ -6,10 +6,10 @@ Subject: [PATCH] change shebang to python3
 Upstream-Status: Pending
 
 Signed-off-by: Changqing Li <[email protected]>
+
 ---
- pkg_resources/_vendor/appdirs.py   | 2 +-
- setuptools/command/easy_install.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ pkg_resources/_vendor/appdirs.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/pkg_resources/_vendor/appdirs.py b/pkg_resources/_vendor/appdirs.py
 index ae67001..933e398 100644
@@ -21,16 +21,3 @@ index ae67001..933e398 100644
  # -*- coding: utf-8 -*-
  # Copyright (c) 2005-2010 ActiveState Software Inc.
  # Copyright (c) 2013 Eddy Petrișor
-diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
-index abca1ae..6bcdc98 100644
---- a/setuptools/command/easy_install.py
-+++ b/setuptools/command/easy_install.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- """
- Easy Install
- ------------
--- 
-2.24.1
-
meta/recipes-devtools/python/python3-setuptools_47.1.1.bb renamed from meta/recipes-devtools/python/python3-setuptools_45.2.0.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/python/python3-setuptools_45.2.0.bb
rename to meta/recipes-devtools/python/python3-setuptools_47.1.1.bb
Signature · 1 line
2.26.2
#80 lore raw

PATCH 62/70 mpg123: fix upstream version check

In reply to Alexander Kanavin
---
 meta/recipes-multimedia/mpg123/mpg123_1.25.13.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-multimedia/mpg123/mpg123_1.25.13.bb +2 -0
index 125574fcfc..6c7b6fa8c3 100644
@@ -14,6 +14,8 @@ SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2 \
 SRC_URI[md5sum] = "294a6c30546504ec3d0deac2b2ea22be"
 SRC_URI[sha256sum] = "90306848359c793fd43b9906e52201df18775742dc3c81c06ab67a806509890a"
 
+UPSTREAM_CHECK_REGEX = "mpg123-(?P<pver>\d+(\.\d+)+)\.tar"
+
 inherit autotools pkgconfig
 
 # The options should be mutually exclusive for configuration script.
Signature · 1 line
2.26.2
#81 lore raw

PATCH 63/70 ethtool: upgrade 5.4 -> 5.6

In reply to Alexander Kanavin
---
 .../ethtool/avoid_parallel_tests.patch        | 10 +++---
 .../ethtool/ethtool/fix-printf.patch          | 32 +++++++++++++++++++
 .../{ethtool_5.4.bb => ethtool_5.6.bb}        |  9 ++++--
 3 files changed, 43 insertions(+), 8 deletions(-)
 create mode 100644 meta/recipes-extended/ethtool/ethtool/fix-printf.patch
 rename meta/recipes-extended/ethtool/{ethtool_5.4.bb => ethtool_5.6.bb} (80%)
meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch +5 -5
index d5c93244fa..2f2d04ca07 100644
@@ -1,4 +1,4 @@
-From f8333f7759717b4d163cfe8e3ef8861c5a667324 Mon Sep 17 00:00:00 2001
+From 1c6c017e56ec536f5cceacdb02092777d390debb Mon Sep 17 00:00:00 2001
 From: Tudor Florea <[email protected]>
 Date: Wed, 28 May 2014 18:59:54 +0200
 Subject: [PATCH] ethtool: use serial-tests config needed by ptest.
@@ -15,15 +15,15 @@ Upstream-Status: Inappropriate
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 2127fdb..4910e6f 100644
+index 1169b7f..ed82524 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
- AC_INIT(ethtool, 5.4, [email protected])
+ AC_INIT(ethtool, 5.6, [email protected])
  AC_PREREQ(2.52)
  AC_CONFIG_SRCDIR([ethtool.c])
--AM_INIT_AUTOMAKE([gnu])
-+AM_INIT_AUTOMAKE([gnu serial-tests])
+-AM_INIT_AUTOMAKE([gnu subdir-objects])
++AM_INIT_AUTOMAKE([gnu subdir-objects serial-tests])
  AC_CONFIG_HEADERS([ethtool-config.h])
  
  AM_MAINTAINER_MODE
meta/recipes-extended/ethtool/ethtool/fix-printf.patch new file +32 -0
new file mode 100644
index 0000000000..9effa4f3f4
@@ -0,0 +1,32 @@
+From 8dcdb3d22a66f18770e5566c0e72e86a0701aeac Mon Sep 17 00:00:00 2001
+From: Robert Scheck <[email protected]>
+Date: Tue, 12 May 2020 20:33:12 +0200
+Subject: Rewrite printf() due to -Werror=format-security
+
+Avoid -Werror=format-security leading to: netlink/settings.c:378:2: error:
+format not a string literal and no format arguments [-Werror=format-security]
+
+Upstream-Status: Backport
+Signed-off-by: Alexander Kanavin <[email protected]>
+Signed-off-by: Robert Scheck <[email protected]>
+Signed-off-by: John W. Linville <[email protected]>
+---
+ netlink/settings.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/netlink/settings.c b/netlink/settings.c
+index c8a911d..0212465 100644
+--- a/netlink/settings.c
++++ b/netlink/settings.c
+@@ -375,7 +375,7 @@ static int dump_link_modes(struct nl_context *nlctx,
+ after:
+ 	if (first && if_none)
+ 		printf("%s", if_none);
+-	printf(after);
++	printf("%s", after);
+ 
+ 	return 0;
+ err:
+-- 
+cgit 1.2.3-1.el7
+
meta/recipes-extended/ethtool/ethtool_5.6.bb renamed from meta/recipes-extended/ethtool/ethtool_5.4.bb +6 -3
similarity index 80%
rename from meta/recipes-extended/ethtool/ethtool_5.4.bb
rename to meta/recipes-extended/ethtool/ethtool_5.6.bb
index d6eafaa8dc..eda32c877c 100644
@@ -9,17 +9,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \
            file://run-ptest \
            file://avoid_parallel_tests.patch \
+           file://fix-printf.patch \
            "
 
-SRC_URI[md5sum] = "fbb24aa414ab9a11ff66d351b5b8493b"
-SRC_URI[sha256sum] = "0b25a46b61bc6e26f56dcb973fc28acea159e2c32c9d6da42c0fa8d1a6339829"
+SRC_URI[sha256sum] = "e904e980294baf5878df410ebcf1d660497ba19bc3a77f798a04dba569f44a7e"
 
 UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/"
 
-inherit autotools ptest bash-completion
+inherit autotools ptest bash-completion pkgconfig
 
 RDEPENDS_${PN}-ptest += "make"
 
+PACKAGECONFIG ?= "netlink"
+PACKAGECONFIG[netlink] = "--enable-netlink,--disable-netlink,libmnl,"
+
 do_compile_ptest() {
    oe_runmake buildtest-TESTS
 }
Signature · 1 line
2.26.2
#82 lore raw

PATCH 64/70 libcpre2: update 10.34 -> 10.35

In reply to Alexander Kanavin

Replace pcre-cross.patch with the (default) option to use pre-built tables; the README says it's ok, and recommended in cross-compile situations. The option was in the recipe from the start and neither the commit that adds the recipe, nor the patch to make it work explain why.

License-Update: copyright years

---
 .../libpcre/libpcre2/pcre-cross.patch         | 65 -------------------
 .../{libpcre2_10.34.bb => libpcre2_10.35.bb}  | 15 +----
 2 files changed, 3 insertions(+), 77 deletions(-)
 delete mode 100644 meta/recipes-support/libpcre/libpcre2/pcre-cross.patch
 rename meta/recipes-support/libpcre/{libpcre2_10.34.bb => libpcre2_10.35.bb} (74%)
meta/recipes-support/libpcre/libpcre2/pcre-cross.patch deleted +0 -65
deleted file mode 100644
index 871cdfcb7d..0000000000
@@ -1,65 +0,0 @@
-Fix for cross compiling
-
-Fixed:
-| ./dftables src/pcre2_chartables.c
-| make: ./dftables: Command not found
-| make: *** [src/pcre2_chartables.c] Error 127
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <[email protected]>
-
-Index: pcre2-10.30/Makefile.am
-===================================================================
---- pcre2-10.30.orig/Makefile.am
-+++ pcre2-10.30/Makefile.am
-@@ -325,9 +325,21 @@ bin_SCRIPTS = pcre2-config
- ## to copy a distributed set of tables that are defined for ASCII code. In this
- ## case, dftables is not needed.
- 
-+CC_FOR_BUILD = @CC_FOR_BUILD@
-+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
-+CCLD_FOR_BUILD = @CCLD_FOR_BUILD@
-+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
-+
- if WITH_REBUILD_CHARTABLES
- noinst_PROGRAMS += dftables
- dftables_SOURCES = src/dftables.c
-+
-+dftables_LINK = $(CCLD_FOR_BUILD) -o $@
-+dftables_LDFLAGS = $(LDFLAGS_FOR_BUILD)
-+
-+src/dftables.o: $(srcdir)/src/dftables.c
-+	$(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) -o $@ $(srcdir)/src/dftables.c
-+
- src/pcre2_chartables.c: dftables$(EXEEXT)
- 	rm -f $@
- 	./dftables$(EXEEXT) $@
-Index: pcre2-10.30/configure.ac
-===================================================================
---- pcre2-10.30.orig/configure.ac
-+++ pcre2-10.30/configure.ac
-@@ -60,6 +60,23 @@ fi
- # This is a new thing required to stop a warning from automake 1.12
- m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
- 
-+if test x"$cross_compiling" = xyes; then
-+    CC_FOR_BUILD="${CC_FOR_BUILD-gcc}"
-+    CCLD_FOR_BUILD="${CCLD_FOR_BUILD-gcc}"
-+    CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD}"
-+    LDFLAGS_FOR_BUILD="${LDFLAGS_FOR_BUILD}"
-+else
-+    CC_FOR_BUILD="${CC_FOR_BUILD-\$(CC)}"
-+    CCLD_FOR_BUILD="${CCLD_FOR_BUILD-\$(CCLD)}"
-+    CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD-\$(CFLAGS)}"
-+    LDFLAGS_FOR_BUILD="${LDFLAGS_FOR_BUILD-\$(LDFLAGS)}"
-+fi
-+AC_ARG_VAR(CC_FOR_BUILD, [build system C compiler])
-+AC_ARG_VAR(CCLD_FOR_BUILD, [build system C linker frontend])
-+AC_ARG_VAR(CFLAGS_FOR_BUILD, [build system C compiler arguments])
-+AC_ARG_VAR(LDFLAGS_FOR_BUILD, [build system C linker frontend arguments])
-+
-+
- # Check for a 64-bit integer type
- AC_TYPE_INT64_T
- 
meta/recipes-support/libpcre/libpcre2_10.35.bb renamed from meta/recipes-support/libpcre/libpcre2_10.34.bb +3 -12
similarity index 74%
rename from meta/recipes-support/libpcre/libpcre2_10.34.bb
rename to meta/recipes-support/libpcre/libpcre2_10.35.bb
index fa8655e027..35c019c100 100644
@@ -8,14 +8,11 @@ SUMMARY = "Perl Compatible Regular Expressions version 2"
 HOMEPAGE = "http://www.pcre.org"
 SECTION = "devel"
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=b1588d3bb4cb0e1f5a597d908f8c5b37"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=a06590e9bd4c229532364727aaeaf084"
 
-SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre2-${PV}.tar.bz2 \
-           file://pcre-cross.patch \
-"
+SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre2-${PV}.tar.bz2"
 
-SRC_URI[md5sum] = "d280b62ded13f9ccf2fac16ee5286366"
-SRC_URI[sha256sum] = "74c473ffaba9e13db6951fd146e0143fe9887852ce73406a03277af1d9b798ca"
+SRC_URI[sha256sum] = "9ccba8e02b0ce78046cdfb52e5c177f0f445e421059e43becca4359c669d4613"
 
 CVE_PRODUCT = "pcre2"
 
@@ -30,20 +27,14 @@ inherit autotools binconfig-disabled
 
 EXTRA_OECONF = "\
     --enable-newline-is-lf \
-    --enable-rebuild-chartables \
     --with-link-size=2 \
     --with-match-limit=10000000 \
     --enable-pcre2-16 \
     --enable-pcre2-32 \
 "
-# Set LINK_SIZE in BUILD_CFLAGS given that the autotools bbclass use it to
-# set CFLAGS_FOR_BUILD, required for the libpcre build.
-BUILD_CFLAGS =+ "-DLINK_SIZE=2 -I${B}/src"
 CFLAGS += "-D_REENTRANT"
 CXXFLAGS_append_powerpc = " -lstdc++"
 
-export CCLD_FOR_BUILD ="${BUILD_CCLD}"
-
 PACKAGES =+ "libpcre2-16 libpcre2-32 pcre2grep pcre2grep-doc pcre2test pcre2test-doc"
 
 SUMMARY_pcre2grep = "grep utility that uses perl 5 compatible regexes"
Signature · 1 line
2.26.2
#83 lore raw

PATCH 65/70 libyaml: adjust license checksum to omit copyright year lines.

In reply to Alexander Kanavin
---
 meta/recipes-support/libyaml/libyaml_0.2.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/libyaml/libyaml_0.2.4.bb +1 -1
index e1817748bc..b0f85cda0e 100644
@@ -5,7 +5,7 @@ HOMEPAGE = "https://pyyaml.org/wiki/LibYAML"
 SECTION = "libs/devel"
 
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://License;md5=7bbd28caa69f81f5cd5f48647236663d"
+LIC_FILES_CHKSUM = "file://License;md5=51591594753f05018680f6db765d5a46;beginline=3"
 
 SRC_URI = "https://pyyaml.org/download/libyaml/yaml-${PV}.tar.gz"
 SRC_URI[md5sum] = "0532bb32548ee92f1c0328aa8a87dec7"
Signature · 1 line
2.26.2
#84 lore raw

Re: [OE-core] [PATCH 65/70] libyaml: adjust license checksum to omit copyright year lines.

Quoted 8 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Alexander Kanavin
Sent: den 31 maj 2020 17:53
To: [email protected]
Cc: Alexander Kanavin <[email protected]>
Subject: [OE-core] [PATCH 65/70] libyaml: adjust license checksum to omit copyright year lines.

Eh, what? That's definitely not the right thing to do. For a license that says "The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.", removing the copyright information makes the file useless as part of, e.g., ${PN}-lic.

Quoted 20 lines
---
 meta/recipes-support/libyaml/libyaml_0.2.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/libyaml/libyaml_0.2.4.bb +1 -2
index e1817748bc..b0f85cda0e 100644
@@ -5,7 +5,7 @@ HOMEPAGE = "https://pyyaml.org/wiki/LibYAML"
 SECTION = "libs/devel"
 
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://License;md5=7bbd28caa69f81f5cd5f48647236663d"
+LIC_FILES_CHKSUM = "file://License;md5=51591594753f05018680f6db765d5a46;beginline=3"
 
 SRC_URI = "https://pyyaml.org/download/libyaml/yaml-${PV}.tar.gz"
 SRC_URI[md5sum] = "0532bb32548ee92f1c0328aa8a87dec7"
--
Quoted 1 line

2.26.2

//Peter

#85 lore raw

Re: [OE-core] [PATCH 65/70] libyaml: adjust license checksum to omit copyright year lines.

Quoted 9 lines · Peter Kjellerstedt
Quoted 8 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Alexander Kanavin
Sent: den 31 maj 2020 17:53
To: [email protected]
Cc: Alexander Kanavin <[email protected]>
Subject: [OE-core] [PATCH 65/70] libyaml: adjust license checksum to omit copyright year lines.

Quoted 5 lines

Eh, what? That's definitely not the right thing to do. For a license that says "The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.", removing the copyright information makes the file useless as part of, e.g., ${PN}-lic.

This is not what the patch does.

Quoted 4 lines

...

Quoted 2 lines
meta/recipes-support/libyaml/libyaml_0.2.4.bb +1 -1
-LIC_FILES_CHKSUM = "file://License;md5=7bbd28caa69f81f5cd5f48647236663d"
+LIC_FILES_CHKSUM = "file://License;md5=51591594753f05018680f6db765d5a46;beginline=3"

...

It only excludes the first lines from the checksum.

Quoted 1 line

//Peter

cu
Adrian

#86 lore raw

Re: [OE-core] [PATCH 65/70] libyaml: adjust license checksum to omit copyright year lines.

Quoted 26 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Adrian Bunk
Sent: den 2 juni 2020 07:55
To: Peter Kjellerstedt <[email protected]>
Cc: Alexander Kanavin <[email protected]>; openembedded- [email protected]
Subject: Re: [OE-core] [PATCH 65/70] libyaml: adjust license checksum to omit copyright year lines.

Quoted 9 lines · Peter Kjellerstedt
Quoted 8 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Alexander Kanavin
Sent: den 31 maj 2020 17:53
To: [email protected]
Cc: Alexander Kanavin <[email protected]>
Subject: [OE-core] [PATCH 65/70] libyaml: adjust license checksum to omit copyright year lines.

Quoted 5 lines

Eh, what? That's definitely not the right thing to do. For a license that says "The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.", removing the copyright information makes the file useless as part of, e.g., ${PN}-lic.

Quoted 8 lines

This is not what the patch does.

Quoted 4 lines

...

Quoted 2 lines
meta/recipes-support/libyaml/libyaml_0.2.4.bb +1 -1
-LIC_FILES_CHKSUM = "file://License;md5=7bbd28caa69f81f5cd5f48647236663d"
+LIC_FILES_CHKSUM = "file://License;md5=51591594753f05018680f6db765d5a46;beginline=3"

...

It only excludes the first lines from the checksum.

Which means the lines with the copyright statements will also be excluded from the file that is included with the copied license files.

This behavior is what we want, since when using a license statement from a source file, you typically do not want the whole of the source file to be included with the copied license files, only the part specified in LIC_FILES_CHKSUM. But it also means the copyright information needs to be included in that part.

See commit 515f4c12 for when this was introduced three years ago.

Quoted 4 lines
Quoted 1 line

//Peter

cu
Adrian

//Peter

#87 lore raw

Re: [OE-core] [PATCH 65/70] libyaml: adjust license checksum to omit copyright year lines.

In reply to Peter Kjellerstedt
Quoted 9 lines · Peter Kjellerstedt
Quoted 8 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Alexander Kanavin
Sent: den 31 maj 2020 17:53
To: [email protected]
Cc: Alexander Kanavin <[email protected]>
Subject: [OE-core] [PATCH 65/70] libyaml: adjust license checksum to omit copyright year lines.

Quoted 6 lines

Eh, what? That's definitely not the right thing to do. For a license that says "The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.", removing the copyright information makes the file useless as part of, e.g., ${PN}-lic.

As far as I understand, the extracts from LIC_FILES_CHKSUM are not used in copies or substantial portions of the software,
they are used in tmp/deploy/licenses (which is neither). Is it beneficial to have the copyright years and owners
there? The idea behind dropping them is that we can avoid continuous adjusting of the checksum on version updates.

If you archive the source code, or install binaries to the target, this mechanism is not involved.

I am not aware of ${PN}-lic, can you please point where that is defined?

Alex

#88 lore raw

Re: [OE-core] [PATCH 65/70] libyaml: adjust license checksum to omit copyright year lines.

If you have COPY_LIC_DIRS enabled, the license files (the ones listed in LICENSE and the (parts) listed in LIC_FILES_CHKSUM) will be included in the generated image by license_image.bbclass. Extraction of the license information is handled by license.bbclass, which also is responsible for creating ${PN}-lic packages if LICENSE_CREATE_PACKAGE is set.

//Peter

From: Alexander Kanavin <[email protected]>
Sent: den 2 juni 2020 09:30
To: Peter Kjellerstedt <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core] [PATCH 65/70] libyaml: adjust license checksum to omit copyright year lines.

Quoted 8 lines · On Tue, 2 Jun 2020 at 00:12, Peter Kjellerstedt…

-----Original Message-----
From: [email protected]<mailto:[email protected]> <openembedded- [email protected]<mailto:[email protected]>> On Behalf Of Alexander Kanavin
Sent: den 31 maj 2020 17:53
To: [email protected]<mailto:[email protected]>
Cc: Alexander Kanavin <[email protected]<mailto:[email protected]>>
Subject: [OE-core] [PATCH 65/70] libyaml: adjust license checksum to omit
copyright year lines.

Eh, what? That's definitely not the right thing to do. For a license that says "The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.", removing the copyright information makes the file useless as part of, e.g., ${PN}-lic.

As far as I understand, the extracts from LIC_FILES_CHKSUM are not used in copies or substantial portions of the software, they are used in tmp/deploy/licenses (which is neither). Is it beneficial to have the copyright years and owners there? The idea behind dropping them is that we can avoid continuous adjusting of the checksum on version updates.

If you archive the source code, or install binaries to the target, this mechanism is not involved.

I am not aware of ${PN}-lic, can you please point where that is defined?

Alex

#89 lore raw

Re: [OE-core] [PATCH 65/70] libyaml: adjust license checksum to omit copyright year lines.

Right, in that case this commit should indeed be dropped or reverted.

Alex

Quoted 63 lines · Peter Kjellerstedt

If you have COPY_LIC_DIRS enabled, the license files (the ones listed in LICENSE and the (parts) listed in LIC_FILES_CHKSUM) will be included in the generated image by license_image.bbclass. Extraction of the license information is handled by license.bbclass, which also is responsible for creating ${PN}-lic packages if LICENSE_CREATE_PACKAGE is set.

//Peter

*From:* Alexander Kanavin <[email protected]>
*Sent:* den 2 juni 2020 09:30
*To:* Peter Kjellerstedt <[email protected]>
*Cc:* [email protected]
*Subject:* Re: [OE-core] [PATCH 65/70] libyaml: adjust license checksum to omit copyright year lines.

Quoted 8 lines · Peter Kjellerstedt

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Alexander Kanavin
Sent: den 31 maj 2020 17:53
To: [email protected]
Cc: Alexander Kanavin <[email protected]>
Subject: [OE-core] [PATCH 65/70] libyaml: adjust license checksum to omit copyright year lines.

Eh, what? That's definitely not the right thing to do. For a license that says "The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.", removing the copyright information makes the file useless as part of, e.g., ${PN}-lic.

As far as I understand, the extracts from LIC_FILES_CHKSUM are not used in copies or substantial portions of the software,

they are used in tmp/deploy/licenses (which is neither). Is it beneficial to have the copyright years and owners

there? The idea behind dropping them is that we can avoid continuous adjusting of the checksum on version updates.

If you archive the source code, or install binaries to the target, this mechanism is not involved.

I am not aware of ${PN}-lic, can you please point where that is defined?

Alex

#90 lore raw

Re: [OE-core] [PATCH 65/70] libyaml: adjust license checksum to omit copyright year lines.

Good catch Peter.

Checksum mismatch for copyright year may sound benign but we really need to know the changes even if its just copyright year change these are recorded and part of license text, so its important in general to
keep this check strict like it is without this patch. So dropping this patch is right thing to do.

Quoted 87 lines · Alexander Kanavin

Right, in that case this commit should indeed be dropped or reverted.

Alex

On Tue, 2 Jun 2020 at 09:39, Peter Kjellerstedt <[email protected] <mailto:[email protected]>> wrote:

If you have COPY_LIC_DIRSenabled, the license files (the ones listed in LICENSEand the (parts) listed in LIC_FILES_CHKSUM) will be included in the generated image by license_image.bbclass. Extraction of the license information is handled by license.bbclass, which also is responsible for creating ${PN}-lic packages if LICENSE_CREATE_PACKAGEis set.____

__ __

//Peter____

__ __

*From:*Alexander Kanavin <[email protected] <mailto:[email protected]>>
*Sent:* den 2 juni 2020 09:30
*To:* Peter Kjellerstedt <[email protected] <mailto:[email protected]>>
*Cc:* [email protected] <mailto:[email protected]> *Subject:* Re: [OE-core] [PATCH 65/70] libyaml: adjust license checksum to omit copyright year lines.____

__ __

On Tue, 2 Jun 2020 at 00:12, Peter Kjellerstedt <[email protected] <mailto:[email protected]>> wrote:____

> -----Original Message-----
> From: [email protected]
<mailto:[email protected]> <openembedded-
> [email protected]
<mailto:[email protected]>> On Behalf Of Alexander Kanavin
> Sent: den 31 maj 2020 17:53
> To: [email protected]
<mailto:[email protected]>
> Cc: Alexander Kanavin <[email protected]
<mailto:[email protected]>>
> Subject: [OE-core] [PATCH 65/70] libyaml: adjust license
checksum to omit
> copyright year lines.

Eh, what? That's definitely not the right thing to do. For a license
that says "The above copyright notice and this permission notice shall
be included in all copies or substantial portions of the Software.",
removing the copyright information makes the file useless as part of,
e.g., ${PN}-lic.____

__ __

As far as I understand, the extracts from LIC_FILES_CHKSUM are not used in copies or substantial portions of the software,____

they are used in tmp/deploy/licenses (which is neither). Is it beneficial to have the copyright years and owners____

there? The idea behind dropping them is that we can avoid continuous adjusting of the checksum on version updates.____

__ __

If you archive the source code, or install binaries to the target, this mechanism is not involved.____

__ __

I am not aware of ${PN}-lic, can you please point where that is defined?____

__ __

Alex____

#91 lore raw

PATCH 66/70 help2man-native: update to 1.47.15

In reply to Alexander Kanavin

License-Update: http changed to https

---
 ...help2man-native_1.47.11.bb => help2man-native_1.47.15.bb} | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/help2man/{help2man-native_1.47.11.bb => help2man-native_1.47.15.bb} (69%)
meta/recipes-devtools/help2man/help2man-native_1.47.15.bb renamed from meta/recipes-devtools/help2man/help2man-native_1.47.11.bb +2 -3
similarity index 69%
rename from meta/recipes-devtools/help2man/help2man-native_1.47.11.bb
rename to meta/recipes-devtools/help2man/help2man-native_1.47.15.bb
index a60e851897..4f80a2bdb1 100644
@@ -1,12 +1,11 @@
 SUMMARY = "Program for creating simple man pages"
 SECTION = "devel"
 LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
 DEPENDS = "autoconf-native automake-native"
 
 SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "dd322adcaede5bd5eaed075ff8971bc1"
-SRC_URI[sha256sum] = "5985b257f86304c8791842c0c807a37541d0d6807ee973000cf8a3fe6ad47b88"
+SRC_URI[sha256sum] = "c25a35b30eceb315361484b0ff1f81c924e8ee5c8881576f1ee762f001dbcd1c"
 
 inherit autotools native
 
Signature · 1 line
2.26.2
#92 lore raw

PATCH 67/70 apt: update to 1.8.2.1

In reply to Alexander Kanavin

I took the opportunity to rewrite the recipe from scratch; there was just too much baggage in it.

---
 meta/conf/distro/include/maintainers.inc      |   1 -
 meta/lib/oe/package_manager.py                |   2 +-
 meta/lib/oeqa/runtime/cases/apt.py            |   2 +-
 meta/lib/oeqa/selftest/cases/devtool.py       |   2 +-
 meta/recipes-devtools/apt/apt-native.inc      |  74 --
 .../recipes-devtools/apt/apt-native_1.2.31.bb |   5 -
 meta/recipes-devtools/apt/apt-package.inc     |  94 ---
 meta/recipes-devtools/apt/apt.inc             |  40 -
 ...void-changing-install-paths-based-on.patch |  29 +
 ...e-documentation-directory-altogether.patch |  27 +
 ...t-configure-packages-on-installation.patch |  48 ++
 ...-init-tables-from-dpkg-configuration.patch |  29 +
 ...-build.patch => 0001-Fix-musl-build.patch} |  43 +-
 .../0001-Include-array.h-for-std-array.patch  |  35 -
 ...n-dpkg-configure-a-at-the-end-of-our.patch | 120 +--
 ...le-is-not-portable-use-std-locale-cl.patch |  27 -
 ...musl-based-systems-can-generate-shar.patch |  29 -
 .../apt/disable-configure-in-makefile.patch   |  18 -
 .../apt/apt/disable-test.patch                |  72 --
 .../apt/fix-gcc-4.6-null-not-defined.patch    |  14 -
 meta/recipes-devtools/apt/apt/makerace.patch  |  23 -
 .../apt/apt/no-nls-dpkg.patch                 |  28 -
 .../apt/apt/noconfigure.patch                 |  37 -
 meta/recipes-devtools/apt/apt/nodoc.patch     |  18 -
 meta/recipes-devtools/apt/apt/triehash        | 728 ++++++++++++++++++
 .../apt/apt/truncate-filename.patch           |  35 -
 meta/recipes-devtools/apt/apt/use-host.patch  |  15 -
 meta/recipes-devtools/apt/apt_1.2.31.bb       |  20 -
 meta/recipes-devtools/apt/apt_1.8.2.1.bb      | 106 +++
 meta/recipes-devtools/apt/files/apt.conf      |  42 -
 .../apt/files/db_linking_hack.patch           |  29 -
 .../apt/files/environment.patch               |  15 -
 meta/recipes-devtools/apt/files/no-curl.patch |  54 --
 33 files changed, 1010 insertions(+), 851 deletions(-)
 delete mode 100644 meta/recipes-devtools/apt/apt-native.inc
 delete mode 100644 meta/recipes-devtools/apt/apt-native_1.2.31.bb
 delete mode 100644 meta/recipes-devtools/apt/apt-package.inc
 delete mode 100644 meta/recipes-devtools/apt/apt.inc
 create mode 100644 meta/recipes-devtools/apt/apt/0001-CMakeLists.txt-avoid-changing-install-paths-based-on.patch
 create mode 100644 meta/recipes-devtools/apt/apt/0001-Disable-documentation-directory-altogether.patch
 create mode 100644 meta/recipes-devtools/apt/apt/0001-Do-not-configure-packages-on-installation.patch
 create mode 100644 meta/recipes-devtools/apt/apt/0001-Do-not-init-tables-from-dpkg-configuration.patch
 rename meta/recipes-devtools/apt/apt/{0001-apt-1.2.12-Fix-musl-build.patch => 0001-Fix-musl-build.patch} (55%)
 delete mode 100644 meta/recipes-devtools/apt/apt/0001-Include-array.h-for-std-array.patch
 delete mode 100644 meta/recipes-devtools/apt/apt/0001-The-C.UTF-8-locale-is-not-portable-use-std-locale-cl.patch
 delete mode 100644 meta/recipes-devtools/apt/apt/0001-environment.mak-musl-based-systems-can-generate-shar.patch
 delete mode 100644 meta/recipes-devtools/apt/apt/disable-configure-in-makefile.patch
 delete mode 100644 meta/recipes-devtools/apt/apt/disable-test.patch
 delete mode 100644 meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch
 delete mode 100644 meta/recipes-devtools/apt/apt/makerace.patch
 delete mode 100644 meta/recipes-devtools/apt/apt/no-nls-dpkg.patch
 delete mode 100644 meta/recipes-devtools/apt/apt/noconfigure.patch
 delete mode 100644 meta/recipes-devtools/apt/apt/nodoc.patch
 create mode 100755 meta/recipes-devtools/apt/apt/triehash
 delete mode 100644 meta/recipes-devtools/apt/apt/truncate-filename.patch
 delete mode 100644 meta/recipes-devtools/apt/apt/use-host.patch
 delete mode 100644 meta/recipes-devtools/apt/apt_1.2.31.bb
 create mode 100644 meta/recipes-devtools/apt/apt_1.8.2.1.bb
 delete mode 100644 meta/recipes-devtools/apt/files/apt.conf
 delete mode 100644 meta/recipes-devtools/apt/files/db_linking_hack.patch
 delete mode 100644 meta/recipes-devtools/apt/files/environment.patch
 delete mode 100644 meta/recipes-devtools/apt/files/no-curl.patch
meta/conf/distro/include/maintainers.inc +0 -1
index 51e6da669c..1ca1dcf775 100644
@@ -43,7 +43,6 @@ RECIPE_MAINTAINER_pn-apmd = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-apr = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-apr-util = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-apt = "Aníbal Limón <[email protected]>"
-RECIPE_MAINTAINER_pn-apt-native = "Aníbal Limón <[email protected]>"
 RECIPE_MAINTAINER_pn-argp-standalone = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-asciidoc = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-aspell = "Anuj Mittal <[email protected]>"
meta/lib/oe/package_manager.py +1 -1
index c055d2b0f7..35e5cff073 100644
@@ -1800,7 +1800,7 @@ class DpkgPM(OpkgDpkgPM):
     def fix_broken_dependencies(self):
         os.environ['APT_CONFIG'] = self.apt_conf_file
 
-        cmd = "%s %s -f install" % (self.apt_get_cmd, self.apt_args)
+        cmd = "%s %s --allow-unauthenticated -f install" % (self.apt_get_cmd, self.apt_args)
 
         try:
             subprocess.check_output(cmd.split(), stderr=subprocess.STDOUT)
meta/lib/oeqa/runtime/cases/apt.py +1 -1
index c5378d90c3..53745df93f 100644
@@ -34,7 +34,7 @@ class AptRepoTest(AptTest):
     def setup_source_config_for_package_install(self):
         apt_get_source_server = 'http://%s:%s/' % (self.tc.target.server_ip, self.repo_server.port)
         apt_get_sourceslist_dir = '/etc/apt/'
-        self.target.run('cd %s; echo deb %s ./ > sources.list' % (apt_get_sourceslist_dir, apt_get_source_server))
+        self.target.run('cd %s; echo deb [ allow-insecure=yes ] %s ./ > sources.list' % (apt_get_sourceslist_dir, apt_get_source_server))
 
     def cleanup_source_config_for_package_install(self):
         apt_get_sourceslist_dir = '/etc/apt/'
meta/lib/oeqa/selftest/cases/devtool.py +1 -1
index 5886862d6c..b9414714f2 100644
@@ -676,7 +676,7 @@ class DevtoolModifyTests(DevtoolBase):
 
         bbclassextended = False
         inheritnative = False
-        testrecipes = 'mtools-native apt-native desktop-file-utils-native'.split()
+        testrecipes = 'cdrtools-native mtools-native apt-native desktop-file-utils-native'.split()
         for testrecipe in testrecipes:
             checkextend = 'native' in (get_bb_var('BBCLASSEXTEND', testrecipe) or '').split()
             if not bbclassextended:
meta/recipes-devtools/apt/apt-native.inc deleted +0 -74

74 lines not on this page · raw message

meta/recipes-devtools/apt/apt-native_1.2.31.bb deleted +0 -5
deleted file mode 100644
index 2952c21017..0000000000
@@ -1,5 +0,0 @@
-require apt-native.inc
-
-SRC_URI += "file://noconfigure.patch \
-            file://no-curl.patch \
-"
meta/recipes-devtools/apt/apt-package.inc deleted +0 -94

94 lines not on this page · raw message

meta/recipes-devtools/apt/apt.inc deleted +0 -40
deleted file mode 100644
index 87d533782f..0000000000
@@ -1,40 +0,0 @@
-SUMMARY = "Advanced front-end for dpkg"
-DESCRIPTION = "Provides command-line tools for searching and managing as well \
-as querying information about packages as a low-level access to all features \
-of the libapt-pkg library."
-LICENSE = "GPLv2.0+"
-SECTION = "base"
-
-SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/${BPN}/${PV}/${BPN}_${PV}.tar.xz \
-           file://use-host.patch \
-           file://makerace.patch \
-           file://no-nls-dpkg.patch \
-           file://fix-gcc-4.6-null-not-defined.patch \
-           file://truncate-filename.patch \
-           file://nodoc.patch \
-           file://disable-configure-in-makefile.patch \
-           file://disable-test.patch \
-           file://0001-environment.mak-musl-based-systems-can-generate-shar.patch \
-           file://0001-apt-1.2.12-Fix-musl-build.patch \
-           file://0001-Include-array.h-for-std-array.patch \
-           file://0001-The-C.UTF-8-locale-is-not-portable-use-std-locale-cl.patch \
-           "
-SRC_URI[md5sum] = "d30eed9304e82ea8238c854b5c5a34d9"
-SRC_URI[sha256sum] = "03ded4f5e9b8d43ecec083704b2dcabf20c182ed382db9ac7251da0b0b038059"
-LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-# 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/a/apt/"
-
-inherit autotools gettext useradd upstream-version-is-even
-
-EXTRA_AUTORECONF = "--exclude=autopoint,autoheader"
-
-do_configure_prepend() {
-    rm -rf ${S}/buildlib/config.sub
-    rm -rf ${S}/buildlib/config.guess
-}
-
-USERADD_PACKAGES = "${PN}"
-USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /nonexistent --shell /bin/false --user-group _apt"
meta/recipes-devtools/apt/apt/0001-CMakeLists.txt-avoid-changing-install-paths-based-on.patch new file +29 -0
new file mode 100644
index 0000000000..199f11bf20
@@ -0,0 +1,29 @@
+From 9023589317843df4e57f8ebef1d9a8398ddb929d Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Thu, 28 May 2020 15:34:05 +0000
+Subject: [PATCH] CMakeLists.txt: avoid changing install paths based on host
+ distro
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2cd4f8e..4759812 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,9 +21,9 @@ set(CMAKE_EXE_LINKER_FLAGS_COVERAGE "-lgcov")
+ set(CMAKE_SHARED_LINKER_FLAGS_COVERAGE "-lgcov")
+ 
+ # Work around bug in GNUInstallDirs
+-if (EXISTS "/etc/debian_version")
+-  set(CMAKE_INSTALL_LIBEXECDIR "lib")
+-endif()
++#if (EXISTS "/etc/debian_version")
++set(CMAKE_INSTALL_LIBEXECDIR "lib")
++#endif()
+ 
+ # Include stuff
+ include(Misc)
meta/recipes-devtools/apt/apt/0001-Disable-documentation-directory-altogether.patch new file +27 -0
new file mode 100644
index 0000000000..cc422b74dc
@@ -0,0 +1,27 @@
+From cd164b353ba7958d51b2f33f4079fb9787c983e2 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Fri, 10 May 2019 14:16:47 +0200
+Subject: [PATCH] Disable documentation directory altogether
+
+Even when WITH_DOC=False, the build requires po4a to generate manpages.
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <[email protected]>
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 83334ba..2cd4f8e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -232,7 +232,7 @@ add_subdirectory(apt-private)
+ add_subdirectory(apt-inst)
+ add_subdirectory(cmdline)
+ add_subdirectory(completions)
+-add_subdirectory(doc)
++#add_subdirectory(doc)
+ add_subdirectory(dselect)
+ add_subdirectory(ftparchive)
+ add_subdirectory(methods)
meta/recipes-devtools/apt/apt/0001-Do-not-configure-packages-on-installation.patch new file +48 -0

48 lines not on this page · raw message

meta/recipes-devtools/apt/apt/0001-Do-not-init-tables-from-dpkg-configuration.patch new file +29 -0
new file mode 100644
index 0000000000..d3d3ab026d
@@ -0,0 +1,29 @@
+From b18d7aa7d71b53b86bac21cd1d8c3accabb28f2b Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Fri, 10 May 2019 16:47:38 +0200
+Subject: [PATCH] Do not init tables from dpkg configuration
+
+This would require sysroot relocation logic, and it's easier to just disable them.
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <[email protected]>
+
+---
+ apt-pkg/init.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
+index a619368..6e5a6cf 100644
+--- a/apt-pkg/init.cc
++++ b/apt-pkg/init.cc
+@@ -281,8 +281,8 @@ bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys)
+ 	 return _error->Error(_("Unable to determine a suitable packaging system type"));
+    }
+ 
+-   if (pkgInitArchTupleMap() == false)
+-      return false;
++//   if (pkgInitArchTupleMap() == false)
++//      return false;
+    
+    return Sys->Initialize(Cnf);
+ }
meta/recipes-devtools/apt/apt/0001-Fix-musl-build.patch renamed from meta/recipes-devtools/apt/apt/0001-apt-1.2.12-Fix-musl-build.patch +19 -24

67 lines not on this page · raw message

meta/recipes-devtools/apt/apt/0001-Include-array.h-for-std-array.patch deleted +0 -35
deleted file mode 100644
index e4a8faa2b4..0000000000
@@ -1,35 +0,0 @@
-From 4d64ec843185bf6fd1b85c3a6a4c4e3c968c8ab1 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sun, 20 Jan 2019 18:56:58 -0800
-Subject: [PATCH] Include <array.h> for std::array
-
-When compiling using clang/libc++ it fails to build because this header
-is not included, with libstdc++ this seems to be pulled in
-automatically.
-
-Fixes below error
-
-apt-pkg/contrib/strutl.cc:949:38: error: implicit instantiation of undefined template 'std::__1::array<const char *const, 7>'
-   std::array<char const * const, 7> c_weekdays = {{ "sun", "mon", "tue", "wed", "thu", "fri", "sat" }};
-
-Signed-off-by: Khem Raj <[email protected]>
-Upstream-Status: Backport [https://github.com/Debian/apt/commit/24a59c62efafbdb8387b2d3c5616b04b9fd21306]
----
- apt-pkg/contrib/strutl.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
-index 60d0ca8..c2bfcbc 100644
---- a/apt-pkg/contrib/strutl.cc
-+++ b/apt-pkg/contrib/strutl.cc
-@@ -21,6 +21,7 @@
- #include <apt-pkg/fileutl.h>
- #include <apt-pkg/error.h>
- 
-+#include <array>
- #include <algorithm>
- #include <iomanip>
- #include <locale>
--- 
-2.20.1
-
meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch +21 -99

141 lines not on this page · raw message

meta/recipes-devtools/apt/apt/0001-The-C.UTF-8-locale-is-not-portable-use-std-locale-cl.patch deleted +0 -27
deleted file mode 100644
index ce5c005086..0000000000
@@ -1,27 +0,0 @@
-From 7e8839731ae3fdf7502b91643aa6b252f6c5eaa6 Mon Sep 17 00:00:00 2001
-From: Adrian Bunk <[email protected]>
-Date: Thu, 14 May 2020 00:08:21 +0300
-Subject: The C.UTF-8 locale is not portable, use std::locale::classic()
-
-Upstream-Status: Inappropriate [Similar fix already in apt >= 1.3]
-Signed-off-by: Adrian Bunk <[email protected]>
----
- ftparchive/writer.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
-index 25963820a..6ad571d2a 100644
---- a/ftparchive/writer.cc
-+++ b/ftparchive/writer.cc
-@@ -984,7 +984,7 @@ ReleaseWriter::ReleaseWriter(FileFd * const GivenOutput, string const &/*DB*/) :
-    AddPatterns(_config->FindVector("APT::FTPArchive::Release::Patterns"));
- 
-    time_t const now = time(NULL);
--   auto const posix = std::locale("C.UTF-8");
-+   auto const posix = std::locale::classic();
- 
-    // FIXME: use TimeRFC1123 here? But that uses GMT to satisfy HTTP/1.1
-    std::ostringstream datestr;
--- 
-2.20.1
-
meta/recipes-devtools/apt/apt/0001-environment.mak-musl-based-systems-can-generate-shar.patch deleted +0 -29
deleted file mode 100644
index 042372b515..0000000000
@@ -1,29 +0,0 @@
-From 2f8aa21ace375c18977ed908b291c80a210a93c6 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Thu, 31 Dec 2015 08:06:12 +0000
-Subject: [PATCH] environment.mak: musl based systems can generate shared
- objects too
-
-Signed-off-by: Khem Raj <[email protected]>
----
-Upstream-Status: Pending
-
- buildlib/environment.mak.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
-index b0a8d9d..3a52344 100644
---- a/buildlib/environment.mak.in
-+++ b/buildlib/environment.mak.in
-@@ -68,7 +68,7 @@ NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@
- 
- # Shared library things
- HOST_OS = @host_os@
--ifneq ($(words $(filter gnu% linux-gnu% kfreebsd-gnu% %-gnu,$(HOST_OS))),0)
-+ifneq ($(words $(filter gnu% linux-gnu% kfreebsd-gnu% %-gnu linux-musl%,$(HOST_OS))),0)
-    SONAME_MAGIC=-Wl,-soname -Wl,
-    LFLAGS_SO=
- else
--- 
-2.6.4
-
meta/recipes-devtools/apt/apt/disable-configure-in-makefile.patch deleted +0 -18
deleted file mode 100644
index 7c2f64e3e6..0000000000
@@ -1,18 +0,0 @@
-Disable configure at compilation stage
-
-Upstream-Status: Inappropriate [configuration]
-Signed-off-by: Constantin Musca <[email protected]>
-
-Index: apt-0.9.7.7/Makefile
-===================================================================
---- apt-0.9.7.7.orig/Makefile
-+++ apt-0.9.7.7/Makefile
-@@ -33,7 +33,7 @@ veryclean: clean
- # The startup target builds the necessary configure scripts. It should
- # be used after a CVS checkout.
- CONVERTED=environment.mak include/config.h include/apti18n.h build/doc/Doxyfile makefile
--include buildlib/configure.mak
-+#include buildlib/configure.mak
- $(BUILDDIR)/include/config.h: buildlib/config.h.in
- $(BUILDDIR)/include/apti18n.h: buildlib/apti18n.h.in
- $(BUILDDIR)/environment.mak: buildlib/environment.mak.in
meta/recipes-devtools/apt/apt/disable-test.patch deleted +0 -72

72 lines not on this page · raw message

meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch deleted +0 -14
deleted file mode 100644
index 899c6ef2fc..0000000000
@@ -1,14 +0,0 @@
-Upstream-Status: Pending
-
-Index: apt-1.2.24/apt-pkg/contrib/weakptr.h
-===================================================================
---- apt-1.2.24.orig/apt-pkg/contrib/weakptr.h
-+++ apt-1.2.24/apt-pkg/contrib/weakptr.h
-@@ -21,6 +21,7 @@
- #ifndef WEAK_POINTER_H
- #define WEAK_POINTER_H
- 
-+#include <cstdlib>
- #include <set>
- #include <stddef.h>
- 
meta/recipes-devtools/apt/apt/makerace.patch deleted +0 -23
deleted file mode 100644
index 0c686d6e27..0000000000
@@ -1,23 +0,0 @@
-I was seeing various issues with parallel make, mainly due to to what was likely 
-partially installed headers. If you change into the source directory and
-"NOISY=1 make  ../obj/apt-pkg/sourcelist.opic" in apt-pkg, you'll see it 
-doesn't have any dependencies on the headers being installed. This patch
-fixes that so things build correctly.
-
-RP 2012/3/19
-
-Upstream-Status: Pending
-
-Index: apt-1.2.24/buildlib/library.mak
-===================================================================
---- apt-1.2.24.orig/buildlib/library.mak
-+++ apt-1.2.24/buildlib/library.mak
-@@ -65,7 +65,7 @@ $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR
- 
- # Compilation rules
- vpath %.cc $(SUBDIRS)
--$(OBJ)/%.opic: %.cc $(LIBRARYDEPENDS)
-+$(OBJ)/%.opic: %.cc $(LIBRARYDEPENDS) $($(LOCAL)-HEADERS)
- 	echo Compiling $< to $@
- 	$(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXSTD) $(CXXFLAGS) $(PICFLAGS) -o $@ '$(abspath $<)'
- 	$(DoDep)
meta/recipes-devtools/apt/apt/no-nls-dpkg.patch deleted +0 -28
deleted file mode 100644
index 98b6c96caa..0000000000
@@ -1,28 +0,0 @@
-Upstream-Status: Pending
-
-Index: apt-1.2.24/apt-pkg/deb/dpkgpm.cc
-===================================================================
---- apt-1.2.24.orig/apt-pkg/deb/dpkgpm.cc
-+++ apt-1.2.24/apt-pkg/deb/dpkgpm.cc
-@@ -54,6 +54,12 @@
- #include <apti18n.h>
- 									/*}}}*/
- 
-+#ifdef USE_NLS
-+#define _dpkg(x) dgettext("dpkg", x)
-+#else
-+#define _dpkg(x) x
-+#endif
-+
- using namespace std;
- 
- APT_PURE static string
-@@ -1703,7 +1709,7 @@ void pkgDPkgPM::WriteApportReport(const
-    }
- 
-    // check if its not a follow up error 
--   const char *needle = dgettext("dpkg", "dependency problems - leaving unconfigured");
-+   const char *needle = _dpkg("dependency problems - leaving unconfigured");
-    if(strstr(errormsg, needle) != NULL) {
-       std::clog << _("No apport report written because the error message indicates its a followup error from a previous failure.") << std::endl;
-       return;
meta/recipes-devtools/apt/apt/noconfigure.patch deleted +0 -37
deleted file mode 100644
index ebc67203b4..0000000000
@@ -1,37 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-Signed-off-by: Constantin Musca <[email protected]>
-
-
-diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
-index 249542c..0a1911f 100644
---- a/apt-pkg/packagemanager.cc
-+++ b/apt-pkg/packagemanager.cc
-@@ -952,10 +952,12 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
-       return false;
- 
-    if (Immediate == true) {
-+#if 0
-       // Perform immedate configuration of the package. 
-          if (SmartConfigure(Pkg, Depth + 1) == false)
-             _error->Error(_("Could not perform immediate configuration on '%s'. "
-                "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.FullName().c_str(),2);
-+#endif
-    }
-    
-    return true;
-@@ -1038,6 +1040,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
-       }
-    }
- 
-+#if 0
-    // Final run through the configure phase
-    if (ConfigureAll() == false)
-       return Failed;
-@@ -1052,6 +1055,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
- 	 return Failed;
-       }
-    }
-+#endif
- 	 
-    return Completed;
- }
meta/recipes-devtools/apt/apt/nodoc.patch deleted +0 -18
deleted file mode 100644
index 78cf53884a..0000000000
@@ -1,18 +0,0 @@
-Disable documentation
-
-Upstream-Status: Inappropriate [configuration]
-Signed-off-by: Constantin Musca <[email protected]>
-
-Index: apt-1.2.24/Makefile
-===================================================================
---- apt-1.2.24.orig/Makefile
-+++ apt-1.2.24/Makefile
-@@ -19,7 +19,7 @@ all headers library clean veryclean bina
- 	$(MAKE) -C cmdline $@
- 	$(MAKE) -C ftparchive $@
- 	$(MAKE) -C dselect $@
--	$(MAKE) -C doc $@
-+#	$(MAKE) -C doc $@
- 	$(MAKE) -C po $@
- 	# FIXME: -C test has issue swith parallel builds, investigate!
- 	-$(MAKE) -C test $@
meta/recipes-devtools/apt/apt/triehash new file +728 -0

728 lines not on this page · raw message

meta/recipes-devtools/apt/apt/truncate-filename.patch deleted +0 -35
deleted file mode 100644
index db1c42b66c..0000000000
@@ -1,35 +0,0 @@
-strutl.cc: the filename can't be longer than 255
-
-The URItoFileName translates the path into the filename, but the
-filename can't be longer than 255 according to
-/usr/include/linux/limits.h.
-
-Truncate it when it is longer than 240 (leave some spaces for
-".Packages" and "._Release" suffix)
-
-Upstream-Status: Pending
-Signed-off-by: Robert Yang <[email protected]>
----
- apt-pkg/contrib/strutl.cc |    7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
---- a/apt-pkg/contrib/strutl.cc
-+++ b/apt-pkg/contrib/strutl.cc
-@@ -399,7 +399,12 @@ string URItoFileName(const string &URI)
-    // "\x00-\x20{}|\\\\^\\[\\]<>\"\x7F-\xFF";
-    string NewURI = QuoteString(U,"\\|{}[]<>\"^~_=!@#$%^&*");
-    replace(NewURI.begin(),NewURI.end(),'/','_');
--   return NewURI;
-+
-+   // Truncate from the head when it is longer than 240
-+   if(NewURI.length() > 240)
-+       return NewURI.substr(NewURI.length() - 240, NewURI.length() - 1);
-+   else
-+       return NewURI;
- }
- 									/*}}}*/
- // Base64Encode - Base64 Encoding routine for short strings		/*{{{*/
--- 
-1.7.10.4
-
meta/recipes-devtools/apt/apt/use-host.patch deleted +0 -15
deleted file mode 100644
index b30fcff0d6..0000000000
@@ -1,15 +0,0 @@
-Upstream-Status: Pending
-
-Index: apt-0.9.7.7/configure.ac
-===================================================================
---- apt-0.9.7.7.orig/configure.ac
-+++ apt-0.9.7.7/configure.ac
-@@ -112,7 +112,7 @@ dnl This is often the dpkg architecture
- dnl First check against the full canonical canoncial-system-type in $target
- dnl and if that fails, just look for the cpu
- AC_MSG_CHECKING(debian architecture)
--archset="`dpkg-architecture -qDEB_HOST_ARCH`"
-+archset="`echo $host_alias|cut -d'-' -f1`"
- if test "x$archset" = "x"; then
-    AC_MSG_ERROR([failed: use --host= or output from dpkg-architecture])
- fi
meta/recipes-devtools/apt/apt_1.2.31.bb deleted +0 -20
deleted file mode 100644
index ae0bce933d..0000000000
@@ -1,20 +0,0 @@
-DEPENDS = "curl db zlib"
-RDEPENDS_${PN} = "dpkg bash debianutils"
-require apt.inc
-
-require apt-package.inc
-
-PACKAGECONFIG ??= "lzma"
-PACKAGECONFIG[lzma] = "ac_cv_lib_lzma_lzma_easy_encoder=yes,ac_cv_lib_lzma_lzma_easy_encoder=no,xz"
-PACKAGECONFIG[bz2] = "ac_cv_lib_bz2_BZ2_bzopen=yes,ac_cv_lib_bz2_BZ2_bzopen=no,bzip2"
-PACKAGECONFIG[lz4] = "ac_cv_lib_lz4_LZ4F_createCompressionContext=yes,ac_cv_lib_lz4_LZ4F_createCompressionContext=no,lz4"
-
-FILES_${PN} += "${bindir}/apt-key"
-apt-manpages += "doc/apt-key.8"
-
-do_install_append() {
-    #Write the correct apt-architecture to apt.conf
-    APT_CONF=${D}/etc/apt/apt.conf
-    echo 'APT::Architecture "${DPKG_ARCH}";' > ${APT_CONF}
-    oe_libinstall -so -C bin libapt-private ${D}${libdir}/
-}
meta/recipes-devtools/apt/apt_1.8.2.1.bb new file +106 -0

106 lines not on this page · raw message

meta/recipes-devtools/apt/files/apt.conf deleted +0 -42

42 lines not on this page · raw message

meta/recipes-devtools/apt/files/db_linking_hack.patch deleted +0 -29
deleted file mode 100644
index a61d4b07c2..0000000000
@@ -1,29 +0,0 @@
-Upstream-Status: Backport
-
-Index: apt-0.7.3/configure.ac
-===================================================================
---- apt-0.7.3.orig/configure.ac	2007-07-01 10:38:45.000000000 +0000
-+++ apt-0.7.3/configure.ac	2007-08-21 13:39:26.000000000 +0000
-@@ -67,8 +67,20 @@
-       [AC_DEFINE(HAVE_BDB)
-        BDBLIB="-ldb"
-        AC_MSG_RESULT(yes)],
--      [BDBLIB=""
--       AC_MSG_RESULT(no)]
-+
-+       LIBS="$LIBS -lpthread"
-+       [AC_MSG_CHECKING(if we can link against BerkeleyDB with pthread)
-+        AC_LINK_IFELSE(
-+        [AC_LANG_PROGRAM(
-+         [#include <db.h>],
-+         [int r, s, t; db_version(&r, &s, &t);]
-+        )],
-+        [AC_DEFINE(HAVE_BDB)
-+         BDBLIB="-ldb -lpthread"
-+         AC_MSG_RESULT(yes)],
-+        [BDBLIB=""
-+         AC_MSG_RESULT(no)]
-+      )]       
-     )]
- )
- 
meta/recipes-devtools/apt/files/environment.patch deleted +0 -15
deleted file mode 100644
index 9a0303803e..0000000000
@@ -1,15 +0,0 @@
-Upstream-Status: Backport
-
-Index: apt-0.6.46.2/buildlib/environment.mak.in
-===================================================================
---- apt-0.6.46.2.orig/buildlib/environment.mak.in	2007-03-29 11:38:58.000000000 +0100
-+++ apt-0.6.46.2/buildlib/environment.mak.in	2007-03-29 11:39:12.000000000 +0100
-@@ -62,7 +62,7 @@
- 
- # Shared library things
- HOST_OS = @host_os@
--ifneq ($(words $(filter linux-gnu gnu% %gnu,$(HOST_OS))),0)
-+ifneq ($(words $(filter linux-gnu linux-gnueabi gnu% %gnu,$(HOST_OS))),0)
-    SONAME_MAGIC=-Wl,-soname -Wl,
-    LFLAGS_SO=
- else
meta/recipes-devtools/apt/files/no-curl.patch deleted +0 -54

54 lines not on this page · raw message

Signature · 1 line
2.26.2
#93 lore raw

Re: [OE-core] [PATCH 67/70] apt: update to 1.8.2.1

Quoted 2 lines · Alexander Kanavin

I took the opportunity to rewrite the recipe from scratch; there was just too much baggage in it.

Test builds failed with a reproducibility problem in lz4:

https://bugzilla.yoctoproject.org/show_bug.cgi?id=13925

This hasn't been seen until now since there is now a hard dependency on lz4 from apt in this patch.

We could fix the symbol ordering or perhaps disable the static library as we don't use it as far as I know, not sure why it would be building one...

Cheers,

Richard

#94 lore raw

Re: [OE-core] [PATCH 67/70] apt: update to 1.8.2.1

Quoted 6 lines · Richard Purdie
Quoted 2 lines · Alexander Kanavin

I took the opportunity to rewrite the recipe from scratch; there was just too much baggage in it.

Test builds failed with a reproducibility problem in lz4:

Quoted 9 lines

https://bugzilla.yoctoproject.org/show_bug.cgi?id=13925

This hasn't been seen until now since there is now a hard dependency on lz4 from apt in this patch.

We could fix the symbol ordering or perhaps disable the static library as we don't use it as far as I know, not sure why it would be building one...

lz4 is using hand-crafted Makefiles, so the build is non-standard. I just sent a patch to disable the static library.

Alex

#95 lore raw

Re: [OE-core] [PATCH 67/70] apt: update to 1.8.2.1

In reply to Richard Purdie
Quoted 7 lines · Richard Purdie
Quoted 2 lines · Alexander Kanavin

I took the opportunity to rewrite the recipe from scratch; there was just too much baggage in it.

Test builds failed with a reproducibility problem in lz4:

Quoted 9 lines

https://bugzilla.yoctoproject.org/show_bug.cgi?id=13925

This hasn't been seen until now since there is now a hard dependency on lz4 from apt in this patch.

We could fix the symbol ordering or perhaps disable the static library as we don't use it as far as I know, not sure why it would be building one...

It also fails to build with clang
https://errors.yoctoproject.org/Errors/Details/414880/

it perhaps is missing the right qualifiers for printf

Quoted 7 lines

Cheers,

Richard

#96 lore raw

PATCH 68/70 asciidoc: bump PV to 8.6.10

In reply to Alexander Kanavin

SRCREV is unchanged, as it already points to a post-8.6.10 commit. (this was overlooked when asciidoc was switched to a py3 port)

---
 .../asciidoc/{asciidoc_8.6.9.bb => asciidoc_8.6.10.bb}            | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename meta/recipes-extended/asciidoc/{asciidoc_8.6.9.bb => asciidoc_8.6.10.bb} (100%)
meta/recipes-extended/asciidoc/asciidoc_8.6.10.bb renamed from meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb +0 -0
similarity index 100%
rename from meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb
rename to meta/recipes-extended/asciidoc/asciidoc_8.6.10.bb
Signature · 1 line
2.26.2
#97 lore raw

PATCH 69/70 pulseaudio: exclude pre-releases from version checks

In reply to Alexander Kanavin
---
 meta/recipes-multimedia/pulseaudio/pulseaudio_13.0.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-multimedia/pulseaudio/pulseaudio_13.0.bb +1 -0
index 601499b6da..b7a4a9b3c9 100644
@@ -8,6 +8,7 @@ SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \
            "
 SRC_URI[md5sum] = "e41d606f90254ed45c90520faf83d95c"
 SRC_URI[sha256sum] = "961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057"
+UPSTREAM_CHECK_REGEX = "pulseaudio-(?P<pver>\d+(\.(?!99)\d+)+)\.tar"
 
 do_compile_prepend() {
     mkdir -p ${S}/libltdl
Signature · 1 line
2.26.2
#98 lore raw

PATCH 70/70 xinetd: switch to a maintained opensuse fork

In reply to Alexander Kanavin

Updating to the latest release will be done later.

---
 meta/recipes-extended/xinetd/xinetd_2.3.15.bb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
meta/recipes-extended/xinetd/xinetd_2.3.15.bb +2 -4
index 6e43f5be6f..8f8f846bfb 100644
@@ -9,10 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=8ad8615198542444f84d28a6cf226dd8"
 DEPENDS += "libtirpc"
 PR = "r2"
 
-# Blacklist a bogus tag in upstream check
-UPSTREAM_CHECK_GITTAGREGEX = "xinetd-(?P<pver>(?!20030122).+)"
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
 
-SRC_URI = "git://github.com/xinetd-org/xinetd.git;protocol=https \
+SRC_URI = "git://github.com/openSUSE/xinetd.git;protocol=https \
       file://xinetd.init \
       file://xinetd.conf \
       file://xinetd.default \
@@ -23,7 +22,6 @@ SRC_URI = "git://github.com/xinetd-org/xinetd.git;protocol=https \
       file://0001-configure-Use-HAVE_SYS_RESOURCE_H-to-guard-sys-resou.patch \
       file://xinetd.service \
       "
-UPSTREAM_VERSION_UNKNOWN = "1"
 
 SRCREV = "68bb9ab9e9f214ad8a2322f28ac1d6733e70bc24"
 
Signature · 1 line
2.26.2
#99 lore raw

✗ patchtest: failure for "btrfs-tools: upgrade 5.4.1 -> ..." and 69 more

In reply to Alexander Kanavin

== Series Details ==

Series: "btrfs-tools: upgrade 5.4.1 -> ..." and 69 more
Revision: 1
URL : https://patchwork.openembedded.org/series/24401/
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 in incorrect format [test_upstream_status_presence_format]

  Suggested fix    Fix Upstream-Status format in 0001-Do-not-configure-packages-on-installation.patch
  Current          Upstream-Status: Inappropirate [oe-core specific]
  Standard format  Upstream-Status: <Valid status>
  Valid status     Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where]

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