mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-20 00:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

dpkg: Remove workaound patch for host tar < 1.27

Browse Source 
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>
This commit is contained in:
Adrian Bunk
2020-06-06 10:38:24 +03:00
committed by Richard Purdie
parent 71b50a4310
commit b33eb34d41
2 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
meta/recipes-devtools/dpkg/dpkg/tweak-options-require-tar-1.27.patch
View File

@@ -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);

3
meta/recipes-devtools/dpkg/dpkg_1.20.0.bb
View File

@@ -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"