[PATCH 0/2] Upgrade automake and rpm

[PATCH 0/2] Upgrade automake and rpm

[liezhi.yang]

From: Robert Yang <liezhi.yang@windriver.com>

The following changes since commit 2e817e6e4d53543766b935479b148a1950cc37c8:

  oeqa/maturin/guessing-game: Bump dependencies to avoid security warning (2025-06-04 08:08:28 +0100)

are available in the Git repository at:

  https://github.com/robertlinux/yocto rbt/upgrade2
  https://github.com/robertlinux/yocto/tree/rbt/upgrade2

Robert Yang (2):
  automake: 1.17 -> 1.18
  rpm: 4.20.0 -> 4.20.1

 ...report-error-when-the-path-of-Perl-c.patch | 27 +++++----
 .../{automake_1.17.bb => automake_1.18.bb}    |  2 +-
 ...LUGINDIR-in-top-level-CMakeLists.txt.patch | 57 -------------------
 ...lling-execute-package-scriptlets-wit.patch | 24 ++++----
 ...ge-logging-level-around-scriptlets-t.patch | 27 +++++----
 .../rpm/{rpm_4.20.0.bb => rpm_4.20.1.bb}      |  5 +-
 6 files changed, 47 insertions(+), 95 deletions(-)
 rename meta/recipes-devtools/automake/{automake_1.17.bb => automake_1.18.bb} (92%)
 delete mode 100644 meta/recipes-devtools/rpm/files/0001-Set-RPM_PLUGINDIR-in-top-level-CMakeLists.txt.patch
 rename meta/recipes-devtools/rpm/{rpm_4.20.0.bb => rpm_4.20.1.bb} (97%)

-- 
2.49.0

[PATCH 1/2] automake: 1.17 -> 1.18

[liezhi.yang]

From: Robert Yang <liezhi.yang@windriver.com>

* Rebased 0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch
  The previous patch added a ':' before the line to make it not run, but now
  there are multiple lines, so just remove them.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 ...report-error-when-the-path-of-Perl-c.patch | 27 +++++++++++--------
 .../{automake_1.17.bb => automake_1.18.bb}    |  2 +-
 2 files changed, 17 insertions(+), 12 deletions(-)
 rename meta/recipes-devtools/automake/{automake_1.17.bb => automake_1.18.bb} (92%)

diff --git a/meta/recipes-devtools/automake/automake/0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch b/meta/recipes-devtools/automake/automake/0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch
index 5a38feb16c..fd6d8affaa 100644
--- a/meta/recipes-devtools/automake/automake/0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch
+++ b/meta/recipes-devtools/automake/automake/0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch
@@ -13,22 +13,27 @@ Upstream-Status: Inappropriate [ oe-specific ]
 
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
 ---
- configure | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ configure |   10 ----------
+ 1 file changed, 10 deletions(-)
 
 diff --git a/configure b/configure
-index 45bf85a..68d3c7d 100755
+index 64b61eb..786aefd 100755
 --- a/configure
 +++ b/configure
-@@ -3514,7 +3514,7 @@ case $PERL in
+@@ -3776,16 +3776,6 @@ case $PERL in
     as_fn_error $? "perl not found" "$LINENO" 5
     ;;
   *' '* | *'	'*)
--  as_fn_error $? "The path to your Perl contains spaces or tabs.
-+  : as_fn_error $? "The path to your Perl contains spaces or tabs.
- This would cause build failures later or unusable programs.
- Please use a path without spaces and try again." "$LINENO" 5
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: The path to your Perl contains spaces or tabs.
+-This will likely cause build failures later or unusable programs.
+-Unless you're specifying a full string for a #! line,
+-as in \"/usr/bin/env perl\",
+-please use a path without spaces and try again." >&5
+-printf "%s\n" "$as_me: WARNING: The path to your Perl contains spaces or tabs.
+-This will likely cause build failures later or unusable programs.
+-Unless you're specifying a full string for a #! line,
+-as in \"/usr/bin/env perl\",
+-please use a path without spaces and try again." >&2;}
    ;;
