Re: [OE-core] [PATCH 8/8] rpm: update 4.18.1 -> 4.19.1
0257:file = file.replace("%", "")
*** 0258:attr = get_attr(file)
...
*** 0203:stat_f = os.stat(rootpath + "/" + path,
follow_symlinks=False)
Exception: FileNotFoundError: [Errno 2] No such file or directory:
'/home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/nodejs/20.8.1/packages-split/nodejs-ptest/usr/lib/nodejs/ptest/test/fixtures/es-modules/test-esm-double-encoding-native20.mjs'
Seems like 257 and 258 should be swapped. No idea what that %
replacement is for.
Alex
On Sun, 28 Jan 2024 at 17:54, Khem Raj wrote:
>
> I am seeing some failures in meta-oe ( especially nodejs ) which I
> suspect are due to rpm upgrade and patches around it.
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/3566/steps/15/logs/stdio
>
> On Fri, Jan 26, 2024 at 5:35 AM Alexander Kanavin
> wrote:
> >
> > Upstream has replaced autoconf with cmake, which necessitates a rewrite of
> > the
> > recipe and available options, and a rebase to cmake of
> > 0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch
> >
> > Correct a mistake in 0001-Do-not-read-config-files-from-HOME.patch :
> > the patch was removing the NULL marker at the end of function arguments,
> > and 0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch
> > was restoring it (in addition to the actual change the patch was making).
> > Now both patches preserve the NULL terminator.
> >
> > Signed-off-by: Alexander Kanavin
> > ---
> > ...olor-setting-for-mips64_n32-binaries.patch | 12 +--
> > ...ook-for-lua-with-pkg-config-rather-t.patch | 28 +++
> > ...estore-readline-support-as-an-explic.patch | 42 +++
> > ...satisfiable-dependency-when-building.patch | 12 +--
> > ...lib-rpm-as-the-installation-path-for.patch | 52 +
> > ...1-Do-not-read-config-files-from-HOME.patch | 19 ++---
> > ...-PATH-environment-variable-before-ru.patch | 12 +--
> > ...lename-before-passing-it-to-basename.patch | 40 --
> > ...ix-missing-basename-include-on-macOS.patch | 26 ---
> > ...l-dependency-on-non-POSIX-GLOB_ONLYD.patch | 56 ++
> > ...lling-execute-package-scriptlets-wit.patch | 24 ++
> > ...not-insert-payloadflags-into-.rpm-me.patch | 13 ++--
> > ...-linux-gnux32-variant-to-triplet-han.patch | 28 ---
> > c-fix-file-conflicts-for-MIPS64-N32.patch | 13 ++--
> > .../files/0001-perl-disable-auto-reqs.patch | 26 ---
> > ...y_hash_t-instead-of-long-in-hdr_hash.patch | 35 -
> > ...prefixing-etc-from-RPM_ETCCONFIGDIR-.patch | 31
> > ...txt-do-not-install-non-existent-docs.patch | 26 +++
> > ...avoid-using-GLOB_BRACE-if-undefined-.patch | 34 +
> > ...ge-logging-level-around-scriptlets-t.patch | 19 ++---
> > ...87cfcf9cac87e5bc5e7db79b0338da9e355e.patch | 51 -
> > .../rpm/files/fix-declaration.patch | 39 --
> > .../rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} | 73 ---
> > 23 files changed, 328 insertions(+), 383 deletions(-)
> > create mode 100644
> > meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch
> > create mode 100644
> > meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch
> > delete mode 100644
> > meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch
> > delete mode 100644
> > meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch
> > create mode 100644
> > meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch
> > delete mode 100644
> > meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch
> > delete mode 100644
> > meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch
> > create mode 100644
> > meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch
> > create mode 100644
> > meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch
> > delete mode 100644
> > meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch
> > delete mode 100644 meta/recipes-devtools/rpm/files/fix-declaration.patch
> > rename meta/recipes-devtools/rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} (72%)
> >
> > diff --git
> > a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch
> >
> > b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch
> > index 9fa486dfd3c..96fe57dfeb8 100644
> > ---
> > a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch
> > +++
> > b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch
> > @@ -1,4 +1,4 @@
> > -From 93f219df68f3741ff63a294a16bcbe8deba1112f Mon Sep 17
Re: [OE-core] [PATCH 8/8] rpm: update 4.18.1 -> 4.19.1
I am seeing some failures in meta-oe ( especially nodejs ) which I
suspect are due to rpm upgrade and patches around it.
https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/3566/steps/15/logs/stdio
On Fri, Jan 26, 2024 at 5:35 AM Alexander Kanavin
wrote:
>
> Upstream has replaced autoconf with cmake, which necessitates a rewrite of the
> recipe and available options, and a rebase to cmake of
> 0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch
>
> Correct a mistake in 0001-Do-not-read-config-files-from-HOME.patch :
> the patch was removing the NULL marker at the end of function arguments,
> and 0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch
> was restoring it (in addition to the actual change the patch was making).
> Now both patches preserve the NULL terminator.
>
> Signed-off-by: Alexander Kanavin
> ---
> ...olor-setting-for-mips64_n32-binaries.patch | 12 +--
> ...ook-for-lua-with-pkg-config-rather-t.patch | 28 +++
> ...estore-readline-support-as-an-explic.patch | 42 +++
> ...satisfiable-dependency-when-building.patch | 12 +--
> ...lib-rpm-as-the-installation-path-for.patch | 52 +
> ...1-Do-not-read-config-files-from-HOME.patch | 19 ++---
> ...-PATH-environment-variable-before-ru.patch | 12 +--
> ...lename-before-passing-it-to-basename.patch | 40 --
> ...ix-missing-basename-include-on-macOS.patch | 26 ---
> ...l-dependency-on-non-POSIX-GLOB_ONLYD.patch | 56 ++
> ...lling-execute-package-scriptlets-wit.patch | 24 ++
> ...not-insert-payloadflags-into-.rpm-me.patch | 13 ++--
> ...-linux-gnux32-variant-to-triplet-han.patch | 28 ---
> c-fix-file-conflicts-for-MIPS64-N32.patch | 13 ++--
> .../files/0001-perl-disable-auto-reqs.patch | 26 ---
> ...y_hash_t-instead-of-long-in-hdr_hash.patch | 35 -
> ...prefixing-etc-from-RPM_ETCCONFIGDIR-.patch | 31
> ...txt-do-not-install-non-existent-docs.patch | 26 +++
> ...avoid-using-GLOB_BRACE-if-undefined-.patch | 34 +
> ...ge-logging-level-around-scriptlets-t.patch | 19 ++---
> ...87cfcf9cac87e5bc5e7db79b0338da9e355e.patch | 51 -
> .../rpm/files/fix-declaration.patch | 39 --
> .../rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} | 73 ---
> 23 files changed, 328 insertions(+), 383 deletions(-)
> create mode 100644
> meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch
> create mode 100644
> meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch
> delete mode 100644
> meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch
> delete mode 100644
> meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch
> create mode 100644
> meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch
> delete mode 100644
> meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch
> delete mode 100644
> meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch
> create mode 100644
> meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch
> create mode 100644
> meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch
> delete mode 100644
> meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch
> delete mode 100644 meta/recipes-devtools/rpm/files/fix-declaration.patch
> rename meta/recipes-devtools/rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} (72%)
>
> diff --git
> a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch
>
> b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch
> index 9fa486dfd3c..96fe57dfeb8 100644
> ---
> a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch
> +++
> b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch
> @@ -1,4 +1,4 @@
> -From 93f219df68f3741ff63a294a16bcbe8deba1112f Mon Sep 17 00:00:00 2001
> +From ecc45e3ae837ab50603088dcc8fd2f8e67a7ece6 Mon Sep 17 00:00:00 2001
> From: Alexander Kanavin
> Date: Thu, 9 Mar 2017 18:54:02 +0200
> Subject: [PATCH] Add a color setting for mips64_n32 binaries
> @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin
> 2 files changed, 6 insertions(+)
>
> diff --git a/build/rpmfc.c b/build/rpmfc.c
> -index 26606378f..a16e3f4e9 100644
> +index 4b67a9bae..ed7e4e623 100644
> --- a/build/rpmfc.c
> +++ b/build/rpmfc.c
> -@@ -646,6 +646,7 @@ exit:
> +@@ -660,6 +660,7 @@ exit:
> static const struct rpmfcTokens_s rpmfcTokens[] = {
> { "directory", RPMFC_INCLUDE },
>
> @@ -23,7 +23,7 @@ index 26606378f..a16e3f4e9 100644
> { "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE },
> { "ELF 64-bit",
[OE-core] [PATCH 8/8] rpm: update 4.18.1 -> 4.19.1
Upstream has replaced autoconf with cmake, which necessitates a rewrite of the
recipe and available options, and a rebase to cmake of
0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch
Correct a mistake in 0001-Do-not-read-config-files-from-HOME.patch :
the patch was removing the NULL marker at the end of function arguments,
and 0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch
was restoring it (in addition to the actual change the patch was making).
Now both patches preserve the NULL terminator.
Signed-off-by: Alexander Kanavin
---
...olor-setting-for-mips64_n32-binaries.patch | 12 +--
...ook-for-lua-with-pkg-config-rather-t.patch | 28 +++
...estore-readline-support-as-an-explic.patch | 42 +++
...satisfiable-dependency-when-building.patch | 12 +--
...lib-rpm-as-the-installation-path-for.patch | 52 +
...1-Do-not-read-config-files-from-HOME.patch | 19 ++---
...-PATH-environment-variable-before-ru.patch | 12 +--
...lename-before-passing-it-to-basename.patch | 40 --
...ix-missing-basename-include-on-macOS.patch | 26 ---
...l-dependency-on-non-POSIX-GLOB_ONLYD.patch | 56 ++
...lling-execute-package-scriptlets-wit.patch | 24 ++
...not-insert-payloadflags-into-.rpm-me.patch | 13 ++--
...-linux-gnux32-variant-to-triplet-han.patch | 28 ---
c-fix-file-conflicts-for-MIPS64-N32.patch | 13 ++--
.../files/0001-perl-disable-auto-reqs.patch | 26 ---
...y_hash_t-instead-of-long-in-hdr_hash.patch | 35 -
...prefixing-etc-from-RPM_ETCCONFIGDIR-.patch | 31
...txt-do-not-install-non-existent-docs.patch | 26 +++
...avoid-using-GLOB_BRACE-if-undefined-.patch | 34 +
...ge-logging-level-around-scriptlets-t.patch | 19 ++---
...87cfcf9cac87e5bc5e7db79b0338da9e355e.patch | 51 -
.../rpm/files/fix-declaration.patch | 39 --
.../rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} | 73 ---
23 files changed, 328 insertions(+), 383 deletions(-)
create mode 100644
meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch
create mode 100644
meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch
delete mode 100644
meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch
delete mode 100644
meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch
create mode 100644
meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch
delete mode 100644
meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch
delete mode 100644
meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch
create mode 100644
meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch
create mode 100644
meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch
delete mode 100644
meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch
delete mode 100644 meta/recipes-devtools/rpm/files/fix-declaration.patch
rename meta/recipes-devtools/rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} (72%)
diff --git
a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch
b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch
index 9fa486dfd3c..96fe57dfeb8 100644
---
a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch
+++
b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch
@@ -1,4 +1,4 @@
-From 93f219df68f3741ff63a294a16bcbe8deba1112f Mon Sep 17 00:00:00 2001
+From ecc45e3ae837ab50603088dcc8fd2f8e67a7ece6 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin
Date: Thu, 9 Mar 2017 18:54:02 +0200
Subject: [PATCH] Add a color setting for mips64_n32 binaries
@@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin
2 files changed, 6 insertions(+)
diff --git a/build/rpmfc.c b/build/rpmfc.c
-index 26606378f..a16e3f4e9 100644
+index 4b67a9bae..ed7e4e623 100644
--- a/build/rpmfc.c
+++ b/build/rpmfc.c
-@@ -646,6 +646,7 @@ exit:
+@@ -660,6 +660,7 @@ exit:
static const struct rpmfcTokens_s rpmfcTokens[] = {
{ "directory", RPMFC_INCLUDE },
@@ -23,7 +23,7 @@ index 26606378f..a16e3f4e9 100644
{ "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE },
{ "ELF 64-bit", RPMFC_ELF64|RPMFC_INCLUDE },
-@@ -1151,6 +1152,9 @@ static uint32_t getElfColor(const char *fn)
+@@ -1158,6 +1159,9 @@ static uint32_t getElfColor(const char *fn)
color = RPMFC_ELF32;
break;
}
@@ -34,10 +34,10 @@ index 26606378f..a16e3f4e9 100644
if (elf)
elf_end(elf);
diff --git a/rpmrc.in b/rpmrc.in
-index 2975a3a0e..c7232b48b 100644
+index 8646a966b..7349fdfd3
