From a948c258f6589b1f9a760079095165cf023b99d5 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 31 May 2020 17:51:49 +0200 Subject: dpkg: upgrade 1.19.7 -> 1.20.0 (From OE-Core rev: 72166e5dbbf6b2c89f890caf1c33d9e4f98cf925) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../dpkg/dpkg/tweak-options-require-tar-1.27.patch | 11 ++++++++++- meta/recipes-devtools/dpkg/dpkg_1.19.7.bb | 23 ---------------------- meta/recipes-devtools/dpkg/dpkg_1.20.0.bb | 23 ++++++++++++++++++++++ 3 files changed, 33 insertions(+), 24 deletions(-) delete mode 100644 meta/recipes-devtools/dpkg/dpkg_1.19.7.bb create mode 100644 meta/recipes-devtools/dpkg/dpkg_1.20.0.bb (limited to 'meta') 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.19.7.bb deleted file mode 100644 index 50fe54dee1..0000000000 --- a/meta/recipes-devtools/dpkg/dpkg_1.19.7.bb +++ /dev/null @@ -1,23 +0,0 @@ -require dpkg.inc -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -SRC_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/${BPN}_${PV}.tar.xz \ - file://noman.patch \ - file://remove-tar-no-timestamp.patch \ - file://arch_pm.patch \ - file://add_armeb_triplet_entry.patch \ - file://0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch \ - file://0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch \ - file://0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch \ - file://0006-add-musleabi-to-known-target-tripets.patch \ - file://0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch \ - file://0001-dpkg-Support-muslx32-build.patch \ - 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] = "60f57c5494e6dfa177504d47bfa0e383" -SRC_URI[sha256sum] = "4c27fededf620c0aa522fff1a48577ba08144445341257502e7730f2b1a296e8" diff --git a/meta/recipes-devtools/dpkg/dpkg_1.20.0.bb b/meta/recipes-devtools/dpkg/dpkg_1.20.0.bb new file mode 100644 index 0000000000..1e822bbdf5 --- /dev/null +++ b/meta/recipes-devtools/dpkg/dpkg_1.20.0.bb @@ -0,0 +1,23 @@ +require dpkg.inc +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/${BPN}_${PV}.tar.xz \ + file://noman.patch \ + file://remove-tar-no-timestamp.patch \ + file://arch_pm.patch \ + file://add_armeb_triplet_entry.patch \ + file://0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch \ + file://0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch \ + file://0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch \ + file://0006-add-musleabi-to-known-target-tripets.patch \ + file://0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch \ + file://0001-dpkg-Support-muslx32-build.patch \ + 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" -- cgit v1.2.3-54-g00ecf