--- 
-2.25.1
-
+ esac
+ 
diff --git a/meta/recipes-devtools/automake/automake_1.17.bb b/meta/recipes-devtools/automake/automake_1.18.bb
similarity index 92%
rename from meta/recipes-devtools/automake/automake_1.17.bb
rename to meta/recipes-devtools/automake/automake_1.18.bb
index 4cda04e47b..9179268c7a 100644
--- a/meta/recipes-devtools/automake/automake_1.17.bb
+++ b/meta/recipes-devtools/automake/automake_1.18.bb
@@ -25,7 +25,7 @@ SRC_URI += "\
            file://0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch \
            "
 
-SRC_URI[sha256sum] = "397767d4db3018dd4440825b60c64258b636eaf6bf99ac8b0897f06c89310acd"
+SRC_URI[sha256sum] = "af6043a5d4b3beef0c48161f4a6936259321cd101a34c1ab0768328515626c8a"
 
 PERL = "${USRBINPATH}/perl"
 PERL:class-native = "${USRBINPATH}/env perl"
-- 
2.49.0

Re: [OE-core] [PATCH 1/2] automake: 1.17 -> 1.18

[Richard Purdie]

On Wed, 2025-06-04 at 20:02 -0700, Robert Yang via lists.openembedded.org wrote:
> From: Robert Yang <liezhi.yang@windriver.com>
> 
> * Rebased 0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch
>   The previous patch added a ':' before the line to make it not run, but now
>   there are multiple lines, so just remove them.
> 
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>  ...report-error-when-the-path-of-Perl-c.patch | 27 +++++++++++--------
>  .../{automake_1.17.bb => automake_1.18.bb}    |  2 +-
>  2 files changed, 17 insertions(+), 12 deletions(-)
>  rename meta/recipes-devtools/automake/{automake_1.17.bb => automake_1.18.bb} (92%)
> 
> diff --git a/meta/recipes-devtools/automake/automake/0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch b/meta/recipes-devtools/automake/automake/0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch
> index 5a38feb16c..fd6d8affaa 100644
> --- a/meta/recipes-devtools/automake/automake/0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch
> +++ b/meta/recipes-devtools/automake/automake/0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch
> @@ -13,22 +13,27 @@ Upstream-Status: Inappropriate [ oe-specific ]
>  
>  Signed-off-by: Changqing Li <changqing.li@windriver.com>
>  ---
> - configure | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> + configure |   10 ----------
> + 1 file changed, 10 deletions(-)
>  
>  diff --git a/configure b/configure
> -index 45bf85a..68d3c7d 100755
> +index 64b61eb..786aefd 100755
>  --- a/configure
>  +++ b/configure
> -@@ -3514,7 +3514,7 @@ case $PERL in
> +@@ -3776,16 +3776,6 @@ case $PERL in
>      as_fn_error $? "perl not found" "$LINENO" 5
>      ;;
>    *' '* | *'	'*)
> --  as_fn_error $? "The path to your Perl contains spaces or tabs.
> -+  : as_fn_error $? "The path to your Perl contains spaces or tabs.
> - This would cause build failures later or unusable programs.
> - Please use a path without spaces and try again." "$LINENO" 5
> +-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: The path to your Perl contains spaces or tabs.
> +-This will likely cause build failures later or unusable programs.
> +-Unless you're specifying a full string for a #! line,
> +-as in \"/usr/bin/env perl\",
> +-please use a path without spaces and try again." >&5
> +-printf "%s\n" "$as_me: WARNING: The path to your Perl contains spaces or tabs.
> +-This will likely cause build failures later or unusable programs.
> +-Unless you're specifying a full string for a #! line,
> +-as in \"/usr/bin/env perl\",
> +-please use a path without spaces and try again." >&2;}
>     ;;
> --- 
> -2.25.1
> -
> + esac
> + 
> diff --git a/meta/recipes-devtools/automake/automake_1.17.bb b/meta/recipes-devtools/automake/automake_1.18.bb
> similarity index 92%
> rename from meta/recipes-devtools/automake/automake_1.17.bb
> rename to meta/recipes-devtools/automake/automake_1.18.bb
> index 4cda04e47b..9179268c7a 100644
> --- a/meta/recipes-devtools/automake/automake_1.17.bb
> +++ b/meta/recipes-devtools/automake/automake_1.18.bb
> @@ -25,7 +25,7 @@ SRC_URI += "\
>             file://0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch \
>             "
>  
> -SRC_URI[sha256sum] = "397767d4db3018dd4440825b60c64258b636eaf6bf99ac8b0897f06c89310acd"
> +SRC_URI[sha256sum] = "af6043a5d4b3beef0c48161f4a6936259321cd101a34c1ab0768328515626c8a"
>  
>  PERL = "${USRBINPATH}/perl"
>  PERL:class-native = "${USRBINPATH}/env perl"

