Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 1 | From 48bcc51ce042d1b779b34fae454c52b15bdd9cae Mon Sep 17 00:00:00 2001 |
| 2 | From: Kai Kang <kai.kang@windriver.com> |
| 3 | Date: Fri, 22 Feb 2019 01:47:16 -0500 |
| 4 | Subject: [PATCH] dpkg: 1.18.25 -> 1.19.4 |
| 5 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 6 | GNU tar >= 1.27 is required for --owner=NAME:ID and --group=NAME:ID. And fails |
| 7 | to 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 | |
| 14 | Tweak tar options in dpkg-deb source code to make it work on old machines. |
| 15 | |
| 16 | Upstream-Status: Inappropriate [cross build specific] |
| 17 | |
| 18 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 19 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 20 | --- |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 21 | dpkg-deb/build.c | 2 +- |
| 22 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 23 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 24 | diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 25 | index 8436839..67c0c20 100644 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 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); |