* [OE-core] [PATCH] createrepo-c: upgrade 0.18.0 -> 0.19.0
@ 2022-03-15 10:51 Wang Mingyu
2022-03-15 10:51 ` [OE-core] [PATCH] dnf: upgrade 4.10.0 -> 4.11.1 Wang Mingyu
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Wang Mingyu @ 2022-03-15 10:51 UTC (permalink / raw)
To: openembedded-core; +Cc: Wang Mingyu
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
.../{createrepo-c_0.18.0.bb => createrepo-c_0.19.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/createrepo-c/{createrepo-c_0.18.0.bb => createrepo-c_0.19.0.bb} (96%)
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.18.0.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_0.19.0.bb
similarity index 96%
rename from meta/recipes-devtools/createrepo-c/createrepo-c_0.18.0.bb
rename to meta/recipes-devtools/createrepo-c/createrepo-c_0.19.0.bb
index 1122114031..82351252e5 100644
--- a/meta/recipes-devtools/createrepo-c/createrepo-c_0.18.0.bb
+++ b/meta/recipes-devtools/createrepo-c/createrepo-c_0.19.0.bb
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c;branch=master;p
file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
"
-SRCREV = "09ea861c8ef11927de5a276116ecb83ab8e93462"
+SRCREV = "a531ee881a8f1d9273b4383fb9fa604c56fff138"
S = "${WORKDIR}/git"
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [OE-core] [PATCH] dnf: upgrade 4.10.0 -> 4.11.1
2022-03-15 10:51 [OE-core] [PATCH] createrepo-c: upgrade 0.18.0 -> 0.19.0 Wang Mingyu
@ 2022-03-15 10:51 ` Wang Mingyu
2022-03-15 10:51 ` [OE-core] [PATCH] dpkg: upgrade 1.21.1 -> 1.21.2 Wang Mingyu
2022-03-15 10:51 ` [OE-core] [PATCH] harfbuzz: upgrade 4.0.0 -> 4.0.1 Wang Mingyu
2 siblings, 0 replies; 5+ messages in thread
From: Wang Mingyu @ 2022-03-15 10:51 UTC (permalink / raw)
To: openembedded-core; +Cc: Wang Mingyu
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
meta/recipes-devtools/dnf/{dnf_4.10.0.bb => dnf_4.11.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/dnf/{dnf_4.10.0.bb => dnf_4.11.1.bb} (98%)
diff --git a/meta/recipes-devtools/dnf/dnf_4.10.0.bb b/meta/recipes-devtools/dnf/dnf_4.11.1.bb
similarity index 98%
rename from meta/recipes-devtools/dnf/dnf_4.10.0.bb
rename to meta/recipes-devtools/dnf/dnf_4.11.1.bb
index f16e716b0d..00eed0ce96 100644
--- a/meta/recipes-devtools/dnf/dnf_4.10.0.bb
+++ b/meta/recipes-devtools/dnf/dnf_4.11.1.bb
@@ -18,7 +18,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git;branch=master;protoc
file://0001-dnf-write-the-log-lock-to-root.patch \
"
-SRCREV = "bd691b784f2158e633072d368579898d740e4347"
+SRCREV = "fba1e2ec93f3d045a874567fd7ecafd606346509"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
S = "${WORKDIR}/git"
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [OE-core] [PATCH] dpkg: upgrade 1.21.1 -> 1.21.2
2022-03-15 10:51 [OE-core] [PATCH] createrepo-c: upgrade 0.18.0 -> 0.19.0 Wang Mingyu
2022-03-15 10:51 ` [OE-core] [PATCH] dnf: upgrade 4.10.0 -> 4.11.1 Wang Mingyu
@ 2022-03-15 10:51 ` Wang Mingyu
2022-03-15 14:43 ` Richard Purdie
2022-03-15 10:51 ` [OE-core] [PATCH] harfbuzz: upgrade 4.0.0 -> 4.0.1 Wang Mingyu
2 siblings, 1 reply; 5+ messages in thread
From: Wang Mingyu @ 2022-03-15 10:51 UTC (permalink / raw)
To: openembedded-core; +Cc: Wang Mingyu
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
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
...ild.c-ignore-return-of-1-from-tar-cf.patch | 2 +-
...s-expect-D-to-be-set-when-running-in.patch | 26 +++++++++----------
...tion-doesn-t-work-properly-for-all-s.patch | 14 +++++-----
...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 ++++++++----
.../dpkg/{dpkg_1.21.1.bb => dpkg_1.21.2.bb} | 2 +-
7 files changed, 51 insertions(+), 47 deletions(-)
rename meta/recipes-devtools/dpkg/{dpkg_1.21.1.bb => dpkg_1.21.2.bb} (95%)
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..fb99bc43ba 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 <paul.eggleton@linux.microsoft.com>
Date: Tue, 16 Jun 2020 03:57:25 +0000
Subject: [PATCH] build.c: ignore return of 1 from tar -cf
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 <constantinx.musca@intel.com>
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?= <anibal.limon@linux.intel.com>
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 <kai.kang@windriver.com>
---
- 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 <constantinx.musca@intel.com>
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.2.bb
similarity index 95%
rename from meta/recipes-devtools/dpkg/dpkg_1.21.1.bb
rename to meta/recipes-devtools/dpkg/dpkg_1.21.2.bb
index ccb4f06d32..ef2e06ee4a 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.21.1.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.21.2.bb
@@ -18,6 +18,6 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=main
SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch"
-SRCREV = "9b52f8fa74571049d868cb2af0643ee7f89a6151"
+SRCREV = "a9580d3aec5f487a81664a462ec70ec1993f19f8"
S = "${WORKDIR}/git"
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [OE-core] [PATCH] harfbuzz: upgrade 4.0.0 -> 4.0.1
2022-03-15 10:51 [OE-core] [PATCH] createrepo-c: upgrade 0.18.0 -> 0.19.0 Wang Mingyu
2022-03-15 10:51 ` [OE-core] [PATCH] dnf: upgrade 4.10.0 -> 4.11.1 Wang Mingyu
2022-03-15 10:51 ` [OE-core] [PATCH] dpkg: upgrade 1.21.1 -> 1.21.2 Wang Mingyu
@ 2022-03-15 10:51 ` Wang Mingyu
2 siblings, 0 replies; 5+ messages in thread
From: Wang Mingyu @ 2022-03-15 10:51 UTC (permalink / raw)
To: openembedded-core; +Cc: Wang Mingyu
Changelog:
=========
- Update OpenType to AAT mappings for hist and vrtr features.
- Update IANA Language Subtag Registry to 2022-03-02.
- Update USE shaper to allow any non-numeric tail in a symbol cluster, and remove
obsolete data overrides.
- Fix handling of baseline variations to return correctly scaled values.
- A new experimental hb_subset_repack_or_fail() to repack an array of objects,
eliminating offset overflows. The API is not available unless HarfBuzz is
built with experimental APIs enabled.
- New experimental API
+hb_link_t
+hb_object_t
+hb_subset_repack_or_fail()
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
.../harfbuzz/{harfbuzz_4.0.0.bb => harfbuzz_4.0.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-graphics/harfbuzz/{harfbuzz_4.0.0.bb => harfbuzz_4.0.1.bb} (95%)
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_4.0.0.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_4.0.1.bb
similarity index 95%
rename from meta/recipes-graphics/harfbuzz/harfbuzz_4.0.0.bb
rename to meta/recipes-graphics/harfbuzz/harfbuzz_4.0.1.bb
index 39146ade66..bf77a5e56c 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_4.0.0.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_4.0.1.bb
@@ -12,7 +12,7 @@ UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
UPSTREAM_CHECK_REGEX = "harfbuzz-(?P<pver>\d+(\.\d+)+).tar"
SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "ab61d4e3fc0c30072e98b46aa7727fc3eed36a85d2b6b9274cec7eaadea97cb7"
+SRC_URI[sha256sum] = "98f68777272db6cd7a3d5152bac75083cd52a26176d87bc04c8b3929d33bce49"
inherit meson pkgconfig lib_package gtk-doc gobject-introspection
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [OE-core] [PATCH] dpkg: upgrade 1.21.1 -> 1.21.2
2022-03-15 10:51 ` [OE-core] [PATCH] dpkg: upgrade 1.21.1 -> 1.21.2 Wang Mingyu
@ 2022-03-15 14:43 ` Richard Purdie
0 siblings, 0 replies; 5+ messages in thread
From: Richard Purdie @ 2022-03-15 14:43 UTC (permalink / raw)
To: wangmy, openembedded-core
On Tue, 2022-03-15 at 18:51 +0800, wangmy wrote:
> 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
>
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> ---
> ...ild.c-ignore-return-of-1-from-tar-cf.patch | 2 +-
> ...s-expect-D-to-be-set-when-running-in.patch | 26 +++++++++----------
> ...tion-doesn-t-work-properly-for-all-s.patch | 14 +++++-----
> ...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 ++++++++----
> .../dpkg/{dpkg_1.21.1.bb => dpkg_1.21.2.bb} | 2 +-
> 7 files changed, 51 insertions(+), 47 deletions(-)
> rename meta/recipes-devtools/dpkg/{dpkg_1.21.1.bb => dpkg_1.21.2.bb} (95%)
>
> 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..fb99bc43ba 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 <paul.eggleton@linux.microsoft.com>
> Date: Tue, 16 Jun 2020 03:57:25 +0000
> Subject: [PATCH] build.c: ignore return of 1 from tar -cf
> 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 <constantinx.musca@intel.com>
>
> 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?= <anibal.limon@linux.intel.com>
> 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 <kai.kang@windriver.com>
> ---
> - 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 <constantinx.musca@intel.com>
>
> 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.2.bb
> similarity index 95%
> rename from meta/recipes-devtools/dpkg/dpkg_1.21.1.bb
> rename to meta/recipes-devtools/dpkg/dpkg_1.21.2.bb
> index ccb4f06d32..ef2e06ee4a 100644
> --- a/meta/recipes-devtools/dpkg/dpkg_1.21.1.bb
> +++ b/meta/recipes-devtools/dpkg/dpkg_1.21.2.bb
> @@ -18,6 +18,6 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=main
>
> SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch"
>
> -SRCREV = "9b52f8fa74571049d868cb2af0643ee7f89a6151"
> +SRCREV = "a9580d3aec5f487a81664a462ec70ec1993f19f8"
>
> S = "${WORKDIR}/git"
Seems to break for dpkg-native:
https://autobuilder.yoctoproject.org/typhoon/#/builders/20/builds/5235/steps/11/logs/stdio
(and other similar build failures)
Cheers,
Richard
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-03-15 14:43 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-15 10:51 [OE-core] [PATCH] createrepo-c: upgrade 0.18.0 -> 0.19.0 Wang Mingyu
2022-03-15 10:51 ` [OE-core] [PATCH] dnf: upgrade 4.10.0 -> 4.11.1 Wang Mingyu
2022-03-15 10:51 ` [OE-core] [PATCH] dpkg: upgrade 1.21.1 -> 1.21.2 Wang Mingyu
2022-03-15 14:43 ` Richard Purdie
2022-03-15 10:51 ` [OE-core] [PATCH] harfbuzz: upgrade 4.0.0 -> 4.0.1 Wang Mingyu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.