summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/dpkg
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/dpkg')
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch8
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch4
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch4
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0001-script.c-avoid-use-of-chroot.patch (renamed from meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch)25
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch6
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch6
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch4
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch4
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch8
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/arch_pm.patch4
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/noman.patch4
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch4
-rw-r--r--meta/recipes-devtools/dpkg/dpkg_1.22.11.bb (renamed from meta/recipes-devtools/dpkg/dpkg_1.22.6.bb)4
13 files changed, 44 insertions, 41 deletions
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 b8a8697585..8943f6c2f0 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,9 +1,9 @@
1From 21459bb8d9a997e6a92885a4ef337ede9cc5aba7 Mon Sep 17 00:00:00 2001 1From 5c332c2a4625519a2b6065b9d9fc724e84c9b6d6 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
5 5
6Upstream-Status: Pending 6Upstream-Status: Inappropriate [not a debian architecture]
7Signed-off-by: Khem Raj <raj.khem@gmail.com> 7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8--- 8---
9 data/cputable | 1 + 9 data/cputable | 1 +
@@ -23,10 +23,10 @@ index 575c008e3..7a801a03a 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 fcf5b1e2a..175c9f436 100644 26index edf94bc19..d76f97494 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@@ -202,6 +202,7 @@ sub set_build_features { 29@@ -216,6 +216,7 @@ sub set_build_features {
30 powerpc 30 powerpc
31 ppc64 31 ppc64
32 ppc64el 32 ppc64el
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 95a49053e8..185bbb90f1 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 4c5e6c280a2ab4d2009d3264e94286f5fe244d0b Mon Sep 17 00:00:00 2001 1From 067992f2d0b0ff6ca114031636eb0e1eac791892 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
@@ -28,7 +28,7 @@ Signed-off-by: Paul Eggleton <paul.eggleton@microsoft.com>
28 1 file changed, 4 insertions(+), 1 deletion(-) 28 1 file changed, 4 insertions(+), 1 deletion(-)
29 29
30diff --git a/src/deb/build.c b/src/deb/build.c 30diff --git a/src/deb/build.c b/src/deb/build.c
31index 92aba9553..6436b33da 100644 31index 87bd4142e..e85fd7d0f 100644
32--- a/src/deb/build.c 32--- a/src/deb/build.c
33+++ b/src/deb/build.c 33+++ b/src/deb/build.c
34@@ -481,6 +481,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,
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 e8d8576f85..67fce89d80 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,9 +1,9 @@
1From 1d192b60fc43e24e1c2d6ff452dabeee7a227cc0 Mon Sep 17 00:00:00 2001 1From df6c641e3fc248d0c864e4e752c4609412067df7 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
5 5
6Upstream-Status: Pending 6Upstream-Status: Inappropriate [not a debian architecture]
7Changes made on ostable and tupletable to enable muslx32 build. 7Changes made on ostable and tupletable to enable muslx32 build.
8 8
9Signed-off-by: sweeaun <swee.aun.khor@intel.com> 9Signed-off-by: sweeaun <swee.aun.khor@intel.com>
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/0001-script.c-avoid-use-of-chroot.patch
index 916c7dfb00..d0459cd017 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/0001-script.c-avoid-use-of-chroot.patch
@@ -1,9 +1,11 @@
1From b6c28222276704a1e1a544983e38dfa2f3fb481a Mon Sep 17 00:00:00 2001 1From 5e5f06d396fe631990474ba6df83428987855365 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] script.c: avoid use of chroot
5 sysroot and don't expect a chroot. This matches up our system expectations 5
6 with what dpkg does. 6Our pre/postinsts expect $D to be set when running in a sysroot and
7don't expect a chroot. This matches up our system expectations with what
8dpkg does.
7 9
8Upstream-Status: Inappropriate [OE Specific] 10Upstream-Status: Inappropriate [OE Specific]
9 11
@@ -11,15 +13,19 @@ RP 2011/12/07
11ALIMON 2016/05/26 13ALIMON 2016/05/26
12ALIMON 2017/02/21 14ALIMON 2017/02/21
13KKang 2019/02/20 15KKang 2019/02/20
16
17Refresh to apply on top of v1.22.10.
18
19Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
14--- 20---
15 src/main/script.c | 53 +++-------------------------------------------- 21 src/main/script.c | 52 +++--------------------------------------------
16 1 file changed, 3 insertions(+), 50 deletions(-) 22 1 file changed, 3 insertions(+), 49 deletions(-)
17 23
18diff --git a/src/main/script.c b/src/main/script.c 24diff --git a/src/main/script.c b/src/main/script.c
19index 017d92efe..181e7c710 100644 25index e9aee0bf9..181e7c710 100644
20--- a/src/main/script.c 26--- a/src/main/script.c
21+++ b/src/main/script.c 27+++ b/src/main/script.c
22@@ -97,58 +97,11 @@ static const char * 28@@ -97,57 +97,11 @@ static const char *
23 maintscript_pre_exec(struct command *cmd) 29 maintscript_pre_exec(struct command *cmd)
24 { 30 {
25 const char *instdir = dpkg_fsys_get_dir(); 31 const char *instdir = dpkg_fsys_get_dir();
@@ -62,9 +68,8 @@ index 017d92efe..181e7c710 100644
62- varbuf_add_char(&args, ' '); 68- varbuf_add_char(&args, ' ');
63- varbuf_add_str(&args, *argv); 69- varbuf_add_str(&args, *argv);
64- } 70- }
65- varbuf_end_str(&args);
66- debug(dbg_scripts, "fork/exec %s (%s )", cmd->filename, 71- debug(dbg_scripts, "fork/exec %s (%s )", cmd->filename,
67- args.buf); 72- varbuf_str(&args));
68- varbuf_destroy(&args); 73- varbuf_destroy(&args);
69+ if (*instdir) { 74+ if (*instdir) {
70+ setenv("D", instdir, 1); 75+ setenv("D", instdir, 1);
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 fc097e5a66..a5c80773a5 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,4 +1,4 @@
1From 0cac67ce5920d6d0c9df4278bfa77da878a8a37a Mon Sep 17 00:00:00 2001 1From 6e88e8b7b6924751112966f329525956735de9b4 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] Adapt to linux-wrs kernel version, which has character '_' 4Subject: [PATCH] Adapt to linux-wrs kernel version, which has character '_'
@@ -13,10 +13,10 @@ Upstream-Status: Inappropriate [embedded specific]
13 1 file changed, 2 insertions(+), 4 deletions(-) 13 1 file changed, 2 insertions(+), 4 deletions(-)
14 14
15diff --git a/lib/dpkg/parsehelp.c b/lib/dpkg/parsehelp.c 15diff --git a/lib/dpkg/parsehelp.c b/lib/dpkg/parsehelp.c
16index 63a36f55c..81901bd5a 100644 16index a999b5e78..7be0378ab 100644
17--- a/lib/dpkg/parsehelp.c 17--- a/lib/dpkg/parsehelp.c
18+++ b/lib/dpkg/parsehelp.c 18+++ b/lib/dpkg/parsehelp.c
19@@ -275,14 +275,12 @@ parseversion(struct dpkg_version *rversion, const char *string, 19@@ -291,14 +291,12 @@ parseversion(struct dpkg_version *rversion, const char *string,
20 ptr = rversion->version; 20 ptr = rversion->version;
21 if (!*ptr) 21 if (!*ptr)
22 return dpkg_put_error(err, _("version number is empty")); 22 return dpkg_put_error(err, _("version number is empty"));
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 35c0c246f6..e49d54152c 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,4 +1,4 @@
1From 80ad29d22f8ca4033a6a79a726580fee17bdade9 Mon Sep 17 00:00:00 2001 1From 0fc90a3ed01a7fce34de925979460638b8a57402 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] The lutimes function doesn't work properly for all systems. 4Subject: [PATCH] The lutimes function doesn't work properly for all systems.
@@ -11,10 +11,10 @@ Upstream-Status: Inappropriate [embedded specific]
11 1 file changed, 2 insertions(+), 1 deletion(-) 11 1 file changed, 2 insertions(+), 1 deletion(-)
12 12
13diff --git a/src/main/archives.c b/src/main/archives.c 13diff --git a/src/main/archives.c b/src/main/archives.c
14index 7e399f922..ec3b6878f 100644 14index d7279e1f5..f9c6facc9 100644
15--- a/src/main/archives.c 15--- a/src/main/archives.c
16+++ b/src/main/archives.c 16+++ b/src/main/archives.c
17@@ -491,8 +491,9 @@ tarobject_set_mtime(struct tar_entry *te, const char *path) 17@@ -490,8 +490,9 @@ tarobject_set_mtime(struct tar_entry *te, const char *path)
18 18
19 if (te->type == TAR_FILETYPE_SYMLINK) { 19 if (te->type == TAR_FILETYPE_SYMLINK) {
20 #ifdef HAVE_LUTIMES 20 #ifdef HAVE_LUTIMES
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 8ac646b1a1..4f60a89a56 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,4 +1,4 @@
1From 1c9e78dda91ba66fbd8fe02b66b6c603d08d3343 Mon Sep 17 00:00:00 2001 1From e3dc69aa987b379e247dde3fce479e43be6c81aa 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
@@ -8,7 +8,7 @@ Content-Transfer-Encoding: 8bit
8 8
9helps compiling dpkg for musl/arm-softfloat 9helps compiling dpkg for musl/arm-softfloat
10 10
11Upstream-Status: Pending 11Upstream-Status: Inappropriate [not a debian architecture]
12Signed-off-by: Khem Raj <raj.khem@gmail.com> 12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> 13Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
14--- 14---
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 3d3a4f0bb9..ded1707dfd 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,4 +1,4 @@
1From 6dd80236a91a505b5753bb74e5f1b47330d8b16b Mon Sep 17 00:00:00 2001 1From 20ba7fd8939e97bec3d70a67c0aac76ddc67898d 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
@@ -27,7 +27,7 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
27 1 file changed, 1 insertion(+), 1 deletion(-) 27 1 file changed, 1 insertion(+), 1 deletion(-)
28 28
29diff --git a/src/deb/build.c b/src/deb/build.c 29diff --git a/src/deb/build.c b/src/deb/build.c
30index 1f0c050ee..92aba9553 100644 30index a418dd122..87bd4142e 100644
31--- a/src/deb/build.c 31--- a/src/deb/build.c
32+++ b/src/deb/build.c 32+++ b/src/deb/build.c
33@@ -504,7 +504,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,
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 cbdf01dbd9..d1fac2168a 100644
--- a/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch
@@ -1,14 +1,12 @@
1From 1c3a109df54b6092fa85a1fe2b7771e3b959655f Mon Sep 17 00:00:00 2001 1From 8ded32a35287a840de7e505c66e76cccd9edbac6 Mon Sep 17 00:00:00 2001
2From: "Krishnanjanappa, Jagadeesh" 2From: "Krishnanjanappa, Jagadeesh"
3 <jagadeesh.krishnanjanappa@caviumnetworks.com> 3 <jagadeesh.krishnanjanappa@caviumnetworks.com>
4Date: Wed, 8 Apr 2015 18:08:14 +0530 4Date: Wed, 8 Apr 2015 18:08:14 +0530
5Subject: [PATCH] dpkg: add triplet entry to fix build error for armeb 5Subject: [PATCH] add armeb triplet entry into triplettable.
6MIME-Version: 1.0 6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8 7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit 8Content-Transfer-Encoding: 8bit
9 9
10[PATCH] add armeb triplet entry into triplettable.
11
12Cross-compling dpkg application for armeb fails with below error 10Cross-compling dpkg application for armeb fails with below error
13during configure task, 11during configure task,
14 12
@@ -27,7 +25,7 @@ the required combination of "gnueabi-linux-armeb" was not found in
27the triplettable file thereby returning dpkg_arch as 25the triplettable file thereby returning dpkg_arch as
28empty in configure script. 26empty in configure script.
29 27
30Upstream-Status: Pending 28Upstream-Status: Inappropriate [not a debian architecture]
31 29
32Signed-off-by: Krishnanjanappa, Jagadeesh <jagadeesh.krishnanjanappa@caviumnetworks.com> 30Signed-off-by: Krishnanjanappa, Jagadeesh <jagadeesh.krishnanjanappa@caviumnetworks.com>
33Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> 31Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
diff --git a/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch b/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
index df2cd88ca4..b5a29231dd 100644
--- a/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
@@ -1,4 +1,4 @@
1From bdf60ebbeb433a80e6cfcbde9d83d89564e79e20 Mon Sep 17 00:00:00 2001 1From 812dbb64f2805a3257ef9c9a61abbd10e0b3a08c Mon Sep 17 00:00:00 2001
2From: Joe Slater <jslater@windriver.com> 2From: Joe Slater <jslater@windriver.com>
3Date: Mon, 26 Aug 2013 23:38:45 +0000 3Date: Mon, 26 Aug 2013 23:38:45 +0000
4Subject: [PATCH] dpkg: fix configuration issue for mips64 4Subject: [PATCH] dpkg: fix configuration issue for mips64
@@ -8,7 +8,7 @@ architecture for mips64, and possibly other arch's
8because of faulty code added to Arch.pm in the latest 8because of faulty code added to Arch.pm in the latest
9release from upstream. We remove that code. 9release from upstream. We remove that code.
10 10
11Upstream-Status: Pending 11Upstream-Status: Inappropriate [not a debian architecture]
12 12
13Signed-off-by: Joe Slater <jslater@windriver.com> 13Signed-off-by: Joe Slater <jslater@windriver.com>
14--- 14---
diff --git a/meta/recipes-devtools/dpkg/dpkg/noman.patch b/meta/recipes-devtools/dpkg/dpkg/noman.patch
index e80549d740..3f3e08351c 100644
--- a/meta/recipes-devtools/dpkg/dpkg/noman.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/noman.patch
@@ -1,4 +1,4 @@
1From 008ec5150dd086ffa3940cb520f1ca91939f138d Mon Sep 17 00:00:00 2001 1From e671b43a52bf5785fe4aad84712dbabc6c86b39e Mon Sep 17 00:00:00 2001
2From: Chris Larson <kergoth@openedhand.com> 2From: Chris Larson <kergoth@openedhand.com>
3Date: Tue, 5 Sep 2006 07:24:58 +0000 3Date: Tue, 5 Sep 2006 07:24:58 +0000
4Subject: [PATCH] Add dpkg, modified from upstream oe. 4Subject: [PATCH] Add dpkg, modified from upstream oe.
@@ -9,7 +9,7 @@ Upstream-Status: Inappropriate [disable feature]
9 1 file changed, 1 deletion(-) 9 1 file changed, 1 deletion(-)
10 10
11diff --git a/Makefile.am b/Makefile.am 11diff --git a/Makefile.am b/Makefile.am
12index 7186045d4..daca9faf2 100644 12index 74f8df197..35e5eee39 100644
13--- a/Makefile.am 13--- a/Makefile.am
14+++ b/Makefile.am 14+++ b/Makefile.am
15@@ -11,7 +11,6 @@ SUBDIRS = \ 15@@ -11,7 +11,6 @@ SUBDIRS = \
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 9307725e8b..d3a1a13098 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,4 @@
1From add92699ca1397205e1d7b46c3ab43de06b9a6c7 Mon Sep 17 00:00:00 2001 1From 7d69de114aa696cfb5e31b491a657ca6b6cbbbd5 Mon Sep 17 00:00:00 2001
2From: Constantin Musca <constantinx.musca@intel.com> 2From: Constantin Musca <constantinx.musca@intel.com>
3Date: Tue, 28 Aug 2012 17:02:40 +0300 3Date: Tue, 28 Aug 2012 17:02:40 +0300
4Subject: [PATCH] busybox-1.19.4 tar utility doesn't support 4Subject: [PATCH] busybox-1.19.4 tar utility doesn't support
@@ -12,7 +12,7 @@ Upstream-Status: Inappropriate [configuration]
12 1 file changed, 1 deletion(-) 12 1 file changed, 1 deletion(-)
13 13
14diff --git a/src/deb/extract.c b/src/deb/extract.c 14diff --git a/src/deb/extract.c b/src/deb/extract.c
15index 8b78a7eab..fd7595808 100644 15index 08b281564..c35a182ee 100644
16--- a/src/deb/extract.c 16--- a/src/deb/extract.c
17+++ b/src/deb/extract.c 17+++ b/src/deb/extract.c
18@@ -338,7 +338,6 @@ extracthalf(const char *debar, const char *dir, 18@@ -338,7 +338,6 @@ extracthalf(const char *debar, const char *dir,
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.22.6.bb b/meta/recipes-devtools/dpkg/dpkg_1.22.11.bb
index 3f5f7395e0..47a8d5d5ea 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.22.6.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.22.11.bb
@@ -7,7 +7,7 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=main
7 file://arch_pm.patch \ 7 file://arch_pm.patch \
8 file://add_armeb_triplet_entry.patch \ 8 file://add_armeb_triplet_entry.patch \
9 file://0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch \ 9 file://0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch \
10 file://0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch \ 10 file://0001-script.c-avoid-use-of-chroot.patch \
11 file://0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch \ 11 file://0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch \
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 \
@@ -17,6 +17,6 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=main
17 17
18SRC_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"
19 19
20SRCREV = "b2f9600ead232a2dd3c27f8b52807a9ca5854d17" 20SRCREV = "ee7e9118d0a9581cb00c5ce02dccd561b3096387"
21 21
22S = "${WORKDIR}/git" 22S = "${WORKDIR}/git"