From e2d82c3691fe932360b9af21a023b6460f815132 Mon Sep 17 00:00:00 2001 From: Sudip Mukherjee Date: Sat, 2 Sep 2023 14:10:06 +0100 Subject: dpkg: upgrade to v1.22.0 Changes: Use main branch Rebase patch (From OE-Core rev: 7620c855b77937b664b18f6aae29541f883a81f0) Signed-off-by: Sudip Mukherjee Signed-off-by: Richard Purdie --- ...nux-wrs-kernel-version-which-has-characte.patch | 7 +++---- meta/recipes-devtools/dpkg/dpkg_1.21.22.bb | 23 ---------------------- meta/recipes-devtools/dpkg/dpkg_1.22.0.bb | 23 ++++++++++++++++++++++ 3 files changed, 26 insertions(+), 27 deletions(-) delete mode 100644 meta/recipes-devtools/dpkg/dpkg_1.21.22.bb create mode 100644 meta/recipes-devtools/dpkg/dpkg_1.22.0.bb (limited to 'meta/recipes-devtools/dpkg') diff --git a/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch b/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch index 9fe0ca7600..ef5f7c3ec3 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch @@ -13,14 +13,14 @@ Upstream-Status: Inappropriate [embedded specific] 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/dpkg/parsehelp.c b/lib/dpkg/parsehelp.c -index 453077fd9..f42ea2882 100644 +index 63a36f55c..81901bd5a 100644 --- a/lib/dpkg/parsehelp.c +++ b/lib/dpkg/parsehelp.c -@@ -243,14 +243,12 @@ parseversion(struct dpkg_version *rversion, const char *string, +@@ -275,14 +275,12 @@ parseversion(struct dpkg_version *rversion, const char *string, ptr = rversion->version; if (!*ptr) return dpkg_put_error(err, _("version number is empty")); -- if (*ptr && !c_isdigit(*ptr++)) +- if (!c_isdigit(*ptr++)) - return dpkg_put_warn(err, _("version number does not start with digit")); for (; *ptr; ptr++) { - if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".-+~:", *ptr) == NULL) @@ -32,7 +32,6 @@ index 453077fd9..f42ea2882 100644 + if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".-+~_", *ptr) == NULL) return dpkg_put_warn(err, _("invalid character in revision number")); } - -- 2.11.0 diff --git a/meta/recipes-devtools/dpkg/dpkg_1.21.22.bb b/meta/recipes-devtools/dpkg/dpkg_1.21.22.bb deleted file mode 100644 index 04bcc93321..0000000000 --- a/meta/recipes-devtools/dpkg/dpkg_1.21.22.bb +++ /dev/null @@ -1,23 +0,0 @@ -require dpkg.inc -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=1.21.x \ - file://noman.patch \ - file://remove-tar-no-timestamp.patch \ - file://arch_pm.patch \ - file://add_armeb_triplet_entry.patch \ - file://0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch \ - file://0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch \ - file://0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch \ - file://0006-add-musleabi-to-known-target-tripets.patch \ - file://0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch \ - file://0001-dpkg-Support-muslx32-build.patch \ - file://pager.patch \ - file://0001-Add-support-for-riscv32-CPU.patch \ - " - -SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" - -SRCREV = "48482e4f16467e05a08aa3b3b8048e08f0024609" - -S = "${WORKDIR}/git" diff --git a/meta/recipes-devtools/dpkg/dpkg_1.22.0.bb b/meta/recipes-devtools/dpkg/dpkg_1.22.0.bb new file mode 100644 index 0000000000..7eaae9f22e --- /dev/null +++ b/meta/recipes-devtools/dpkg/dpkg_1.22.0.bb @@ -0,0 +1,23 @@ +require dpkg.inc +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=main \ + file://noman.patch \ + file://remove-tar-no-timestamp.patch \ + file://arch_pm.patch \ + file://add_armeb_triplet_entry.patch \ + file://0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch \ + file://0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch \ + file://0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch \ + file://0006-add-musleabi-to-known-target-tripets.patch \ + file://0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch \ + file://0001-dpkg-Support-muslx32-build.patch \ + file://pager.patch \ + file://0001-Add-support-for-riscv32-CPU.patch \ + " + +SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" + +SRCREV = "744487c98a622b9b38c22c6ca330315af4a30a11" + +S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf