From 72166e5dbbf6b2c89f890caf1c33d9e4f98cf925 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 31 May 2020 17:51:49 +0200 Subject: [PATCH] dpkg: upgrade 1.19.7 -> 1.20.0 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../dpkg/dpkg/tweak-options-require-tar-1.27.patch | 11 ++++++++++- .../dpkg/{dpkg_1.19.7.bb => dpkg_1.20.0.bb} | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) rename meta/recipes-devtools/dpkg/{dpkg_1.19.7.bb => dpkg_1.20.0.bb} (87%) 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 index e9119918b1..ac59dce69e 100644 --- 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 @@ -1,3 +1,8 @@ +From 48bcc51ce042d1b779b34fae454c52b15bdd9cae Mon Sep 17 00:00:00 2001 +From: Kai Kang +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: @@ -11,9 +16,13 @@ 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 + --- + 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 68d187511..86fe22e25 100644 +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, diff --git a/meta/recipes-devtools/dpkg/dpkg_1.19.7.bb b/meta/recipes-devtools/dpkg/dpkg_1.20.0.bb similarity index 87% rename from meta/recipes-devtools/dpkg/dpkg_1.19.7.bb rename to meta/recipes-devtools/dpkg/dpkg_1.20.0.bb index 50fe54dee1..1e822bbdf5 100644 --- a/meta/recipes-devtools/dpkg/dpkg_1.19.7.bb +++ b/meta/recipes-devtools/dpkg/dpkg_1.20.0.bb @@ -19,5 +19,5 @@ SRC_URI_append_class-native = " \ file://tweak-options-require-tar-1.27.patch \ " -SRC_URI[md5sum] = "60f57c5494e6dfa177504d47bfa0e383" -SRC_URI[sha256sum] = "4c27fededf620c0aa522fff1a48577ba08144445341257502e7730f2b1a296e8" +SRC_URI[md5sum] = "f88f077236a3ff3decae3b25c989893d" +SRC_URI[sha256sum] = "b633cc2b0e030efb61e11029d8a3fb1123f719864c9992da2e52b471c96d0900" -- 2.40.1