summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2024-03-13 18:33:20 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-04-16 08:07:01 +0100
commit1cfb2dc0def0eb5cd5698262a0a2e1c060ac4d00 (patch)
tree50a1296c180f4a8f3ba47e69634d8c31b95e99f7 /meta/recipes-devtools
parente427d9741100752921b6fc55c3f23a57bf64becb (diff)
downloadpoky-1cfb2dc0def0eb5cd5698262a0a2e1c060ac4d00.tar.gz
dpkg: update 1.22.0 -> 1.22.5
Drop pager.patch as macros removed upstream. (From OE-Core rev: 63df660741742baf527647d3036b6d3414869c4f) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/dpkg/dpkg.inc2
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch13
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch9
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch15
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch10
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch5
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch12
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch18
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch12
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch21
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/arch_pm.patch12
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/noman.patch11
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/pager.patch21
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch13
-rw-r--r--meta/recipes-devtools/dpkg/dpkg_1.22.5.bb (renamed from meta/recipes-devtools/dpkg/dpkg_1.22.0.bb)3
15 files changed, 73 insertions, 104 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index b3e8c05d62..4c1d42e0af 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -11,7 +11,7 @@ RDEPENDS:${PN}:class-native = ""
11 11
12UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" 12UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
13 13
14inherit autotools gettext perlnative pkgconfig perl-version update-alternatives 14inherit autotools gettext perlnative pkgconfig perl-version update-alternatives bash-completion
15 15
16PERL:class-native = "${STAGING_BINDIR_NATIVE}/perl-native/perl" 16PERL:class-native = "${STAGING_BINDIR_NATIVE}/perl-native/perl"
17 17
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..b8a8697585 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,4 +1,4 @@
1From 279e4c274f5f295823cf9fa95d3ba131f6d711db Mon Sep 17 00:00:00 2001 1From 21459bb8d9a997e6a92885a4ef337ede9cc5aba7 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 29 Apr 2020 22:02:23 -0700 3Date: Wed, 29 Apr 2020 22:02:23 -0700
4Subject: [PATCH] Add support for riscv32 CPU 4Subject: [PATCH] Add support for riscv32 CPU
@@ -11,10 +11,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
11 2 files changed, 2 insertions(+) 11 2 files changed, 2 insertions(+)
12 12
13diff --git a/data/cputable b/data/cputable 13diff --git a/data/cputable b/data/cputable
14index 9f2a8e0..1d935b1 100644 14index 575c008e3..7a801a03a 100644
15--- a/data/cputable 15--- a/data/cputable
16+++ b/data/cputable 16+++ b/data/cputable
17@@ -41,6 +41,7 @@ powerpc powerpc (powerpc|ppc) 32 big 17@@ -43,6 +43,7 @@ powerpc powerpc (powerpc|ppc) 32 big
18 powerpcel powerpcle powerpcle 32 little 18 powerpcel powerpcle powerpcle 32 little
19 ppc64 powerpc64 (powerpc|ppc)64 64 big 19 ppc64 powerpc64 (powerpc|ppc)64 64 big
20 ppc64el powerpc64le powerpc64le 64 little 20 ppc64el powerpc64le powerpc64le 64 little
@@ -23,10 +23,10 @@ index 9f2a8e0..1d935b1 100644
23 s390 s390 s390 32 big 23 s390 s390 s390 32 big
24 s390x s390x s390x 64 big 24 s390x s390x s390x 64 big
25diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm 25diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
26index a352bbd..fa1d90b 100644 26index fcf5b1e2a..175c9f436 100644
27--- a/scripts/Dpkg/Vendor/Debian.pm 27--- a/scripts/Dpkg/Vendor/Debian.pm
28+++ b/scripts/Dpkg/Vendor/Debian.pm 28+++ b/scripts/Dpkg/Vendor/Debian.pm
29@@ -306,6 +306,7 @@ sub _add_build_flags { 29@@ -202,6 +202,7 @@ sub set_build_features {
30 powerpc 30 powerpc
31 ppc64 31 ppc64
32 ppc64el 32 ppc64el
@@ -34,6 +34,3 @@ index a352bbd..fa1d90b 100644
34 riscv64 34 riscv64
35 s390x 35 s390x
36 sparc 36 sparc
37--
382.26.2
39
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..95a49053e8 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 @@
1From e3ade3464b8a1129a55c2790cf114d9ae01e3cda Mon Sep 17 00:00:00 2001 1From 4c5e6c280a2ab4d2009d3264e94286f5fe244d0b Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.microsoft.com> 2From: Paul Eggleton <paul.eggleton@linux.microsoft.com>
3Date: Tue, 16 Jun 2020 03:57:25 +0000 3Date: Tue, 16 Jun 2020 03:57:25 +0000
4Subject: [PATCH] build.c: ignore return of 1 from tar -cf 4Subject: [PATCH] build.c: ignore return of 1 from tar -cf
@@ -23,16 +23,15 @@ Upstream-Status: Inappropriate [OE specific]
23Original patch by RP 2015/3/27, rebased by Paul Eggleton 23Original patch by RP 2015/3/27, rebased by Paul Eggleton
24 24
25Signed-off-by: Paul Eggleton <paul.eggleton@microsoft.com> 25Signed-off-by: Paul Eggleton <paul.eggleton@microsoft.com>
26
27--- 26---
28 src/deb/build.c | 5 ++++- 27 src/deb/build.c | 5 ++++-
29 1 file changed, 4 insertions(+), 1 deletion(-) 28 1 file changed, 4 insertions(+), 1 deletion(-)
30 29
31diff --git a/src/deb/build.c b/src/deb/build.c 30diff --git a/src/deb/build.c b/src/deb/build.c
32index 76613adec..7c216d1a9 100644 31index 92aba9553..6436b33da 100644
33--- a/src/deb/build.c 32--- a/src/deb/build.c
34+++ b/src/deb/build.c 33+++ b/src/deb/build.c
35@@ -482,6 +482,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, 34@@ -481,6 +481,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
36 { 35 {
37 int pipe_filenames[2], pipe_tarball[2]; 36 int pipe_filenames[2], pipe_tarball[2];
38 pid_t pid_tar, pid_comp; 37 pid_t pid_tar, pid_comp;
@@ -40,7 +39,7 @@ index 76613adec..7c216d1a9 100644
40 39
41 /* Fork off a tar. We will feed it a list of filenames on stdin later. */ 40 /* Fork off a tar. We will feed it a list of filenames on stdin later. */
42 m_pipe(pipe_filenames); 41 m_pipe(pipe_filenames);
43@@ -534,7 +535,9 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, 42@@ -533,7 +534,9 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
44 /* All done, clean up wait for tar and <compress> to finish their job. */ 43 /* All done, clean up wait for tar and <compress> to finish their job. */
45 close(pipe_filenames[1]); 44 close(pipe_filenames[1]);
46 subproc_reap(pid_comp, _("<compress> from tar -cf"), 0); 45 subproc_reap(pid_comp, _("<compress> from tar -cf"), 0);
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..e8d8576f85 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 @@
1From a328c8bec0bf8071ae8f20fee4c7475205064ba1 Mon Sep 17 00:00:00 2001 1From 1d192b60fc43e24e1c2d6ff452dabeee7a227cc0 Mon Sep 17 00:00:00 2001
2From: sweeaun <swee.aun.khor@intel.com> 2From: sweeaun <swee.aun.khor@intel.com>
3Date: Sun, 10 Sep 2017 00:14:15 -0700 3Date: Sun, 10 Sep 2017 00:14:15 -0700
4Subject: [PATCH] dpkg: Support muslx32 build 4Subject: [PATCH] dpkg: Support muslx32 build
@@ -13,10 +13,10 @@ Signed-off-by: sweeaun <swee.aun.khor@intel.com>
13 2 files changed, 2 insertions(+) 13 2 files changed, 2 insertions(+)
14 14
15diff --git a/data/ostable b/data/ostable 15diff --git a/data/ostable b/data/ostable
16index be64342..87db273 100644 16index 860355774..28779beca 100644
17--- a/data/ostable 17--- a/data/ostable
18+++ b/data/ostable 18+++ b/data/ostable
19@@ -19,6 +19,7 @@ base-uclibc-linux linux-uclibc linux[^-]*-uclibc 19@@ -21,6 +21,7 @@ base-uclibc-linux linux-uclibc linux[^-]*-uclibc
20 eabihf-musl-linux linux-musleabihf linux[^-]*-musleabihf 20 eabihf-musl-linux linux-musleabihf linux[^-]*-musleabihf
21 eabi-musl-linux linux-musleabi linux[^-]*-musleabi 21 eabi-musl-linux linux-musleabi linux[^-]*-musleabi
22 base-musl-linux linux-musl linux[^-]*-musl 22 base-musl-linux linux-musl linux[^-]*-musl
@@ -25,17 +25,14 @@ index be64342..87db273 100644
25 eabi-gnu-linux linux-gnueabi linux[^-]*-gnueabi 25 eabi-gnu-linux linux-gnueabi linux[^-]*-gnueabi
26 abin32-gnu-linux linux-gnuabin32 linux[^-]*-gnuabin32 26 abin32-gnu-linux linux-gnuabin32 linux[^-]*-gnuabin32
27diff --git a/data/tupletable b/data/tupletable 27diff --git a/data/tupletable b/data/tupletable
28index 28f00bf..748ffab 100644 28index 82ae3604e..707d85bdb 100644
29--- a/data/tupletable 29--- a/data/tupletable
30+++ b/data/tupletable 30+++ b/data/tupletable
31@@ -10,6 +10,7 @@ base-uclibc-linux-<cpu> uclibc-linux-<cpu> 31@@ -26,6 +26,7 @@ base-uclibc-linux-<cpu> uclibc-linux-<cpu>
32 eabihf-musl-linux-arm musl-linux-armhf 32 eabihf-musl-linux-arm musl-linux-armhf
33 eabi-musl-linux-arm musl-linux-armel 33 eabi-musl-linux-arm musl-linux-armel
34 base-musl-linux-<cpu> musl-linux-<cpu> 34 base-musl-linux-<cpu> musl-linux-<cpu>
35+x32-musl-linux-amd64 x32 35+x32-musl-linux-amd64 x32
36 ilp32-gnu-linux-arm64 arm64ilp32
37 eabihf-gnu-linux-arm armhf 36 eabihf-gnu-linux-arm armhf
38 eabi-gnu-linux-arm armel 37 eabi-gnu-linux-arm armel
39-- 38 eabi-gnu-linux-armeb armeb
402.7.4
41
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..fc097e5a66 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,8 +1,8 @@
1From b4ea54158c399874e12394ebc91afe98954695e2 Mon Sep 17 00:00:00 2001 1From 0cac67ce5920d6d0c9df4278bfa77da878a8a37a Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 26 Aug 2015 16:16:16 +0300 3Date: Wed, 26 Aug 2015 16:16:16 +0300
4Subject: [PATCH 2/5] Adapt to linux-wrs kernel version, which has character 4Subject: [PATCH] Adapt to linux-wrs kernel version, which has character '_'
5 '_' inside. Remove the first-char-digit-check (as the 1.15.8.5 version does). 5 inside. Remove the first-char-digit-check (as the 1.15.8.5 version does).
6 6
7Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> 7Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
8Signed-off-by: Constantin Musca <constantinx.musca@intel.com> 8Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
@@ -32,6 +32,4 @@ index 63a36f55c..81901bd5a 100644
32+ if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".-+~_", *ptr) == NULL) 32+ if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".-+~_", *ptr) == NULL)
33 return dpkg_put_warn(err, _("invalid character in revision number")); 33 return dpkg_put_warn(err, _("invalid character in revision number"));
34 } 34 }
35 35
36--
372.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..916c7dfb00 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 @@
1From ff325b35639a797edd92b373fbebf7b8b9f3f0c3 Mon Sep 17 00:00:00 2001 1From b6c28222276704a1e1a544983e38dfa2f3fb481a Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 26 Aug 2015 16:25:45 +0300 3Date: Wed, 26 Aug 2015 16:25:45 +0300
4Subject: [PATCH] Our pre/postinsts expect $D to be set when running in a 4Subject: [PATCH] Our pre/postinsts expect $D to be set when running in a
@@ -11,13 +11,12 @@ RP 2011/12/07
11ALIMON 2016/05/26 11ALIMON 2016/05/26
12ALIMON 2017/02/21 12ALIMON 2017/02/21
13KKang 2019/02/20 13KKang 2019/02/20
14
15--- 14---
16 src/main/script.c | 53 +++-------------------------------------------- 15 src/main/script.c | 53 +++--------------------------------------------
17 1 file changed, 3 insertions(+), 50 deletions(-) 16 1 file changed, 3 insertions(+), 50 deletions(-)
18 17
19diff --git a/src/main/script.c b/src/main/script.c 18diff --git a/src/main/script.c b/src/main/script.c
20index ecce4d842..16f4e6ff5 100644 19index 017d92efe..181e7c710 100644
21--- a/src/main/script.c 20--- a/src/main/script.c
22+++ b/src/main/script.c 21+++ b/src/main/script.c
23@@ -97,58 +97,11 @@ static const char * 22@@ -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..35c0c246f6 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,8 +1,7 @@
1From adb6bfd0feeceaf030df0debe3343d7f73e708a0 Mon Sep 17 00:00:00 2001 1From 80ad29d22f8ca4033a6a79a726580fee17bdade9 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 26 Aug 2015 16:27:45 +0300 3Date: Wed, 26 Aug 2015 16:27:45 +0300
4Subject: [PATCH 4/5] The lutimes function doesn't work properly for all 4Subject: [PATCH] The lutimes function doesn't work properly for all systems.
5 systems.
6 5
7Signed-off-by: Constantin Musca <constantinx.musca@intel.com> 6Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
8 7
@@ -12,10 +11,10 @@ Upstream-Status: Inappropriate [embedded specific]
12 1 file changed, 2 insertions(+), 1 deletion(-) 11 1 file changed, 2 insertions(+), 1 deletion(-)
13 12
14diff --git a/src/main/archives.c b/src/main/archives.c 13diff --git a/src/main/archives.c b/src/main/archives.c
15index 92340b9..7a55c27 100644 14index 7e399f922..ec3b6878f 100644
16--- a/src/main/archives.c 15--- a/src/main/archives.c
17+++ b/src/main/archives.c 16+++ b/src/main/archives.c
18@@ -490,8 +490,9 @@ tarobject_set_mtime(struct tar_entry *te, const char *path) 17@@ -491,8 +491,9 @@ tarobject_set_mtime(struct tar_entry *te, const char *path)
19 18
20 if (te->type == TAR_FILETYPE_SYMLINK) { 19 if (te->type == TAR_FILETYPE_SYMLINK) {
21 #ifdef HAVE_LUTIMES 20 #ifdef HAVE_LUTIMES
@@ -26,6 +25,3 @@ index 92340b9..7a55c27 100644
26 #endif 25 #endif
27 } else { 26 } else {
28 if (utimes(path, tv)) 27 if (utimes(path, tv))
29--
302.25.1
31
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..8ac646b1a1 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,7 +1,10 @@
1From f8910022dc3ec622272f168cd0022dbdf6dff93a Mon Sep 17 00:00:00 2001 1From 1c9e78dda91ba66fbd8fe02b66b6c603d08d3343 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 30 Dec 2015 23:05:41 +0000 3Date: Wed, 30 Dec 2015 23:05:41 +0000
4Subject: [PATCH] add musleabi to known target tripets 4Subject: [PATCH] add musleabi to known target tripets
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
5 8
6helps compiling dpkg for musl/arm-softfloat 9helps compiling dpkg for musl/arm-softfloat
7 10
@@ -14,10 +17,10 @@ Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
14 2 files changed, 2 insertions(+) 17 2 files changed, 2 insertions(+)
15 18
16diff --git a/data/ostable b/data/ostable 19diff --git a/data/ostable b/data/ostable
17index 99c1f889d..be6434271 100644 20index 64f424490..860355774 100644
18--- a/data/ostable 21--- a/data/ostable
19+++ b/data/ostable 22+++ b/data/ostable
20@@ -17,6 +17,7 @@ 23@@ -19,6 +19,7 @@
21 eabi-uclibc-linux linux-uclibceabi linux[^-]*-uclibceabi 24 eabi-uclibc-linux linux-uclibceabi linux[^-]*-uclibceabi
22 base-uclibc-linux linux-uclibc linux[^-]*-uclibc 25 base-uclibc-linux linux-uclibc linux[^-]*-uclibc
23 eabihf-musl-linux linux-musleabihf linux[^-]*-musleabihf 26 eabihf-musl-linux linux-musleabihf linux[^-]*-musleabihf
@@ -26,17 +29,14 @@ index 99c1f889d..be6434271 100644
26 eabihf-gnu-linux linux-gnueabihf linux[^-]*-gnueabihf 29 eabihf-gnu-linux linux-gnueabihf linux[^-]*-gnueabihf
27 eabi-gnu-linux linux-gnueabi linux[^-]*-gnueabi 30 eabi-gnu-linux linux-gnueabi linux[^-]*-gnueabi
28diff --git a/data/tupletable b/data/tupletable 31diff --git a/data/tupletable b/data/tupletable
29index 5f500f6ca..28f00bfe6 100644 32index 7436f8056..82ae3604e 100644
30--- a/data/tupletable 33--- a/data/tupletable
31+++ b/data/tupletable 34+++ b/data/tupletable
32@@ -8,6 +8,7 @@ 35@@ -24,6 +24,7 @@
33 eabi-uclibc-linux-arm uclibc-linux-armel 36 eabi-uclibc-linux-arm uclibc-linux-armel
34 base-uclibc-linux-<cpu> uclibc-linux-<cpu> 37 base-uclibc-linux-<cpu> uclibc-linux-<cpu>
35 eabihf-musl-linux-arm musl-linux-armhf 38 eabihf-musl-linux-arm musl-linux-armhf
36+eabi-musl-linux-arm musl-linux-armel 39+eabi-musl-linux-arm musl-linux-armel
37 base-musl-linux-<cpu> musl-linux-<cpu> 40 base-musl-linux-<cpu> musl-linux-<cpu>
38 ilp32-gnu-linux-arm64 arm64ilp32
39 eabihf-gnu-linux-arm armhf 41 eabihf-gnu-linux-arm armhf
40-- 42 eabi-gnu-linux-arm armel
412.11.0
42
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..3d3a4f0bb9 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 @@
1From 8659eeeeda74d71e12080121f0b13a88cbdda433 Mon Sep 17 00:00:00 2001 1From 6dd80236a91a505b5753bb74e5f1b47330d8b16b Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com> 2From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com>
3Date: Tue, 21 Feb 2017 11:23:27 -0600 3Date: Tue, 21 Feb 2017 11:23:27 -0600
4Subject: [PATCH] dpkg-deb/build.c: Remove usage of --clamp-mtime in tar 4Subject: [PATCH] dpkg-deb/build.c: Remove usage of --clamp-mtime in tar
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
5 8
6Recently dpkg added --clamp-mtime to tar to create reproducible 9Recently dpkg added --clamp-mtime to tar to create reproducible
7build tarballs [1]. 10build tarballs [1].
@@ -24,10 +27,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
24 1 file changed, 1 insertion(+), 1 deletion(-) 27 1 file changed, 1 insertion(+), 1 deletion(-)
25 28
26diff --git a/src/deb/build.c b/src/deb/build.c 29diff --git a/src/deb/build.c b/src/deb/build.c
27index 5c74ff3..76613ad 100644 30index 1f0c050ee..92aba9553 100644
28--- a/src/deb/build.c 31--- a/src/deb/build.c
29+++ b/src/deb/build.c 32+++ b/src/deb/build.c
30@@ -505,7 +505,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, 33@@ -504,7 +504,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
31 34
32 command_init(&cmd, TAR, "tar -cf"); 35 command_init(&cmd, TAR, "tar -cf");
33 command_add_args(&cmd, "tar", "-cf", "-", "--format=gnu", 36 command_add_args(&cmd, "tar", "-cf", "-", "--format=gnu",
@@ -36,6 +39,3 @@ index 5c74ff3..76613ad 100644
36 /* Mode might become a positional argument, pass it before -T. */ 39 /* Mode might become a positional argument, pass it before -T. */
37 if (options->mode) 40 if (options->mode)
38 command_add_args(&cmd, "--mode", options->mode, NULL); 41 command_add_args(&cmd, "--mode", options->mode, NULL);
39--
402.25.1
41
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..cbdf01dbd9 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 @@
1Author: Krishnanjanappa, Jagadeesh <jagadeesh.krishnanjanappa@caviumnetworks.com> 1From 1c3a109df54b6092fa85a1fe2b7771e3b959655f Mon Sep 17 00:00:00 2001
2Date: Wed Apr 8 18:08:14 2015 +0530 2From: "Krishnanjanappa, Jagadeesh"
3 <jagadeesh.krishnanjanappa@caviumnetworks.com>
4Date: Wed, 8 Apr 2015 18:08:14 +0530
5Subject: [PATCH] dpkg: add triplet entry to fix build error for armeb
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
3 9
4[PATCH] add armeb triplet entry into triplettable. 10[PATCH] add armeb triplet entry into triplettable.
5 11
@@ -25,24 +31,19 @@ Upstream-Status: Pending
25 31
26Signed-off-by: Krishnanjanappa, Jagadeesh <jagadeesh.krishnanjanappa@caviumnetworks.com> 32Signed-off-by: Krishnanjanappa, Jagadeesh <jagadeesh.krishnanjanappa@caviumnetworks.com>
27Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> 33Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
28
29--- 34---
30 data/tupletable | 1 + 35 data/tupletable | 1 +
31 1 file changed, 1 insertion(+) 36 1 file changed, 1 insertion(+)
32 37
33diff --git a/data/tupletable b/data/tupletable 38diff --git a/data/tupletable b/data/tupletable
34index b7802bec3..5f500f6ca 100644 39index ae9f2ddb4..7436f8056 100644
35--- a/data/tupletable 40--- a/data/tupletable
36+++ b/data/tupletable 41+++ b/data/tupletable
37@@ -12,6 +12,7 @@ base-musl-linux-<cpu> musl-linux-<cpu> 42@@ -27,6 +27,7 @@ eabihf-musl-linux-arm musl-linux-armhf
38 ilp32-gnu-linux-arm64 arm64ilp32 43 base-musl-linux-<cpu> musl-linux-<cpu>
39 eabihf-gnu-linux-arm armhf 44 eabihf-gnu-linux-arm armhf
40 eabi-gnu-linux-arm armel 45 eabi-gnu-linux-arm armel
41+eabi-gnu-linux-armeb armeb 46+eabi-gnu-linux-armeb armeb
42 abin32-gnu-linux-mips64r6el mipsn32r6el 47 abin32-gnu-linux-mips64r6el mipsn32r6el
43 abin32-gnu-linux-mips64r6 mipsn32r6 48 abin32-gnu-linux-mips64r6 mipsn32r6
44 abin32-gnu-linux-mips64el mipsn32el 49 abin32-gnu-linux-mips64el mipsn32el
45--
462.11.0
47
48
diff --git a/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch b/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
index 4e0d22acbb..df2cd88ca4 100644
--- a/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
@@ -1,3 +1,8 @@
1From bdf60ebbeb433a80e6cfcbde9d83d89564e79e20 Mon Sep 17 00:00:00 2001
2From: Joe Slater <jslater@windriver.com>
3Date: Mon, 26 Aug 2013 23:38:45 +0000
4Subject: [PATCH] dpkg: fix configuration issue for mips64
5
1configure cannot determine the proper cpu, os, or 6configure cannot determine the proper cpu, os, or
2architecture for mips64, and possibly other arch's 7architecture for mips64, and possibly other arch's
3because of faulty code added to Arch.pm in the latest 8because of faulty code added to Arch.pm in the latest
@@ -6,16 +11,15 @@ release from upstream. We remove that code.
6Upstream-Status: Pending 11Upstream-Status: Pending
7 12
8Signed-off-by: Joe Slater <jslater@windriver.com> 13Signed-off-by: Joe Slater <jslater@windriver.com>
9
10--- 14---
11 scripts/Dpkg/Arch.pm | 3 --- 15 scripts/Dpkg/Arch.pm | 3 ---
12 1 file changed, 3 deletions(-) 16 1 file changed, 3 deletions(-)
13 17
14diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm 18diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm
15index 1720847b8..6345ce3b9 100644 19index 0d352eeb9..4ef5fa307 100644
16--- a/scripts/Dpkg/Arch.pm 20--- a/scripts/Dpkg/Arch.pm
17+++ b/scripts/Dpkg/Arch.pm 21+++ b/scripts/Dpkg/Arch.pm
18@@ -323,9 +323,6 @@ sub _load_tupletable() 22@@ -326,9 +326,6 @@ sub _load_tupletable()
19 (my $dt = $debtuple) =~ s/<cpu>/$_cpu/; 23 (my $dt = $debtuple) =~ s/<cpu>/$_cpu/;
20 (my $da = $debarch) =~ s/<cpu>/$_cpu/; 24 (my $da = $debarch) =~ s/<cpu>/$_cpu/;
21 25
@@ -25,5 +29,3 @@ index 1720847b8..6345ce3b9 100644
25 $debarch_to_debtuple{$da} = $dt; 29 $debarch_to_debtuple{$da} = $dt;
26 $debtuple_to_debarch{$dt} = $da; 30 $debtuple_to_debarch{$dt} = $da;
27 } 31 }
28--
292.11.0
diff --git a/meta/recipes-devtools/dpkg/dpkg/noman.patch b/meta/recipes-devtools/dpkg/dpkg/noman.patch
index 6900716b11..e80549d740 100644
--- a/meta/recipes-devtools/dpkg/dpkg/noman.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/noman.patch
@@ -1,11 +1,15 @@
1Upstream-Status: Inappropriate [disable feature] 1From 008ec5150dd086ffa3940cb520f1ca91939f138d Mon Sep 17 00:00:00 2001
2From: Chris Larson <kergoth@openedhand.com>
3Date: Tue, 5 Sep 2006 07:24:58 +0000
4Subject: [PATCH] Add dpkg, modified from upstream oe.
2 5
6Upstream-Status: Inappropriate [disable feature]
3--- 7---
4 Makefile.am | 1 - 8 Makefile.am | 1 -
5 1 file changed, 1 deletion(-) 9 1 file changed, 1 deletion(-)
6 10
7diff --git a/Makefile.am b/Makefile.am 11diff --git a/Makefile.am b/Makefile.am
8index d963a10..7cef7f5 100644 12index 7186045d4..daca9faf2 100644
9--- a/Makefile.am 13--- a/Makefile.am
10+++ b/Makefile.am 14+++ b/Makefile.am
11@@ -11,7 +11,6 @@ SUBDIRS = \ 15@@ -11,7 +11,6 @@ SUBDIRS = \
@@ -16,6 +20,3 @@ index d963a10..7cef7f5 100644
16 # EOL 20 # EOL
17 21
18 ACLOCAL_AMFLAGS = -I m4 22 ACLOCAL_AMFLAGS = -I m4
19--
202.25.1
21
diff --git a/meta/recipes-devtools/dpkg/dpkg/pager.patch b/meta/recipes-devtools/dpkg/dpkg/pager.patch
deleted file mode 100644
index e56b9d28af..0000000000
--- a/meta/recipes-devtools/dpkg/dpkg/pager.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1pager: Use less instead of pager
2
3pager is a Debianism. Istead use directly pager.
4
5Upstream-Status: Inappropriate [OE-Core integration specific]
6
7Suggested-by: Burton, Ross <ross.burton@intel.com>
8Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com>
9diff --git a/lib/dpkg/dpkg.h b/lib/dpkg/dpkg.h
10index 2bb067a..6cbce80 100644
11--- a/lib/dpkg/dpkg.h
12+++ b/lib/dpkg/dpkg.h
13@@ -95,7 +95,7 @@ DPKG_BEGIN_DECLS
14 #define MAXUPDATES 250
15
16 #define DEFAULTSHELL "sh"
17-#define DEFAULTPAGER "pager"
18+#define DEFAULTPAGER "less"
19
20 #define MD5HASHLEN 32
21 #define MAXTRIGDIRECTIVE 256
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..9307725e8b 100644
--- a/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch
@@ -1,4 +1,8 @@
1busybox-1.19.4 tar utility doesn't support --warning=no-timestamp 1From add92699ca1397205e1d7b46c3ab43de06b9a6c7 Mon Sep 17 00:00:00 2001
2From: Constantin Musca <constantinx.musca@intel.com>
3Date: Tue, 28 Aug 2012 17:02:40 +0300
4Subject: [PATCH] busybox-1.19.4 tar utility doesn't support
5 --warning=no-timestamp
2 6
3Signed-off-by: Constantin Musca <constantinx.musca@intel.com> 7Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
4 8
@@ -8,10 +12,10 @@ Upstream-Status: Inappropriate [configuration]
8 1 file changed, 1 deletion(-) 12 1 file changed, 1 deletion(-)
9 13
10diff --git a/src/deb/extract.c b/src/deb/extract.c 14diff --git a/src/deb/extract.c b/src/deb/extract.c
11index a1b2dc0..95e2372 100644 15index 8b78a7eab..fd7595808 100644
12--- a/src/deb/extract.c 16--- a/src/deb/extract.c
13+++ b/src/deb/extract.c 17+++ b/src/deb/extract.c
14@@ -333,7 +333,6 @@ extracthalf(const char *debar, const char *dir, 18@@ -338,7 +338,6 @@ extracthalf(const char *debar, const char *dir,
15 19
16 command_add_arg(&cmd, "-f"); 20 command_add_arg(&cmd, "-f");
17 command_add_arg(&cmd, "-"); 21 command_add_arg(&cmd, "-");
@@ -19,6 +23,3 @@ index a1b2dc0..95e2372 100644
19 23
20 m_dup2(p2[0],0); 24 m_dup2(p2[0],0);
21 close(p2[0]); 25 close(p2[0]);
22--
232.25.1
24
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.22.0.bb b/meta/recipes-devtools/dpkg/dpkg_1.22.5.bb
index 7eaae9f22e..9f1d00e208 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.22.0.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.22.5.bb
@@ -12,12 +12,11 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=main
12 file://0006-add-musleabi-to-known-target-tripets.patch \ 12 file://0006-add-musleabi-to-known-target-tripets.patch \
13 file://0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch \ 13 file://0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch \
14 file://0001-dpkg-Support-muslx32-build.patch \ 14 file://0001-dpkg-Support-muslx32-build.patch \
15 file://pager.patch \
16 file://0001-Add-support-for-riscv32-CPU.patch \ 15 file://0001-Add-support-for-riscv32-CPU.patch \
17 " 16 "
18 17
19SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" 18SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch"
20 19
21SRCREV = "744487c98a622b9b38c22c6ca330315af4a30a11" 20SRCREV = "1c92a4a8bfbeea30ceb0109b096c4ec845e3c6ce"
22 21
23S = "${WORKDIR}/git" 22S = "${WORKDIR}/git"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-02 12:40:59 +0000