diff options
author | Kai Kang <kai.kang@windriver.com> | 2019-02-22 01:47:16 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-25 10:43:07 +0000 |
commit | 70e2baa4bd256b7ab0b177331c37883ab32bb8c1 (patch) | |
tree | e4fe5b2b14589699b087a0f55bb76041a5285ab6 /meta/recipes-devtools/dpkg/dpkg/tweak-options-require-tar-1.27.patch | |
parent | 4cae7e17b13dbe162aaadb43b9b8540f88d84891 (diff) | |
download | poky-70e2baa4bd256b7ab0b177331c37883ab32bb8c1.tar.gz |
dpkg: 1.18.25 -> 1.19.4
Upgrade dpkg from 1.18.25 to 1.19.4:
* update SRC_URI which DEBIAN_MIRROR
* un-export PERL which causes script scripts/dpkg-architecture.pl fails
to get cpu type and package arch
* add configure option '--disable-update-alternatives' which causes
installed-vs-shipped issue
* add patch for dpkg-native to resolve host tar may not support
options --owner=NAME:ID and --group=NAME:ID
* update context of patches
* drop dpkg-configure.service that apt provides a systemd timer to do it
(From OE-Core rev: 5185b6fe3d4fa9b53baffa6ee419da60ac056da2)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/dpkg/dpkg/tweak-options-require-tar-1.27.patch')
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg/tweak-options-require-tar-1.27.patch | 27 |
1 files changed, 27 insertions, 0 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 new file mode 100644 index 0000000000..e9119918b1 --- /dev/null +++ b/meta/recipes-devtools/dpkg/dpkg/tweak-options-require-tar-1.27.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | GNU tar >= 1.27 is required for --owner=NAME:ID and --group=NAME:ID. And fails | ||
2 | to build .deb packages with error: | ||
3 | |||
4 | | 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'. | ||
5 | | tar: root\:0: Invalid owner | ||
6 | | tar: Error is not recoverable: exiting now | ||
7 | | dpkg-deb: error: tar -cf subprocess returned error exit status 2 | ||
8 | |||
9 | Tweak tar options in dpkg-deb source code to make it work on old machines. | ||
10 | |||
11 | Upstream-Status: Inappropriate [cross build specific] | ||
12 | |||
13 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
14 | --- | ||
15 | diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c | ||
16 | index 68d187511..86fe22e25 100644 | ||
17 | --- a/dpkg-deb/build.c | ||
18 | +++ b/dpkg-deb/build.c | ||
19 | @@ -462,7 +462,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, | ||
20 | if (options->mode) | ||
21 | command_add_args(&cmd, "--mode", options->mode, NULL); | ||
22 | if (options->root_owner_group) | ||
23 | - command_add_args(&cmd, "--owner", "root:0", "--group", "root:0", NULL); | ||
24 | + command_add_args(&cmd, "--owner", "root", "--group", "root", NULL); | ||
25 | command_add_args(&cmd, "--null", "--no-unquote", "--no-recursion", | ||
26 | "-T", "-", NULL); | ||
27 | command_exec(&cmd); | ||