I think, but am not 100% sure, this resulted in:

https://autobuilder.yoctoproject.org/valkyrie/#/builders/17/builds/1630

That build has documentation in DISTRO_FEATURES.

Cheers,

Richard

Re: [OE-core] [PATCH 1/2] automake: 1.17 -> 1.18

[Robert Yang]

On 6/6/25 18:03, Richard Purdie wrote:
> On Wed, 2025-06-04 at 20:02 -0700, Robert Yang via lists.openembedded.org wrote:
>> From: Robert Yang <liezhi.yang@windriver.com>
>>
>> * Rebased 0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch
>>    The previous patch added a ':' before the line to make it not run, but now
>>    there are multiple lines, so just remove them.
>>
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> ---
>>   ...report-error-when-the-path-of-Perl-c.patch | 27 +++++++++++--------
>>   .../{automake_1.17.bb => automake_1.18.bb}    |  2 +-
>>   2 files changed, 17 insertions(+), 12 deletions(-)
>>   rename meta/recipes-devtools/automake/{automake_1.17.bb => automake_1.18.bb} (92%)
>>
>> diff --git a/meta/recipes-devtools/automake/automake/0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch b/meta/recipes-devtools/automake/automake/0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch
>> index 5a38feb16c..fd6d8affaa 100644
>> --- a/meta/recipes-devtools/automake/automake/0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch
>> +++ b/meta/recipes-devtools/automake/automake/0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch
>> @@ -13,22 +13,27 @@ Upstream-Status: Inappropriate [ oe-specific ]
>>   
>>   Signed-off-by: Changqing Li <changqing.li@windriver.com>
>>   ---
>> - configure | 2 +-
>> - 1 file changed, 1 insertion(+), 1 deletion(-)
>> + configure |   10 ----------
>> + 1 file changed, 10 deletions(-)
>>   
>>   diff --git a/configure b/configure
>> -index 45bf85a..68d3c7d 100755
>> +index 64b61eb..786aefd 100755
>>   --- a/configure
>>   +++ b/configure
>> -@@ -3514,7 +3514,7 @@ case $PERL in
>> +@@ -3776,16 +3776,6 @@ case $PERL in
>>       as_fn_error $? "perl not found" "$LINENO" 5
>>       ;;
>>     *' '* | *'	'*)
>> --  as_fn_error $? "The path to your Perl contains spaces or tabs.
>> -+  : as_fn_error $? "The path to your Perl contains spaces or tabs.
>> - This would cause build failures later or unusable programs.
>> - Please use a path without spaces and try again." "$LINENO" 5
>> +-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: The path to your Perl contains spaces or tabs.
>> +-This will likely cause build failures later or unusable programs.
>> +-Unless you're specifying a full string for a #! line,
>> +-as in \"/usr/bin/env perl\",
>> +-please use a path without spaces and try again." >&5
>> +-printf "%s\n" "$as_me: WARNING: The path to your Perl contains spaces or tabs.
>> +-This will likely cause build failures later or unusable programs.
>> +-Unless you're specifying a full string for a #! line,
>> +-as in \"/usr/bin/env perl\",
>> +-please use a path without spaces and try again." >&2;}
>>      ;;
>> ---
>> -2.25.1
>> -
>> + esac
>> +
>> diff --git a/meta/recipes-devtools/automake/automake_1.17.bb b/meta/recipes-devtools/automake/automake_1.18.bb
>> similarity index 92%
>> rename from meta/recipes-devtools/automake/automake_1.17.bb
>> rename to meta/recipes-devtools/automake/automake_1.18.bb
>> index 4cda04e47b..9179268c7a 100644
>> --- a/meta/recipes-devtools/automake/automake_1.17.bb
>> +++ b/meta/recipes-devtools/automake/automake_1.18.bb
>> @@ -25,7 +25,7 @@ SRC_URI += "\
>>              file://0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch \
>>              "
>>   
>> -SRC_URI[sha256sum] = "397767d4db3018dd4440825b60c64258b636eaf6bf99ac8b0897f06c89310acd"
>> +SRC_URI[sha256sum] = "af6043a5d4b3beef0c48161f4a6936259321cd101a34c1ab0768328515626c8a"
>>   
>>   PERL = "${USRBINPATH}/perl"
>>   PERL:class-native = "${USRBINPATH}/env perl"
> 
> I think, but am not 100% sure, this resulted in:

