From 74bf12dacd715bcabc7c905026cc02b1a14dd430 Mon Sep 17 00:00:00 2001 From: wangmy Date: Wed, 16 Mar 2022 08:17:57 +0800 Subject: dpkg: upgrade 1.21.1 -> 1.21.2 The following patches refreshed for new version: 0001-build.c-ignore-return-of-1-from-tar-cf.patch 0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch 0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch 0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch noman.patch remove-tar-no-timestamp.patch (From OE-Core rev: d495c19b835e8e4c049b83e983487fc8de021499) Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- ...01-build.c-ignore-return-of-1-from-tar-cf.patch | 15 ++++++++----- ...tinsts-expect-D-to-be-set-when-running-in.patch | 26 +++++++++++----------- ...-function-doesn-t-work-properly-for-all-s.patch | 14 ++++++------ ...uild.c-Remove-usage-of-clamp-mtime-in-tar.patch | 18 +++++++-------- meta/recipes-devtools/dpkg/dpkg/noman.patch | 19 ++++++++-------- .../dpkg/dpkg/remove-tar-no-timestamp.patch | 17 +++++++++----- meta/recipes-devtools/dpkg/dpkg_1.21.1.bb | 23 ------------------- meta/recipes-devtools/dpkg/dpkg_1.21.2.bb | 23 +++++++++++++++++++ 8 files changed, 81 insertions(+), 74 deletions(-) delete mode 100644 meta/recipes-devtools/dpkg/dpkg_1.21.1.bb create mode 100644 meta/recipes-devtools/dpkg/dpkg_1.21.2.bb (limited to 'meta/recipes-devtools/dpkg') diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch b/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch index 4d3f238012..dc0d9bfc2e 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch @@ -1,4 +1,4 @@ -From cb47e9cd6735fcafd231748dab8884ae991b669c Mon Sep 17 00:00:00 2001 +From 839f228556c00739f72534e8635195935eb3752f Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 16 Jun 2020 03:57:25 +0000 Subject: [PATCH] build.c: ignore return of 1 from tar -cf @@ -25,13 +25,13 @@ Original patch by RP 2015/3/27, rebased by Paul Eggleton Signed-off-by: Paul Eggleton --- - dpkg-deb/build.c | 5 ++++- + src/deb/build.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c -index 76613adec..7c216d1a9 100644 ---- a/dpkg-deb/build.c -+++ b/dpkg-deb/build.c +diff --git a/src/deb/build.c b/src/deb/build.c +index 76613ad..7c216d1 100644 +--- a/src/deb/build.c ++++ b/src/deb/build.c @@ -482,6 +482,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, { int pipe_filenames[2], pipe_tarball[2]; @@ -51,3 +51,6 @@ index 76613adec..7c216d1a9 100644 } static intmax_t +-- +2.25.1 + diff --git a/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch b/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch index 9ca7262eb9..75ae848264 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch @@ -12,14 +12,14 @@ ALIMON 2016/05/26 ALIMON 2017/02/21 KKang 2019/02/20 --- - src/script.c | 53 +++------------------------------------------------- - 1 file changed, 3 insertions(+), 50 deletions(-) + src/main/script.c | 54 +++-------------------------------------------- + 1 file changed, 3 insertions(+), 51 deletions(-) -diff --git a/src/script.c b/src/script.c -index abe65b6f7..621ff9b27 100644 ---- a/src/script.c -+++ b/src/script.c -@@ -96,58 +96,11 @@ setexecute(const char *path, struct stat *stab) +diff --git a/src/main/script.c b/src/main/script.c +index abe65b6..0edb8f1 100644 +--- a/src/main/script.c ++++ b/src/main/script.c +@@ -96,58 +96,10 @@ setexecute(const char *path, struct stat *stab) static const char * maintscript_pre_exec(struct command *cmd) { @@ -49,9 +49,7 @@ index abe65b6f7..621ff9b27 100644 - "using --force-script-chrootless?")); - else if (rc) - ohshite(_("failed to chroot to '%.250s'"), instdir); -+ if (*instdir) { -+ setenv("D", instdir, 1); - } +- } - /* Switch to a known good directory to give the maintainer script - * a saner environment, also needed after the chroot(). */ - if (chdir(changedir)) @@ -68,19 +66,21 @@ index abe65b6f7..621ff9b27 100644 - debug(dbg_scripts, "fork/exec %s (%s )", cmd->filename, - args.buf); - varbuf_destroy(&args); -- } ++ if (*instdir) { ++ setenv("D", instdir, 1); + } - if (instdirlen == 0 || in_force(FORCE_SCRIPT_CHROOTLESS)) - return cmd->filename; - - if (strlen(cmd->filename) < instdirlen) - internerr("maintscript name '%s' length < instdir length %zd", - cmd->filename, instdirlen); - +- - return cmd->filename + instdirlen; + return cmd->filename; } /** -- -2.17.1 +2.25.1 diff --git a/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch b/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch index 56c85c7733..bbd5aba418 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch @@ -8,14 +8,14 @@ Signed-off-by: Constantin Musca Upstream-Status: Inappropriate [embedded specific] --- - src/archives.c | 3 ++- + src/main/archives.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/src/archives.c b/src/archives.c -index bff5f14..b711013 100644 ---- a/src/archives.c -+++ b/src/archives.c -@@ -449,8 +449,9 @@ tarobject_set_mtime(struct tar_entry *te, const char *path) +diff --git a/src/main/archives.c b/src/main/archives.c +index 92340b9..7a55c27 100644 +--- a/src/main/archives.c ++++ b/src/main/archives.c +@@ -490,8 +490,9 @@ tarobject_set_mtime(struct tar_entry *te, const char *path) if (te->type == TAR_FILETYPE_SYMLINK) { #ifdef HAVE_LUTIMES @@ -27,5 +27,5 @@ index bff5f14..b711013 100644 } else { if (utimes(path, tv)) -- -2.1.4 +2.25.1 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 4f79a40d8b..117f9234ad 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 @@ -2,9 +2,6 @@ From 8659eeeeda74d71e12080121f0b13a88cbdda433 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= Date: Tue, 21 Feb 2017 11:23:27 -0600 Subject: [PATCH] dpkg-deb/build.c: Remove usage of --clamp-mtime in tar -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit Recently dpkg added --clamp-mtime to tar to create reproducible build tarballs [1]. @@ -23,14 +20,14 @@ Update patch context for dpkg 1.19.4. Signed-off-by: Kai Kang --- - dpkg-deb/build.c | 2 +- + src/deb/build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c -index 68d1875..053fcb7 100644 ---- a/dpkg-deb/build.c -+++ b/dpkg-deb/build.c -@@ -457,7 +457,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, +diff --git a/src/deb/build.c b/src/deb/build.c +index 5c74ff3..76613ad 100644 +--- a/src/deb/build.c ++++ b/src/deb/build.c +@@ -505,7 +505,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", @@ -40,4 +37,5 @@ index 68d1875..053fcb7 100644 if (options->mode) command_add_args(&cmd, "--mode", options->mode, NULL); -- -2.11.0 +2.25.1 + diff --git a/meta/recipes-devtools/dpkg/dpkg/noman.patch b/meta/recipes-devtools/dpkg/dpkg/noman.patch index a7f3cb8f45..6900716b11 100644 --- a/meta/recipes-devtools/dpkg/dpkg/noman.patch +++ b/meta/recipes-devtools/dpkg/dpkg/noman.patch @@ -1,22 +1,21 @@ Upstream-Status: Inappropriate [disable feature] --- - Makefile.am | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) + Makefile.am | 1 - + 1 file changed, 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index 0da52cb16..a1f79e0a2 100644 +index d963a10..7cef7f5 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -13,8 +13,7 @@ SUBDIRS = \ +@@ -11,7 +11,6 @@ SUBDIRS = \ $(MAYBE_DSELECT) \ scripts \ - t-func \ -- po \ -- man -+ po + po \ +- man \ + # EOL ACLOCAL_AMFLAGS = -I m4 - -- -2.11.0 +2.25.1 + diff --git a/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch b/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch index 4f408ff777..ebf838ffe9 100644 --- a/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch +++ b/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch @@ -3,11 +3,15 @@ busybox-1.19.4 tar utility doesn't support --warning=no-timestamp Signed-off-by: Constantin Musca Upstream-Status: Inappropriate [configuration] -Index: dpkg-1.17.1/dpkg-deb/extract.c -=================================================================== ---- dpkg-1.17.1.orig/dpkg-deb/extract.c -+++ dpkg-1.17.1/dpkg-deb/extract.c -@@ -318,7 +318,6 @@ extracthalf(const char *debar, const cha +--- + src/deb/extract.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/deb/extract.c b/src/deb/extract.c +index a1b2dc0..95e2372 100644 +--- a/src/deb/extract.c ++++ b/src/deb/extract.c +@@ -333,7 +333,6 @@ extracthalf(const char *debar, const char *dir, command_add_arg(&cmd, "-f"); command_add_arg(&cmd, "-"); @@ -15,3 +19,6 @@ Index: dpkg-1.17.1/dpkg-deb/extract.c m_dup2(p2[0],0); close(p2[0]); +-- +2.25.1 + diff --git a/meta/recipes-devtools/dpkg/dpkg_1.21.1.bb b/meta/recipes-devtools/dpkg/dpkg_1.21.1.bb deleted file mode 100644 index ccb4f06d32..0000000000 --- a/meta/recipes-devtools/dpkg/dpkg_1.21.1.bb +++ /dev/null @@ -1,23 +0,0 @@ -require dpkg.inc -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=main \ - 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://0001-build.c-ignore-return-of-1-from-tar-cf.patch" - -SRCREV = "9b52f8fa74571049d868cb2af0643ee7f89a6151" - -S = "${WORKDIR}/git" diff --git a/meta/recipes-devtools/dpkg/dpkg_1.21.2.bb b/meta/recipes-devtools/dpkg/dpkg_1.21.2.bb new file mode 100644 index 0000000000..ef2e06ee4a --- /dev/null +++ b/meta/recipes-devtools/dpkg/dpkg_1.21.2.bb @@ -0,0 +1,23 @@ +require dpkg.inc +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=main \ + 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://0001-build.c-ignore-return-of-1-from-tar-cf.patch" + +SRCREV = "a9580d3aec5f487a81664a462ec70ec1993f19f8" + +S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf