summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/dpkg
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-02-08 11:59:27 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-09 08:56:10 +0000
commitbf346761431d93f738b3ebfc692252e2ee4344ae (patch)
treefd846970fb87c510aec1479b3f50ea3783ef9cbf /meta/recipes-devtools/dpkg
parentd8fe22e05f94d4cd477a062d81a553b5682743db (diff)
downloadpoky-bf346761431d93f738b3ebfc692252e2ee4344ae.tar.gz
dpkg: update 1.20.5 -> 1.20.7.1
(From OE-Core rev: b13ebb89b63a8a7d1c5d688c72c4aa4f54088963) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/dpkg')
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch10
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0013-scripts-dpkg-fsys-usrunmess.pl-correct-shebang.patch23
-rw-r--r--meta/recipes-devtools/dpkg/dpkg_1.20.7.1.bb (renamed from meta/recipes-devtools/dpkg/dpkg_1.20.5.bb)5
3 files changed, 31 insertions, 7 deletions
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 ffe520c513..2dc68e2064 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 15b081cc8bead80c493ab83369ecb3345a24a3dc Mon Sep 17 00:00:00 2001 1From d6f5fed6bc56e1f3b885a796a43aa2868ace57bc 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
@@ -29,10 +29,10 @@ Signed-off-by: Paul Eggleton <paul.eggleton@microsoft.com>
29 1 file changed, 4 insertions(+), 1 deletion(-) 29 1 file changed, 4 insertions(+), 1 deletion(-)
30 30
31diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c 31diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
32index 8436839cd..6b44a36f7 100644 32index d13a21c1e..059f2be6d 100644
33--- a/dpkg-deb/build.c 33--- a/dpkg-deb/build.c
34+++ b/dpkg-deb/build.c 34+++ b/dpkg-deb/build.c
35@@ -434,6 +434,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, 35@@ -480,6 +480,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
36 { 36 {
37 int pipe_filenames[2], pipe_tarball[2]; 37 int pipe_filenames[2], pipe_tarball[2];
38 pid_t pid_tar, pid_comp; 38 pid_t pid_tar, pid_comp;
@@ -40,7 +40,7 @@ index 8436839cd..6b44a36f7 100644
40 40
41 /* Fork off a tar. We will feed it a list of filenames on stdin later. */ 41 /* Fork off a tar. We will feed it a list of filenames on stdin later. */
42 m_pipe(pipe_filenames); 42 m_pipe(pipe_filenames);
43@@ -486,7 +487,9 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, 43@@ -532,7 +533,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. */ 44 /* All done, clean up wait for tar and <compress> to finish their job. */
45 close(pipe_filenames[1]); 45 close(pipe_filenames[1]);
46 subproc_reap(pid_comp, _("<compress> from tar -cf"), 0); 46 subproc_reap(pid_comp, _("<compress> from tar -cf"), 0);
@@ -50,4 +50,4 @@ index 8436839cd..6b44a36f7 100644
50+ ohshite(_("subprocess %s returned error exit status %d"), "tar -cf", rc); 50+ ohshite(_("subprocess %s returned error exit status %d"), "tar -cf", rc);
51 } 51 }
52 52
53 static time_t 53 static intmax_t
diff --git a/meta/recipes-devtools/dpkg/dpkg/0013-scripts-dpkg-fsys-usrunmess.pl-correct-shebang.patch b/meta/recipes-devtools/dpkg/dpkg/0013-scripts-dpkg-fsys-usrunmess.pl-correct-shebang.patch
new file mode 100644
index 0000000000..292b72ab5d
--- /dev/null
+++ b/meta/recipes-devtools/dpkg/dpkg/0013-scripts-dpkg-fsys-usrunmess.pl-correct-shebang.patch
@@ -0,0 +1,23 @@
1From 0decc62904571582147f2273fa1b521e00485dda Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 3 Feb 2021 20:47:58 +0100
4Subject: [PATCH] scripts/dpkg-fsys-usrunmess.pl: correct shebang
5
6Otherwise automake will write the full native perl path into it.
7
8Upstream-Status: Pending
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10---
11 scripts/dpkg-fsys-usrunmess.pl | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/scripts/dpkg-fsys-usrunmess.pl b/scripts/dpkg-fsys-usrunmess.pl
15index 9220df3c0..9ce368955 100755
16--- a/scripts/dpkg-fsys-usrunmess.pl
17+++ b/scripts/dpkg-fsys-usrunmess.pl
18@@ -1,4 +1,4 @@
19-#!/usr/bin/perl
20+#!/usr/bin/env perl
21 #
22 # dpkg-fsys-usrunmess - Undoes the merged-/usr-via-aliased-dirs mess
23 #
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.20.5.bb b/meta/recipes-devtools/dpkg/dpkg_1.20.7.1.bb
index d97b69c0b9..55ac84f724 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.20.5.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.20.7.1.bb
@@ -1,7 +1,7 @@
1require dpkg.inc 1require dpkg.inc
2LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 2LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
3 3
4SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https \ 4SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=sid \
5 file://noman.patch \ 5 file://noman.patch \
6 file://remove-tar-no-timestamp.patch \ 6 file://remove-tar-no-timestamp.patch \
7 file://arch_pm.patch \ 7 file://arch_pm.patch \
@@ -14,10 +14,11 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https \
14 file://0001-dpkg-Support-muslx32-build.patch \ 14 file://0001-dpkg-Support-muslx32-build.patch \
15 file://pager.patch \ 15 file://pager.patch \
16 file://0001-Add-support-for-riscv32-CPU.patch \ 16 file://0001-Add-support-for-riscv32-CPU.patch \
17 file://0013-scripts-dpkg-fsys-usrunmess.pl-correct-shebang.patch \
17 " 18 "
18 19
19SRC_URI_append_class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" 20SRC_URI_append_class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch"
20 21
21SRCREV = "823a67d67538b1b403a32d1fef40e6e228265566" 22SRCREV = "667bf0aeb92e0e7bb225ee273569c5e2389083bd"
22 23
23S = "${WORKDIR}/git" 24S = "${WORKDIR}/git"