tar: make gtar always gnu tar
PATCH 1/2 tar: make gtar always gnu tar
From: Daniel McGregor <[email protected]>
Previously, gtar was a symlink to tar. It followed update-alternatives, when what we most likely want is for gtar to always be GNU tar, and tar to be whatever update-alternatives decides.
--- meta/recipes-extended/tar/tar_1.35.bb | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
meta/recipes-extended/tar/tar_1.35.bb +15 -5
@@ -18,20 +18,22 @@ PACKAGECONFIG:append:class-target = " ${@bb.utils.filter('DISTRO_FEATURES', 'acl PACKAGECONFIG[acl] = "--with-posix-acls,--without-posix-acls,acl" PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" -EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}" +EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir} --program-prefix=g" CACHED_CONFIGUREVARS += "tar_cv_path_RSH=no" do_install () { autotools_do_install - ln -s tar ${D}${bindir}/gtar + ln -s gtar ${D}${bindir}/tar + ln -s grmt ${D}${sbindir}/rmt } do_install:append:class-target() { + rm ${D}${bindir}/tar + rm ${D}${sbindir}/rmt if [ "${base_bindir}" != "${bindir}" ]; then install -d ${D}${base_bindir} - mv ${D}${bindir}/tar ${D}${base_bindir}/tar - mv ${D}${bindir}/gtar ${D}${base_bindir}/gtar + mv ${D}${bindir}/gtar ${D}${base_bindir} rmdir ${D}${bindir}/ fi }
@@ -72,19 +74,27 @@ do_install_ptest() { PACKAGES =+ "${PN}-rmt" -FILES:${PN}-rmt = "${sbindir}/rmt*" +FILES:${PN}-rmt = "${sbindir}/grmt*" inherit update-alternatives ALTERNATIVE_PRIORITY = "100" ALTERNATIVE:${PN} = "tar" +ALTERNATIVE:${PN}-doc = "tar.1 rmt.8" ALTERNATIVE:${PN}-rmt = "rmt" ALTERNATIVE:${PN}:class-nativesdk = "" ALTERNATIVE:${PN}-rmt:class-nativesdk = "" ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar" +ALTERNATIVE_TARGET[tar] = "${base_bindir}/gtar" ALTERNATIVE_LINK_NAME[rmt] = "${sbindir}/rmt" +ALTERNATIVE_TARGET[rmt] = "${sbindir}/grmt" + +ALTERNATIVE_LINK_NAME[tar.1] = "${mandir}/man1/tar.1" +ALTERNATIVE_TARGET[tar.1] = "${mandir}/man1/gtar.1" +ALTERNATIVE_LINK_NAME[rmt.8] = "${mandir}/man8/rmt.8" +ALTERNATIVE_TARGET[rmt.8] = "${mandir}/man8/grmt.8" PROVIDES:append:class-native = " tar-replacement-native" NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
PATCH 2/2 python3-requests: Increase chardet upper limit
From: Dan McGregor <[email protected]>
OE Core includes chardet 6.0, while requests warns for any version greater than or equal to 6.0. Not for any real reason, but because it was a higher version than what was released when requests 2.32 was released.
--- ...01-Increase-chardet-upper-limit-to-7.patch | 26 +++++++++++++++++++ .../python/python3-requests_2.32.5.bb | 1 + 2 files changed, 27 insertions(+) create mode 100644 meta/recipes-devtools/python/python3-requests/0001-Increase-chardet-upper-limit-to-7.patch
meta/recipes-devtools/python/python3-requests/0001-Increase-chardet-upper-limit-to-7.patch new file +26 -0
@@ -0,0 +1,26 @@ +From 0f965846b95d096d76a1795db37fbe9acad0eb65 Mon Sep 17 00:00:00 2001 +From: Amin Vakil <[email protected]> +Date: Sun, 22 Feb 2026 19:37:16 +0330 +Subject: [PATCH] Increase chardet upper limit to 7 + +Upstream-Status: Backport [https://github.com/psf/requests/commit/4bd79e397304d46dfccd76f36c07f66c0295ff82] +--- + src/requests/__init__.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/requests/__init__.py b/src/requests/__init__.py +index 051cda13..9a80c625 100644 +--- a/src/requests/__init__.py ++++ b/src/requests/__init__.py +@@ -76,7 +76,7 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver + major, minor, patch = chardet_version.split(".")[:3] + major, minor, patch = int(major), int(minor), int(patch) + # chardet_version >= 3.0.2, < 6.0.0 +- assert (3, 0, 2) <= (major, minor, patch) < (6, 0, 0) ++ assert (3, 0, 2) <= (major, minor, patch) < (7, 0, 0) + elif charset_normalizer_version: + major, minor, patch = charset_normalizer_version.split(".")[:3] + major, minor, patch = int(major), int(minor), int(patch) +-- +2.44.4 +
meta/recipes-devtools/python/python3-requests_2.32.5.bb +1 -0
@@ -8,6 +8,7 @@ inherit pypi python_setuptools_build_meta SRC_URI[sha256sum] = "dbba0bac56e100853db0ea71b82b4dfd5fe2bf6d3754a8893c3af500cec7d7cf" SRC_URI += "file://CVE-2026-25645.patch" +SRC_URI += "file://0001-Increase-chardet-upper-limit-to-7.patch" SRC_URI:append:class-nativesdk = " file://environment.d-python3-requests.sh" do_install:append:class-nativesdk() {
Patchtest results for [PATCH 2/2] python3-requests: Increase chardet upper limit
Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information:
---
Testing patch /home/patchtest/share/mboxes/2-2-python3-requests-Increase-chardet-upper-limit.patch
FAIL: test Signed-off-by presence: A patch file has been added without a Signed-off-by tag: '0001-Increase-chardet-upper-limit-to-7.patch' (test_patch.TestPatch.test_signed_off_by_presence)
PASS: test CVE tag format (test_patch.TestPatch.test_cve_tag_format)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test Upstream-Status presence (test_patch.TestPatch.test_upstream_status_presence_format)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)
SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
---
Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!
Re: [OE-core] [PATCH 2/2] python3-requests: Increase chardet upper limit
In reply to Dan McGregorQuoted 8 lines · Dan McGregor via lists.openembedded.org
From: Dan McGregor <[email protected]>
OE Core includes chardet 6.0, while requests warns for any version greater than or equal to 6.0. Not for any real reason, but because it was a higher version than what was released when requests 2.32 was released.
For "master" we should upgrade to 2.33.1 which is the latest release and includes this patch:
https://github.com/psf/requests/compare/v2.32.5...v2.33.1
For 'wrynose' we should use the backport, but there is also a bump to chardet < 8 that merged:
https://github.com/psf/requests/commit/b2a1d33f571518ca9a6148e7da787cc5827f897a
Quoted 73 lines
Signed-off-by Dan McGregor <[email protected]>--- ...01-Increase-chardet-upper-limit-to-7.patch | 26 +++++++++++++++++++ .../python/python3-requests_2.32.5.bb | 1 + 2 files changed, 27 insertions(+) create mode 100644
meta/recipes-devtools/python/python3-requests/0001-Increase-chardet-upper-limit-to-7.patchdiff --git
a/meta/recipes-devtools/python/python3-requests/0001-Increase-chardet-upper-limit-to-7.patchb/meta/recipes-devtools/python/python3-requests/0001-Increase-chardet-upper-limit-to-7.patchnew file mode 100644
index 00000000000..2c445e42549
---/dev/null
+++b/meta/recipes-devtools/python/python3-requests/0001-Increase-chardet-upper-limit-to-7.patchmeta/recipes-devtools/python/python3-requests/0001-Increase-chardet-upper-limit-to-7.patch new file +6
-0@@ -0,0 +1,26 @@ +From 0f965846b95d096d76a1795db37fbe9acad0eb65 Mon Sep 17 00:00:00 2001 +From: Amin Vakil <[email protected]> +Date: Sun, 22 Feb 2026 19:37:16 +0330 +Subject: [PATCH] Increase chardet upper limit to 7 + +Upstream-Status: Backport [https://github.com/psf/requests/commit/4bd79e397304d46dfccd76f36c07f66c0295ff82
]+--- + src/requests/__init__.py | 2 +-+ 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/python/python3-requests/0001-Increase-chardet-upper-limit-to-7.patch new file +6
-0+ +diff --git a/src/requests/__init__.py b/src/requests/__init__.py +index 051cda13..9a80c625 100644 +--- a/src/requests/__init__.py ++++ b/src/requests/__init__.py +@@ -76,7 +76,7 @@ def check_compatibility(urllib3_version,
chardet_version,charset_normalizer_vermeta/recipes-devtools/python/python3-requests/0001-Increase-chardet-upper-limit-to-7.patch new file +11
-0+ major, minor, patch = chardet_version.split(".")[:3] + major, minor, patch = int(major), int(minor), int(patch) + # chardet_version >= 3.0.2, < 6.0.0 +- assert (3, 0, 2) <= (major, minor, patch) < (6, 0, 0) ++ assert (3, 0, 2) <= (major, minor, patch) < (7, 0, 0) + elif charset_normalizer_version: + major, minor, patch = charset_normalizer_version.split(".")[:3] + major, minor, patch = int(major), int(minor), int(patch) +-- +2.44.4 +meta/recipes-devtools/python/python3-requests_2.32.5.bb +0
-0@@ -8,6 +8,7 @@ inherit pypi python_setuptools_build_meta SRC_URI[sha256sum] ="
dbba0bac56e100853db0ea71b82b4dfd5fe2bf6d3754a8893c3af500cec7d7cf"
SRC_URI+= "file://CVE-2026-25645.patch"
+SRC_URI += "file://0001-Increase-chardet-upper-limit-to-7.patch"
SRC_URI:append:class-nativesdk = " file://environment.d-python3-requests.sh"do_install:append:class-nativesdk() {
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#236176):
https://lists.openembedded.org/g/openembedded-core/message/236176
Mute This Topic: https://lists.openembedded.org/mt/119084300/924729
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 2/2] python3-requests: Increase chardet upper limit
Quoted 13 lines · Tim Orling
Quoted 8 lines · Dan McGregor via lists.openembedded.org
From: Dan McGregor <[email protected]>
OE Core includes chardet 6.0, while requests warns for any version greater than or equal to 6.0. Not for any real reason, but because it was a higher version than what was released when requests 2.32 was released.
Quoted 5 lines
For "master" we should upgrade to 2.33.1 which is the latest release and includes this patch:
https://github.com/psf/requests/compare/v2.32.5...v2.33.1For 'wrynose' we should use the backport, but there is also a bump to chardet < 8 that merged:
https://github.com/psf/requests/commit/b2a1d33f571518ca9a6148e7da787cc5827f897a
Oh I agree about master. This was intended for wrynose for now, since it's either released or close to it.
And it was both < 8 and < 7 that merged, I cherry-picked the first one. The link above is one after my cherry-pick below. I'm not opposed to cherry-picking both though in one patch.
Quoted 61 lines
Quoted 61 lines
Signed-off-by Dan McGregor <[email protected]>--- ...01-Increase-chardet-upper-limit-to-7.patch | 26 +++++++++++++++++++ .../python/python3-requests_2.32.5.bb | 1 + 2 files changed, 27 insertions(+) create mode 100644 meta/recipes-devtools/python/python3-requests/0001-Increase-chardet-upper-limit-to-7.patchmeta/recipes-devtools/python/python3-requests/0001-Increase-chardet-upper-limit-to-7.patch new file +26
-0@@ -0,0 +1,26 @@ +From 0f965846b95d096d76a1795db37fbe9acad0eb65 Mon Sep 17 00:00:00 2001 +From: Amin Vakil <[email protected]> +Date: Sun, 22 Feb 2026 19:37:16 +0330 +Subject: [PATCH] Increase chardet upper limit to 7 + +Upstream-Status: Backport [https://github.com/psf/requests/commit/4bd79e397304d46dfccd76f36c07f66c0295ff82] +--- + src/requests/__init__.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/requests/__init__.py b/src/requests/__init__.py +index 051cda13..9a80c625 100644 +--- a/src/requests/__init__.py ++++ b/src/requests/__init__.py +@@ -76,7 +76,7 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver + major, minor, patch = chardet_version.split(".")[:3] + major, minor, patch = int(major), int(minor), int(patch) + # chardet_version >= 3.0.2, < 6.0.0 +- assert (3, 0, 2) <= (major, minor, patch) < (6, 0, 0) ++ assert (3, 0, 2) <= (major, minor, patch) < (7, 0, 0) + elif charset_normalizer_version: + major, minor, patch = charset_normalizer_version.split(".")[:3] + major, minor, patch = int(major), int(minor), int(patch) +-- +2.44.4 +meta/recipes-devtools/python/python3-requests_2.32.5.bb +1
-1@@ -8,6 +8,7 @@ inherit pypi python_setuptools_build_meta SRC_URI[sha256sum] = "dbba0bac56e100853db0ea71b82b4dfd5fe2bf6d3754a8893c3af500cec7d7cf" SRC_URI += "file://CVE-2026-25645.patch" +SRC_URI += "file://0001-Increase-chardet-upper-limit-to-7.patch" SRC_URI:append:class-nativesdk = " file://environment.d-python3-requests.sh" do_install:append:class-nativesdk() { -=-=-=-=-=-=-=-=-=-=-=-Links: You receive all messages sent to this group.
View/Reply Online (#236176): https://lists.openembedded.org/g/openembedded-core/message/236176
Mute This Topic: https://lists.openembedded.org/mt/119084300/924729
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-