Sorry, it is broken by the automake upgrading patch when:

DISTRO_FEATURES:append = " api-documentation"

I have figured out the root cause and sent a pull request to upstream to fix it:

https://github.com/libcheck/check/pull/363

The automake before 1.17's mdate-sh couldn't update libcheck's
doc/version.texi, so the doc/check.info wasn't re-generated, then we couldn't
see the build error before.

I think this can also address Ross' question about rebuild libcheck failed
with automake 1.18, it is because doc/check.info wasn't re-generated
with automake 1.17, then we couldn't see the error.

And for other recipes' rebuild, I've done the testing with:
$ bitbake world
Edit autotools.bbclass to triger rebuild
$ bitbake world

All of them worked well.

I will send a V2 for it.

// Robert

> 
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/17/builds/1630
> 
> That build has documentation in DISTRO_FEATURES.
> 
> Cheers,
> 
> Richard

Re: [OE-core] [PATCH 1/2] automake: 1.17 -> 1.18

[Ross Burton]

On 5 Jun 2025, at 04:02, Robert Yang via lists.openembedded.org <liezhi.yang=windriver.com@lists.openembedded.org> wrote:
> 
> From: Robert Yang <liezhi.yang@windriver.com>
> 
> * Rebased 0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch
>  The previous patch added a ':' before the line to make it not run, but now
>  there are multiple lines, so just remove them.
> 

This patch can be dropped.

Also this introduces a change which breaks libcheck.

I’m still slightly dubious that this upgrade is behaving correctly on rebuilds of existing source trees (see my long discussion on the automake list), which is why I posted earlier that I have patches but am testing still.  As the failures are on rebuilds the autobuilder will never see them.

Ross

[PATCH 2/2] rpm: 4.20.0 -> 4.20.1

[liezhi.yang]

From: Robert Yang <liezhi.yang@windriver.com>

* Rebased:
  0001-When-cross-installing-execute-package-scriptlets-wit.patch
  0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch

* Removed the one which already merged:
  0001-Set-RPM_PLUGINDIR-in-top-level-CMakeLists.txt.patch

