diff options
| author |   Adrian Bunk <bunk@stusta.de> | 2020-06-06 10:38:24 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-06 23:14:52 +0100 |
| commit | 5643dd73fd1ce4d2813d86a2388df85b48e9a135 (patch) | |
| tree | 55bf432e75e194d8a2ca5cfef10bcc58b79f309b | |
| parent | 0f686fabd33d933330b9c6e9b14fff25ae8e7642 (diff) | |
| download | openembedded-core-contrib-5643dd73fd1ce4d2813d86a2388df85b48e9a135.tar.gz | |
dpkg: Remove workaound patch for host tar < 1.27
tar >= 1.28 is already required.
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.patch | 36 | ||||
| -rw-r--r-- | meta/recipes-devtools/dpkg/dpkg_1.20.0.bb | 3 |
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 @@ -From 48bcc51ce042d1b779b34fae454c52b15bdd9cae Mon Sep 17 00:00:00 2001 -From: Kai Kang <kai.kang@windriver.com> -Date: Fri, 22 Feb 2019 01:47:16 -0500 -Subject: [PATCH] dpkg: 1.18.25 -> 1.19.4 - -GNU tar >= 1.27 is required for --owner=NAME:ID and --group=NAME:ID. And fails -to build .deb packages with error: - -| 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'. -| tar: root\:0: Invalid owner -| tar: Error is not recoverable: exiting now -| dpkg-deb: error: tar -cf subprocess returned error exit status 2 - -Tweak tar options in dpkg-deb source code to make it work on old machines. - -Upstream-Status: Inappropriate [cross build specific] - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - ---- - dpkg-deb/build.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c -index 8436839..67c0c20 100644 ---- a/dpkg-deb/build.c -+++ b/dpkg-deb/build.c -@@ -462,7 +462,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, - if (options->mode) - command_add_args(&cmd, "--mode", options->mode, NULL); - if (options->root_owner_group) -- command_add_args(&cmd, "--owner", "root:0", "--group", "root:0", NULL); -+ command_add_args(&cmd, "--owner", "root", "--group", "root", NULL); - command_add_args(&cmd, "--null", "--no-unquote", "--no-recursion", - "-T", "-", NULL); - 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 \ file://pager.patch \ file://0001-Add-support-for-riscv32-CPU.patch \ " -SRC_URI_append_class-native = " \ - file://tweak-options-require-tar-1.27.patch \ -" SRC_URI[md5sum] = "f88f077236a3ff3decae3b25c989893d" SRC_URI[sha256sum] = "b633cc2b0e030efb61e11029d8a3fb1123f719864c9992da2e52b471c96d0900" |