From 5185b6fe3d4fa9b53baffa6ee419da60ac056da2 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Fri, 22 Feb 2019 01:47:16 -0500 Subject: 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 Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- ...dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch') diff --git a/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch b/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch index 1b985df0f5..4f79a40d8b 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch @@ -18,22 +18,26 @@ Upstream-Status: Inappropriate [Configuration] [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=759999#20 [2] https://lists.gnu.org/archive/html/help-tar/2016-01/msg00000.html + +Update patch context for dpkg 1.19.4. + +Signed-off-by: Kai Kang --- 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 a92b58e..a3d1912 100644 +index 68d1875..053fcb7 100644 --- a/dpkg-deb/build.c +++ b/dpkg-deb/build.c -@@ -450,7 +450,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, +@@ -457,7 +457,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, command_init(&cmd, TAR, "tar -cf"); command_add_args(&cmd, "tar", "-cf", "-", "--format=gnu", - "--mtime", mtime, "--clamp-mtime", NULL); + "--mtime", mtime, NULL); /* Mode might become a positional argument, pass it before -T. */ - if (mode) - command_add_args(&cmd, "--mode", mode, NULL); + if (options->mode) + command_add_args(&cmd, "--mode", options->mode, NULL); -- 2.11.0 -- cgit 1.2.3-korg