* License-Update: Minor formatting changes as the commit messages said in
  41143b27b6f7320f280aea6014e8f532eb0239d6

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 ...LUGINDIR-in-top-level-CMakeLists.txt.patch | 57 -------------------
 ...lling-execute-package-scriptlets-wit.patch | 24 ++++----
 ...ge-logging-level-around-scriptlets-t.patch | 27 +++++----
 .../rpm/{rpm_4.20.0.bb => rpm_4.20.1.bb}      |  5 +-
 4 files changed, 30 insertions(+), 83 deletions(-)
 delete mode 100644 meta/recipes-devtools/rpm/files/0001-Set-RPM_PLUGINDIR-in-top-level-CMakeLists.txt.patch
 rename meta/recipes-devtools/rpm/{rpm_4.20.0.bb => rpm_4.20.1.bb} (97%)

diff --git a/meta/recipes-devtools/rpm/files/0001-Set-RPM_PLUGINDIR-in-top-level-CMakeLists.txt.patch b/meta/recipes-devtools/rpm/files/0001-Set-RPM_PLUGINDIR-in-top-level-CMakeLists.txt.patch
deleted file mode 100644
index 5db69340ad..0000000000
--- a/meta/recipes-devtools/rpm/files/0001-Set-RPM_PLUGINDIR-in-top-level-CMakeLists.txt.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 2d6beb620896a59cfd685b51a19057e5c5c4ab41 Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Thu, 19 Dec 2024 11:54:54 +0800
-Subject: [PATCH] Set RPM_PLUGINDIR in top level CMakeLists.txt
-
-We have in macros.in:
-  %__plugindir          @RPM_PLUGINDIR@
-
-This means, if RPM_PLUGINDIR is not set, %__plugindir will be empty.
-This in turn results in error message when running 'dnf'.
-
-e.g.,
-dnf --help >/dev/null
-error: /usr/lib64/rpm/macros: line 1183: Macro %__plugindir has empty body
-error: /usr/lib64/rpm/macros: line 1183: Macro %__plugindir has empty body
-
-So we should move this directory setting into the top level CMakeLists.txt.
-
-Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/3496]
-
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
----
- CMakeLists.txt         | 3 +++
- plugins/CMakeLists.txt | 3 ---
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 758ba73f4..e694b9650 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -453,6 +453,9 @@ if (ENABLE_PYTHON)
- 	add_subdirectory(python)
- endif()
- 
-+set(RPM_PLUGINDIR ${CMAKE_INSTALL_FULL_LIBDIR}/rpm-plugins
-+       CACHE PATH "rpm plugin directory")
-+
- if (ENABLE_PLUGINS)
- 	add_subdirectory(plugins)
- endif()
-diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
-index a44056fe3..6e61a7c20 100644
---- a/plugins/CMakeLists.txt
-+++ b/plugins/CMakeLists.txt
-@@ -42,9 +42,6 @@ if (HAVE_UNSHARE)
- 	add_library(unshare MODULE unshare.c)
- endif()
- 
--set(RPM_PLUGINDIR ${CMAKE_INSTALL_FULL_LIBDIR}/rpm-plugins
--	CACHE PATH "rpm plugin directory")
--
- get_property(plugins DIRECTORY PROPERTY BUILDSYSTEM_TARGETS)
- foreach(plugin ${plugins})
- 	target_link_libraries(${plugin} PRIVATE librpmio librpm ${Intl_LIBRARIES})
--- 
-2.25.1
-
diff --git a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch
index fc6d7e0d29..b71156fe12 100644
--- a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch
+++ b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch
@@ -24,15 +24,18 @@ Amended 2018-07-03 by Olof Johansson <olofjn@axis.com>:
 
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
+Rebased to 4.20.1
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
 ---
- lib/rpmscript.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
+ lib/rpmscript.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/lib/rpmscript.c b/lib/rpmscript.c
-index 097c9055a..060fd8124 100644
+index eb14870b3..1785e8f30 100644
 --- a/lib/rpmscript.c
 +++ b/lib/rpmscript.c
-@@ -447,8 +447,7 @@ exit:
+@@ -456,8 +456,7 @@ exit:
  	Fclose(out);	/* XXX dup'd STDOUT_FILENO */
  
      if (fn) {
@@ -42,18 +45,17 @@ index 097c9055a..060fd8124 100644
  	free(fn);
      }
      free(mline);
