summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2020-06-06 10:38:24 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-09 13:13:59 +0100
commitb33eb34d41659ad75517f5601afb66bb71c5e6cd (patch)
treeb89a2a0e5b5522ba640303dc3221465492b92e53
parent71b50a43101445a3ddc363176dc70b89f36c4a9f (diff)
downloadpoky-b33eb34d41659ad75517f5601afb66bb71c5e6cd.tar.gz
dpkg: Remove workaound patch for host tar < 1.27
tar >= 1.28 is already required. (From OE-Core rev: 5643dd73fd1ce4d2813d86a2388df85b48e9a135) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/tweak-options-require-tar-1.27.patch36
-rw-r--r--meta/recipes-devtools/dpkg/dpkg_1.20.0.bb3
2 files changed, 0 insertions, 39 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg/tweak-options-require-tar-1.27.patch b/meta/recipes-devtools/dpkg/dpkg/tweak-options-require-tar-1.27.patch
deleted file mode 100644
index ac59dce69e..0000000000
--- a/meta/recipes-devtools/dpkg/dpkg/tweak-options-require-tar-1.27.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 48bcc51ce042d1b779b34fae454c52b15bdd9cae Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com>
3Date: Fri, 22 Feb 2019 01:47:16 -0500
4Subject: [PATCH] dpkg: 1.18.25 -> 1.19.4
5
6GNU tar >= 1.27 is required for --owner=NAME:ID and --group=NAME:ID. And fails
7to build .deb packages with error:
8
9| dpkg-deb: building package 'linux-libc-headers-dbg' in '.../tmp/work/i586-poky-linux/linux-libc-headers/4.19-r0/deploy-debs/i586/linux-libc-headers-dbg_ 4.19-r0.0_i386.deb'.
10| tar: root\:0: Invalid owner
11| tar: Error is not recoverable: exiting now
12| dpkg-deb: error: tar -cf subprocess returned error exit status 2
13
14Tweak tar options in dpkg-deb source code to make it work on old machines.
15
16Upstream-Status: Inappropriate [cross build specific]
17
18Signed-off-by: Kai Kang <kai.kang@windriver.com>
19
20---
21 dpkg-deb/build.c | 2 +-
22 1 file changed, 1 insertion(+), 1 deletion(-)
23
24diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
25index 8436839..67c0c20 100644
26--- a/dpkg-deb/build.c
27+++ b/dpkg-deb/build.c
28@@ -462,7 +462,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
29 if (options->mode)
30 command_add_args(&cmd, "--mode", options->mode, NULL);
31 if (options->root_owner_group)
32- command_add_args(&cmd, "--owner", "root:0", "--group", "root:0", NULL);
33+ command_add_args(&cmd, "--owner", "root", "--group", "root", NULL);
34 command_add_args(&cmd, "--null", "--no-unquote", "--no-recursion",
35 "-T", "-", NULL);
36 command_exec(&cmd);
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.20.0.bb b/meta/recipes-devtools/dpkg/dpkg_1.20.0.bb
index 1e822bbdf5..d539c57522 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.20.0.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.20.0.bb
@@ -15,9 +15,6 @@ SRC_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/${BPN}_${PV}.tar.xz \
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 " 17 "
18SRC_URI_append_class-native = " \
19 file://tweak-options-require-tar-1.27.patch \
20"
21 18
22SRC_URI[md5sum] = "f88f077236a3ff3decae3b25c989893d" 19SRC_URI[md5sum] = "f88f077236a3ff3decae3b25c989893d"
23SRC_URI[sha256sum] = "b633cc2b0e030efb61e11029d8a3fb1123f719864c9992da2e52b471c96d0900" 20SRC_URI[sha256sum] = "b633cc2b0e030efb61e11029d8a3fb1123f719864c9992da2e52b471c96d0900"