From patchwork Fri Dec 15 14:17:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 36413 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3DB4C4828A for ; Fri, 15 Dec 2023 14:17:52 +0000 (UTC) Received: from a27-29.smtp-out.us-west-2.amazonses.com (a27-29.smtp-out.us-west-2.amazonses.com [54.240.27.29]) by mx.groups.io with SMTP id smtpd.web10.63135.1702649863174295430 for ; Fri, 15 Dec 2023 06:17:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=JlaHuWDV; dkim=pass header.i=@amazonses.com header.s=hsbnp7p3ensaochzwyq5wwmceodymuwv header.b=hGybMaId; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.29, mailfrom: 0101018c6dd71990-4bad35e6-efd6-493f-8400-699b91694e1a-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky; d=yoctoproject.org; t=1702649862; h=Content-Type:MIME-Version:From:To:Subject:Message-Id:Date; bh=7ZPpZfJc0oyqweFmEhgl0ge3r7KlcN1voWS2a6G4WNk=; b=JlaHuWDV+IoLC0BpkxRjsxZwrP/3nh4tNHmzb4FeHUTc3suy4co9lXsQF1q1Axso fNZpUfaFwVLsj00RDikrmqhNCFBKx5eLGJ9nXxA1icxUeqsiSLQiP7FvVfpqij4QhNW 1gM9IV1RCkYEnFoijosDD8Ty9gpWM+iL9IDYOTCk= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1702649862; h=Content-Type:MIME-Version:From:To:Subject:Message-Id:Date:Feedback-ID; bh=7ZPpZfJc0oyqweFmEhgl0ge3r7KlcN1voWS2a6G4WNk=; b=hGybMaIdUZzlbgo2TyETCUB8IRE4NDui3WyO/c06KURZhIsch/hpDN+E02jlWgxX BEeAaU1ytEKBnObjlzIpmXbgo0w+NcMu/0qLsVbJVR3Lb0vwvJ9F+3Jte/PAX8DMXiL wBzuoF4+42zI5SFCv6wvnc0rkO8JT71sGrFOmeD0= MIME-Version: 1.0 From: auh@yoctoproject.org To: openembedded-core@lists.openembedded.org Subject: [AUH] dpkg: upgrading to 1.22.1 SUCCEEDED Message-ID: <0101018c6dd71990-4bad35e6-efd6-493f-8400-699b91694e1a-000000@us-west-2.amazonses.com> Date: Fri, 15 Dec 2023 14:17:42 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2023.12.15-54.240.27.29 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 15 Dec 2023 14:17:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/192446 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *dpkg* to *1.22.1* has Succeeded. Next steps: - apply the patch: git am 0001-dpkg-upgrade-1.22.0-1.22.1.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 7c1ec193bcb33b5214a607e4c40b6de180133736 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Fri, 15 Dec 2023 06:40:55 +0000 Subject: [PATCH] dpkg: upgrade 1.22.0 -> 1.22.1 --- .../0001-Add-support-for-riscv32-CPU.patch | 14 ++++++-------- ...uild.c-ignore-return-of-1-from-tar-cf.patch | 4 ++-- .../dpkg/0001-dpkg-Support-muslx32-build.patch | 14 ++++++-------- ...wrs-kernel-version-which-has-characte.patch | 11 +++++------ ...ts-expect-D-to-be-set-when-running-in.patch | 4 ++-- ...ction-doesn-t-work-properly-for-all-s.patch | 13 +++++-------- ...-add-musleabi-to-known-target-tripets.patch | 17 +++++++++-------- ....c-Remove-usage-of-clamp-mtime-in-tar.patch | 11 ++++++----- .../dpkg/dpkg/add_armeb_triplet_entry.patch | 18 ++++++++++-------- meta/recipes-devtools/dpkg/dpkg/arch_pm.patch | 11 +++++++---- meta/recipes-devtools/dpkg/dpkg/noman.patch | 10 ++++++---- meta/recipes-devtools/dpkg/dpkg/pager.patch | 12 ++++++++++-- .../dpkg/dpkg/remove-tar-no-timestamp.patch | 14 ++++++++------ .../dpkg/{dpkg_1.22.0.bb => dpkg_1.22.1.bb} | 2 +- 14 files changed, 83 insertions(+), 72 deletions(-) rename meta/recipes-devtools/dpkg/{dpkg_1.22.0.bb => dpkg_1.22.1.bb} (95%) diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch b/meta/recipes-devtools/dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch index 52e85705fa..70079420e3 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch @@ -1,20 +1,21 @@ -From 279e4c274f5f295823cf9fa95d3ba131f6d711db Mon Sep 17 00:00:00 2001 +From 068e1c1f58dfc6e127bac84b478ce20b3a21cfbe Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 29 Apr 2020 22:02:23 -0700 Subject: [PATCH] Add support for riscv32 CPU Upstream-Status: Pending Signed-off-by: Khem Raj + --- data/cputable | 1 + scripts/Dpkg/Vendor/Debian.pm | 1 + 2 files changed, 2 insertions(+) diff --git a/data/cputable b/data/cputable -index 9f2a8e0..1d935b1 100644 +index 575c008e3..7a801a03a 100644 --- a/data/cputable +++ b/data/cputable -@@ -41,6 +41,7 @@ powerpc powerpc (powerpc|ppc) 32 big +@@ -43,6 +43,7 @@ powerpc powerpc (powerpc|ppc) 32 big powerpcel powerpcle powerpcle 32 little ppc64 powerpc64 (powerpc|ppc)64 64 big ppc64el powerpc64le powerpc64le 64 little @@ -23,10 +24,10 @@ index 9f2a8e0..1d935b1 100644 s390 s390 s390 32 big s390x s390x s390x 64 big diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm -index a352bbd..fa1d90b 100644 +index dcc3cc124..89c9b41c1 100644 --- a/scripts/Dpkg/Vendor/Debian.pm +++ b/scripts/Dpkg/Vendor/Debian.pm -@@ -306,6 +306,7 @@ sub _add_build_flags { +@@ -200,6 +200,7 @@ sub set_build_features { powerpc ppc64 ppc64el @@ -34,6 +35,3 @@ index a352bbd..fa1d90b 100644 riscv64 s390x sparc --- -2.26.2 - diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch b/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch index f2367c95e9..6c66fdf565 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch @@ -1,4 +1,4 @@ -From e3ade3464b8a1129a55c2790cf114d9ae01e3cda Mon Sep 17 00:00:00 2001 +From 8a923b9dfae57fc9b2cab656324c739e8afb9d36 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 16 Jun 2020 03:57:25 +0000 Subject: [PATCH] build.c: ignore return of 1 from tar -cf @@ -29,7 +29,7 @@ Signed-off-by: Paul Eggleton 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/deb/build.c b/src/deb/build.c -index 76613adec..7c216d1a9 100644 +index 5da771924..7779706db 100644 --- a/src/deb/build.c +++ b/src/deb/build.c @@ -482,6 +482,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch b/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch index d66ab4476a..ebae69b88a 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch @@ -1,4 +1,4 @@ -From a328c8bec0bf8071ae8f20fee4c7475205064ba1 Mon Sep 17 00:00:00 2001 +From 91bc4c20f1684d2e860f3c8f43892623399b45ec Mon Sep 17 00:00:00 2001 From: sweeaun Date: Sun, 10 Sep 2017 00:14:15 -0700 Subject: [PATCH] dpkg: Support muslx32 build @@ -7,16 +7,17 @@ Upstream-Status: Pending Changes made on ostable and tupletable to enable muslx32 build. Signed-off-by: sweeaun + --- data/ostable | 1 + data/tupletable | 1 + 2 files changed, 2 insertions(+) diff --git a/data/ostable b/data/ostable -index be64342..87db273 100644 +index ee823ab4b..c81bdb26a 100644 --- a/data/ostable +++ b/data/ostable -@@ -19,6 +19,7 @@ base-uclibc-linux linux-uclibc linux[^-]*-uclibc +@@ -21,6 +21,7 @@ base-uclibc-linux linux-uclibc linux[^-]*-uclibc eabihf-musl-linux linux-musleabihf linux[^-]*-musleabihf eabi-musl-linux linux-musleabi linux[^-]*-musleabi base-musl-linux linux-musl linux[^-]*-musl @@ -25,10 +26,10 @@ index be64342..87db273 100644 eabi-gnu-linux linux-gnueabi linux[^-]*-gnueabi abin32-gnu-linux linux-gnuabin32 linux[^-]*-gnuabin32 diff --git a/data/tupletable b/data/tupletable -index 28f00bf..748ffab 100644 +index 0ebf56d1f..93eca571a 100644 --- a/data/tupletable +++ b/data/tupletable -@@ -10,6 +10,7 @@ base-uclibc-linux- uclibc-linux- +@@ -25,6 +25,7 @@ base-uclibc-linux- uclibc-linux- eabihf-musl-linux-arm musl-linux-armhf eabi-musl-linux-arm musl-linux-armel base-musl-linux- musl-linux- @@ -36,6 +37,3 @@ index 28f00bf..748ffab 100644 ilp32-gnu-linux-arm64 arm64ilp32 eabihf-gnu-linux-arm armhf eabi-gnu-linux-arm armel --- -2.7.4 - 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 ef5f7c3ec3..2b7ae95c6a 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 @@ -1,13 +1,14 @@ -From b4ea54158c399874e12394ebc91afe98954695e2 Mon Sep 17 00:00:00 2001 +From ae9d60a26095c8b14c146d81269a172e7ed631df Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 26 Aug 2015 16:16:16 +0300 -Subject: [PATCH 2/5] Adapt to linux-wrs kernel version, which has character - '_' inside. Remove the first-char-digit-check (as the 1.15.8.5 version does). +Subject: [PATCH] Adapt to linux-wrs kernel version, which has character '_' + inside. Remove the first-char-digit-check (as the 1.15.8.5 version does). Signed-off-by: Dongxiao Xu Signed-off-by: Constantin Musca Upstream-Status: Inappropriate [embedded specific] + --- lib/dpkg/parsehelp.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) @@ -32,6 +33,4 @@ index 63a36f55c..81901bd5a 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/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch b/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch index bd4d5d5353..6278ef5814 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch @@ -1,4 +1,4 @@ -From ff325b35639a797edd92b373fbebf7b8b9f3f0c3 Mon Sep 17 00:00:00 2001 +From c8b32d312cc9edd7bf71a2e508615c84c439968b Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 26 Aug 2015 16:25:45 +0300 Subject: [PATCH] Our pre/postinsts expect $D to be set when running in a @@ -17,7 +17,7 @@ KKang 2019/02/20 1 file changed, 3 insertions(+), 50 deletions(-) diff --git a/src/main/script.c b/src/main/script.c -index ecce4d842..16f4e6ff5 100644 +index b4f369dfa..559a49cc5 100644 --- a/src/main/script.c +++ b/src/main/script.c @@ -97,58 +97,11 @@ static const char * diff --git a/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch b/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch index bbd5aba418..5a0c4fd661 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch @@ -1,21 +1,21 @@ -From adb6bfd0feeceaf030df0debe3343d7f73e708a0 Mon Sep 17 00:00:00 2001 +From 6c589481119226d5804d2f8d871d71066636f9b0 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 26 Aug 2015 16:27:45 +0300 -Subject: [PATCH 4/5] The lutimes function doesn't work properly for all - systems. +Subject: [PATCH] The lutimes function doesn't work properly for all systems. Signed-off-by: Constantin Musca Upstream-Status: Inappropriate [embedded specific] + --- src/main/archives.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/archives.c b/src/main/archives.c -index 92340b9..7a55c27 100644 +index d91cb81b8..3503cf56e 100644 --- a/src/main/archives.c +++ b/src/main/archives.c -@@ -490,8 +490,9 @@ tarobject_set_mtime(struct tar_entry *te, const char *path) +@@ -487,8 +487,9 @@ tarobject_set_mtime(struct tar_entry *te, const char *path) if (te->type == TAR_FILETYPE_SYMLINK) { #ifdef HAVE_LUTIMES @@ -26,6 +26,3 @@ index 92340b9..7a55c27 100644 #endif } else { if (utimes(path, tv)) --- -2.25.1 - diff --git a/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch b/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch index 8797ea55c6..c21b3d630c 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch @@ -1,23 +1,27 @@ -From f8910022dc3ec622272f168cd0022dbdf6dff93a Mon Sep 17 00:00:00 2001 +From e314eaa6ac40d3ee41af960b18b741c2c738324e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 30 Dec 2015 23:05:41 +0000 Subject: [PATCH] add musleabi to known target tripets +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit helps compiling dpkg for musl/arm-softfloat Upstream-Status: Pending Signed-off-by: Khem Raj Signed-off-by: Aníbal Limón + --- data/ostable | 1 + data/tupletable | 1 + 2 files changed, 2 insertions(+) diff --git a/data/ostable b/data/ostable -index 99c1f889d..be6434271 100644 +index 7fd2bff08..ee823ab4b 100644 --- a/data/ostable +++ b/data/ostable -@@ -17,6 +17,7 @@ +@@ -19,6 +19,7 @@ eabi-uclibc-linux linux-uclibceabi linux[^-]*-uclibceabi base-uclibc-linux linux-uclibc linux[^-]*-uclibc eabihf-musl-linux linux-musleabihf linux[^-]*-musleabihf @@ -26,10 +30,10 @@ index 99c1f889d..be6434271 100644 eabihf-gnu-linux linux-gnueabihf linux[^-]*-gnueabihf eabi-gnu-linux linux-gnueabi linux[^-]*-gnueabi diff --git a/data/tupletable b/data/tupletable -index 5f500f6ca..28f00bfe6 100644 +index 071480f50..0ebf56d1f 100644 --- a/data/tupletable +++ b/data/tupletable -@@ -8,6 +8,7 @@ +@@ -23,6 +23,7 @@ eabi-uclibc-linux-arm uclibc-linux-armel base-uclibc-linux- uclibc-linux- eabihf-musl-linux-arm musl-linux-armhf @@ -37,6 +41,3 @@ index 5f500f6ca..28f00bfe6 100644 base-musl-linux- musl-linux- ilp32-gnu-linux-arm64 arm64ilp32 eabihf-gnu-linux-arm armhf --- -2.11.0 - diff --git a/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch b/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch index 117f9234ad..fbd87c2356 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch @@ -1,7 +1,10 @@ -From 8659eeeeda74d71e12080121f0b13a88cbdda433 Mon Sep 17 00:00:00 2001 +From 52ab2951c2d236544c2f19d869ffa29a34d93417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= Date: Tue, 21 Feb 2017 11:23:27 -0600 Subject: [PATCH] dpkg-deb/build.c: Remove usage of --clamp-mtime in tar +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Recently dpkg added --clamp-mtime to tar to create reproducible build tarballs [1]. @@ -19,12 +22,13 @@ Upstream-Status: Inappropriate [Configuration] Update patch context for dpkg 1.19.4. Signed-off-by: Kai Kang + --- src/deb/build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/deb/build.c b/src/deb/build.c -index 5c74ff3..76613ad 100644 +index 597872ba2..5da771924 100644 --- a/src/deb/build.c +++ b/src/deb/build.c @@ -505,7 +505,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, @@ -36,6 +40,3 @@ index 5c74ff3..76613ad 100644 /* Mode might become a positional argument, pass it before -T. */ if (options->mode) command_add_args(&cmd, "--mode", options->mode, NULL); --- -2.25.1 - diff --git a/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch b/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch index d165616a19..ea52ea8288 100644 --- a/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch +++ b/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch @@ -1,5 +1,11 @@ -Author: Krishnanjanappa, Jagadeesh -Date: Wed Apr 8 18:08:14 2015 +0530 +From f39e1175f2b159e13741b0416502ae4c18b45c38 Mon Sep 17 00:00:00 2001 +From: "Krishnanjanappa, Jagadeesh" + +Date: Wed, 8 Apr 2015 18:08:14 +0530 +Subject: [PATCH] dpkg: add triplet entry to fix build error for armeb +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit [PATCH] add armeb triplet entry into triplettable. @@ -31,10 +37,10 @@ Signed-off-by: Aníbal Limón 1 file changed, 1 insertion(+) diff --git a/data/tupletable b/data/tupletable -index b7802bec3..5f500f6ca 100644 +index a7a878f5b..071480f50 100644 --- a/data/tupletable +++ b/data/tupletable -@@ -12,6 +12,7 @@ base-musl-linux- musl-linux- +@@ -27,6 +27,7 @@ base-musl-linux- musl-linux- ilp32-gnu-linux-arm64 arm64ilp32 eabihf-gnu-linux-arm armhf eabi-gnu-linux-arm armel @@ -42,7 +48,3 @@ index b7802bec3..5f500f6ca 100644 abin32-gnu-linux-mips64r6el mipsn32r6el abin32-gnu-linux-mips64r6 mipsn32r6 abin32-gnu-linux-mips64el mipsn32el --- -2.11.0 - - diff --git a/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch b/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch index 4e0d22acbb..a19dbf8af5 100644 --- a/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch +++ b/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch @@ -1,3 +1,8 @@ +From ccb18e1032072acfc9456c8d96e4ae1f7b72c146 Mon Sep 17 00:00:00 2001 +From: Joe Slater +Date: Mon, 26 Aug 2013 23:38:45 +0000 +Subject: [PATCH] dpkg: fix configuration issue for mips64 + configure cannot determine the proper cpu, os, or architecture for mips64, and possibly other arch's because of faulty code added to Arch.pm in the latest @@ -12,10 +17,10 @@ Signed-off-by: Joe Slater 1 file changed, 3 deletions(-) diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm -index 1720847b8..6345ce3b9 100644 +index 0d352eeb9..4ef5fa307 100644 --- a/scripts/Dpkg/Arch.pm +++ b/scripts/Dpkg/Arch.pm -@@ -323,9 +323,6 @@ sub _load_tupletable() +@@ -326,9 +326,6 @@ sub _load_tupletable() (my $dt = $debtuple) =~ s//$_cpu/; (my $da = $debarch) =~ s//$_cpu/; @@ -25,5 +30,3 @@ index 1720847b8..6345ce3b9 100644 $debarch_to_debtuple{$da} = $dt; $debtuple_to_debarch{$dt} = $da; } --- -2.11.0 diff --git a/meta/recipes-devtools/dpkg/dpkg/noman.patch b/meta/recipes-devtools/dpkg/dpkg/noman.patch index 6900716b11..4c7c17d8c9 100644 --- a/meta/recipes-devtools/dpkg/dpkg/noman.patch +++ b/meta/recipes-devtools/dpkg/dpkg/noman.patch @@ -1,3 +1,8 @@ +From d253b68a07efca2edaa3eb26b183bc4844317b08 Mon Sep 17 00:00:00 2001 +From: Chris Larson +Date: Tue, 5 Sep 2006 07:24:58 +0000 +Subject: [PATCH] Add dpkg, modified from upstream oe. + Upstream-Status: Inappropriate [disable feature] --- @@ -5,7 +10,7 @@ Upstream-Status: Inappropriate [disable feature] 1 file changed, 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index d963a10..7cef7f5 100644 +index daafc44cf..e77f840af 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,6 @@ SUBDIRS = \ @@ -16,6 +21,3 @@ index d963a10..7cef7f5 100644 # EOL ACLOCAL_AMFLAGS = -I m4 --- -2.25.1 - diff --git a/meta/recipes-devtools/dpkg/dpkg/pager.patch b/meta/recipes-devtools/dpkg/dpkg/pager.patch index e56b9d28af..42aee763d2 100644 --- a/meta/recipes-devtools/dpkg/dpkg/pager.patch +++ b/meta/recipes-devtools/dpkg/dpkg/pager.patch @@ -1,4 +1,7 @@ -pager: Use less instead of pager +From 925431e7cb4a3f595cb9f5bb6d2afe6da841be7d Mon Sep 17 00:00:00 2001 +From: Ricardo Ribalda +Date: Wed, 19 Jun 2019 13:21:53 +0200 +Subject: [PATCH] pager: Use less instead of pager pager is a Debianism. Istead use directly pager. @@ -6,8 +9,13 @@ Upstream-Status: Inappropriate [OE-Core integration specific] Suggested-by: Burton, Ross Signed-off-by: Ricardo Ribalda + +--- + lib/dpkg/dpkg.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/lib/dpkg/dpkg.h b/lib/dpkg/dpkg.h -index 2bb067a..6cbce80 100644 +index d2389a1eb..f65ca4852 100644 --- a/lib/dpkg/dpkg.h +++ b/lib/dpkg/dpkg.h @@ -95,7 +95,7 @@ DPKG_BEGIN_DECLS diff --git a/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch b/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch index ebf838ffe9..b5a04df90b 100644 --- a/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch +++ b/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch @@ -1,17 +1,22 @@ -busybox-1.19.4 tar utility doesn't support --warning=no-timestamp +From a50774797e5da2cbc2ce45a35ef07061ce4b6c48 Mon Sep 17 00:00:00 2001 +From: Constantin Musca +Date: Tue, 28 Aug 2012 17:02:40 +0300 +Subject: [PATCH] busybox-1.19.4 tar utility doesn't support + --warning=no-timestamp Signed-off-by: Constantin Musca Upstream-Status: Inappropriate [configuration] + --- src/deb/extract.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/deb/extract.c b/src/deb/extract.c -index a1b2dc0..95e2372 100644 +index 5bad48597..d49606816 100644 --- a/src/deb/extract.c +++ b/src/deb/extract.c -@@ -333,7 +333,6 @@ extracthalf(const char *debar, const char *dir, +@@ -338,7 +338,6 @@ extracthalf(const char *debar, const char *dir, command_add_arg(&cmd, "-f"); command_add_arg(&cmd, "-"); @@ -19,6 +24,3 @@ index a1b2dc0..95e2372 100644 m_dup2(p2[0],0); close(p2[0]); --- -2.25.1 - diff --git a/meta/recipes-devtools/dpkg/dpkg_1.22.0.bb b/meta/recipes-devtools/dpkg/dpkg_1.22.1.bb similarity index 95% rename from meta/recipes-devtools/dpkg/dpkg_1.22.0.bb rename to meta/recipes-devtools/dpkg/dpkg_1.22.1.bb index 7eaae9f22e..a56d0871a6 100644 --- a/meta/recipes-devtools/dpkg/dpkg_1.22.0.bb +++ b/meta/recipes-devtools/dpkg/dpkg_1.22.1.bb @@ -18,6 +18,6 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=main SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" -SRCREV = "744487c98a622b9b38c22c6ca330315af4a30a11" +SRCREV = "34451fab061f2c19fed6337f48a7949fc1eb57dd" S = "${WORKDIR}/git"