-@@ -482,7 +481,13 @@ rpmRC rpmScriptRun(rpmScript script, int arg1, int arg2, FD_t scriptFd,
+@@ -491,7 +490,13 @@ rpmRC rpmScriptRun(rpmScript script, int arg1, int arg2, FD_t scriptFd,
  
      if (rc != RPMRC_FAIL) {
  	if (script_type & RPMSCRIPTLET_EXEC) {
--	    rc = runExtScript(plugins, prefixes, script->descr, lvl, scriptFd, &args, script->body, arg1, arg2, script->nextFileFunc);
 +	    if (getenv("RPM_NO_CHROOT_FOR_SCRIPTS") != NULL) {
-+		rpmChrootOut();
-+		rc = runExtScript(plugins, prefixes, script->descr, lvl, scriptFd, &args, script->body, arg1, arg2, script->nextFileFunc);
-+		rpmChrootIn();
++	    rpmChrootOut();
+ 	    rc = runExtScript(plugins, prefixes, script, lvl, scriptFd, &args, arg1, arg2);
++	    rpmChrootIn();
 +	    } else {
-+		rc = runExtScript(plugins, prefixes, script->descr, lvl, scriptFd, &args, script->body, arg1, arg2, script->nextFileFunc);
++	    rc = runExtScript(plugins, prefixes, script, lvl, scriptFd, &args, arg1, arg2);
 +	    }
  	} else {
- 	    rc = runLuaScript(plugins, prefixes, script->descr, lvl, scriptFd, &args, script->body, arg1, arg2, script->nextFileFunc);
+ 	    rc = runLuaScript(plugins, prefixes, script, lvl, scriptFd, &args, arg1, arg2);
  	}
diff --git a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch
index 278fa38bad..bac2d6331c 100644
--- a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch
+++ b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch
@@ -9,15 +9,18 @@ irrelevant noise to rootfs logs.
 
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
+Rebased to 4.20.1
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
 ---
  lib/rpmscript.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/lib/rpmscript.c b/lib/rpmscript.c
-index 4dc6466a8..6d3c19d01 100644
+index e9f288ae0..f0c628708 100644
 --- a/lib/rpmscript.c
 +++ b/lib/rpmscript.c
-@@ -290,7 +290,7 @@ static char * writeScript(const char *cmd, const char *script)
+@@ -299,7 +299,7 @@ static char * writeScript(const char *cmd, const char *script)
      if (Ferror(fd))
  	goto exit;
  
@@ -26,30 +29,30 @@ index 4dc6466a8..6d3c19d01 100644
  	static const char set_x[] = "set -x\n";
  	/* Assume failures will be caught by the write below */
  	Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd);
-@@ -322,7 +322,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes,
+@@ -330,7 +330,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes,
      char *mline = NULL;
      rpmRC rc = RPMRC_FAIL;
  
--    rpmlog(RPMLOG_DEBUG, "%s: scriptlet start\n", sname);
-+    rpmlog(RPMLOG_INFO, "%s: scriptlet start\n", sname);
+-    rpmlog(RPMLOG_DEBUG, "%s: scriptlet start\n", script->descr);
++    rpmlog(RPMLOG_INFO, "%s: scriptlet start\n", script->descr);
  
-     if (script) {
- 	fn = writeScript(*argvp[0], script);
-@@ -374,7 +374,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes,
- 		sname, strerror(errno));
+     if (script->body) {
+ 	fn = writeScript(*argvp[0], script->body);
+@@ -382,7 +382,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes,
+ 		script->descr, strerror(errno));
  	goto exit;
      } else if (pid == 0) {/* Child */
 -	rpmlog(RPMLOG_DEBUG, "%s: execv(%s) pid %d\n",
 +	rpmlog(RPMLOG_INFO, "%s: execv(%s) pid %d\n",
- 	       sname, *argvp[0], (unsigned)getpid());
+ 	       script->descr, *argvp[0], (unsigned)getpid());
  
  	fclose(in);
-@@ -417,7 +417,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes,
+@@ -426,7 +426,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes,
  	reaped = waitpid(pid, &status, 0);
      } while (reaped == -1 && errno == EINTR);
  
 -    rpmlog(RPMLOG_DEBUG, "%s: waitpid(%d) rc %d status %x\n",
 +    rpmlog(RPMLOG_INFO, "%s: waitpid(%d) rc %d status %x\n",
- 	   sname, (unsigned)pid, (unsigned)reaped, status);
+ 	   script->descr, (unsigned)pid, (unsigned)reaped, status);
  
      if (reaped < 0) {
diff --git a/meta/recipes-devtools/rpm/rpm_4.20.0.bb b/meta/recipes-devtools/rpm/rpm_4.20.1.bb
similarity index 97%
rename from meta/recipes-devtools/rpm/rpm_4.20.0.bb
rename to meta/recipes-devtools/rpm/rpm_4.20.1.bb
index bcc138dab0..f1126cce29 100644
--- a/meta/recipes-devtools/rpm/rpm_4.20.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.20.1.bb
@@ -22,7 +22,7 @@ HOMEPAGE = "http://www.rpm.org"
 
 # libraries are also LGPL - how to express this?
 LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c4eec0c20c6034b9407a09945b48a43f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=066ecde17828e5c8911ec9eae8be78f4"
 
 SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.20.x;protocol=https \
            file://0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch \
@@ -38,11 +38,10 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.20.x;protoc
            file://0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch \
            file://0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch \
            file://0001-CMakeLists.txt-set-libdir-to-CMAKE_INSTALL_FULL_LIBD.patch \
-           file://0001-Set-RPM_PLUGINDIR-in-top-level-CMakeLists.txt.patch \
            "
 
 PE = "1"
-SRCREV = "b3323786668cf99bc9aed7e60ccdab0bc25e19da"
+SRCREV = "c8dc5ea575a2e9c1488036d12f4b75f6a5a49120"
 
 S = "${WORKDIR}/git"
 
-- 
2.49.0

Re: [OE-core] [PATCH 0/2] Upgrade automake and rpm

[Mathieu Dubois-Briand]

On Thu Jun 5, 2025 at 5:02 AM CEST, Robert Yang via lists.openembedded.org wrote:
> From: Robert Yang <liezhi.yang@windriver.com>
>
> The following changes since commit 2e817e6e4d53543766b935479b148a1950cc37c8:
>
>   oeqa/maturin/guessing-game: Bump dependencies to avoid security warning (2025-06-04 08:08:28 +0100)
>
> are available in the Git repository at:
>
>   https://github.com/robertlinux/yocto rbt/upgrade2
>   https://github.com/robertlinux/yocto/tree/rbt/upgrade2
>
> Robert Yang (2):
>   automake: 1.17 -> 1.18
>   rpm: 4.20.0 -> 4.20.1
>
>  ...report-error-when-the-path-of-Perl-c.patch | 27 +++++----
>  .../{automake_1.17.bb => automake_1.18.bb}    |  2 +-
>  ...LUGINDIR-in-top-level-CMakeLists.txt.patch | 57 -------------------
>  ...lling-execute-package-scriptlets-wit.patch | 24 ++++----
>  ...ge-logging-level-around-scriptlets-t.patch | 27 +++++----
>  .../rpm/{rpm_4.20.0.bb => rpm_4.20.1.bb}      |  5 +-
>  6 files changed, 47 insertions(+), 95 deletions(-)
>  rename meta/recipes-devtools/automake/{automake_1.17.bb => automake_1.18.bb} (92%)
>  delete mode 100644 meta/recipes-devtools/rpm/files/0001-Set-RPM_PLUGINDIR-in-top-level-CMakeLists.txt.patch
>  rename meta/recipes-devtools/rpm/{rpm_4.20.0.bb => rpm_4.20.1.bb} (97%)

Hi Robert,

Thanks for the patches.

It looks like this is breaking several builds on the autobuilder, with
following error:

ERROR: rpm-native-1_4.20.1-r0 do_compile: Execution of '/srv/pokybuild/yocto-worker/qemux86-64/build/build/tmp/work/x86_64-linux/rpm-native/4.20.1/temp/run.do_compile.320418' failed with exit code 2
...
| gcc: error: unrecognized command-line option ‘-fhardened’

https://autobuilder.yoctoproject.org/valkyrie/#/builders/68/builds/1841
https://autobuilder.yoctoproject.org/valkyrie/#/builders/43/builds/1779
https://autobuilder.yoctoproject.org/valkyrie/#/builders/28/builds/1680

Can you have a look at these please?

-- 
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [OE-core] [PATCH 0/2] Upgrade automake and rpm

[Robert Yang]

On 6/5/25 17:59, Mathieu Dubois-Briand wrote:
> On Thu Jun 5, 2025 at 5:02 AM CEST, Robert Yang via lists.openembedded.org wrote:
>> From: Robert Yang <liezhi.yang@windriver.com>
>>
>> The following changes since commit 2e817e6e4d53543766b935479b148a1950cc37c8:
>>
>>    oeqa/maturin/guessing-game: Bump dependencies to avoid security warning (2025-06-04 08:08:28 +0100)
>>
>> are available in the Git repository at:
>>
>>    https://github.com/robertlinux/yocto rbt/upgrade2
>>    https://github.com/robertlinux/yocto/tree/rbt/upgrade2
>>
>> Robert Yang (2):
>>    automake: 1.17 -> 1.18
>>    rpm: 4.20.0 -> 4.20.1
>>
>>   ...report-error-when-the-path-of-Perl-c.patch | 27 +++++----
>>   .../{automake_1.17.bb => automake_1.18.bb}    |  2 +-
>>   ...LUGINDIR-in-top-level-CMakeLists.txt.patch | 57 -------------------
>>   ...lling-execute-package-scriptlets-wit.patch | 24 ++++----
>>   ...ge-logging-level-around-scriptlets-t.patch | 27 +++++----
>>   .../rpm/{rpm_4.20.0.bb => rpm_4.20.1.bb}      |  5 +-
>>   6 files changed, 47 insertions(+), 95 deletions(-)
>>   rename meta/recipes-devtools/automake/{automake_1.17.bb => automake_1.18.bb} (92%)
>>   delete mode 100644 meta/recipes-devtools/rpm/files/0001-Set-RPM_PLUGINDIR-in-top-level-CMakeLists.txt.patch
>>   rename meta/recipes-devtools/rpm/{rpm_4.20.0.bb => rpm_4.20.1.bb} (97%)
> 
> Hi Robert,
> 
> Thanks for the patches.
> 
> It looks like this is breaking several builds on the autobuilder, with
> following error:
> 
> ERROR: rpm-native-1_4.20.1-r0 do_compile: Execution of '/srv/pokybuild/yocto-worker/qemux86-64/build/build/tmp/work/x86_64-linux/rpm-native/4.20.1/temp/run.do_compile.320418' failed with exit code 2
> ...
> | gcc: error: unrecognized command-line option ‘-fhardened’
> 
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/68/builds/1841
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/43/builds/1779
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/28/builds/1680
> 
> Can you have a look at these please?

Sorry, I have a local buildtools-extended which contains gcc made me miss the 
error. And when I started a new terminal to drop the buildtools-extended, the
tmp/hosttools/gcc still linked to the previous buildtools-extended, didn't
link to /usr/bin/gcc, that might be seomthing we need to improve for hosttools.

I've sent a patch to upstream to fix the error for -fhardened:
https://github.com/rpm-software-management/rpm/pull/3796

And will send a V2 to upgrade rpm.

// Robert


// Robert

>