]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
meta/lib/oe/rootfs.py: assign warn_check regex string to a variable
authorAdam Duskett <adam.duskett@amarulasolutions.com>
Tue, 31 Mar 2026 09:57:11 +0000 (11:57 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 2 Apr 2026 12:10:36 +0000 (13:10 +0100)
DNF5 has a hardcoded warning when gpg checks are disabled.
As such, the rpm rootfs.py PkgRootfs class needs to have a
a negative lookahead filter specific for the following warning:
"Warning: skipped OpenPGP checks" if RPM_SIGN_PACKAGES != 1.

This filter is added in the next patch.

Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oe/rootfs.py

index 14befac8faf9f3a97bed8c17a635f89d842dd59b..7ef7e71f9e1e477765eac21e1ea05f51eaa72e32 100644 (file)
@@ -25,6 +25,7 @@ class Rootfs(object, metaclass=ABCMeta):
         self.deploydir = self.d.getVar('IMGDEPLOYDIR')
         self.progress_reporter = progress_reporter
         self.logcatcher = logcatcher
+        self.warn_check_regex = r'^(warn|Warn|WARNING:)'
 
         self.install_order = Manifest.INSTALL_ORDER
 
@@ -84,7 +85,7 @@ class Rootfs(object, metaclass=ABCMeta):
                 bb.warn(msg)
 
     def _log_check_warn(self):
-        self._log_check_common('warning', '^(warn|Warn|WARNING:)')
+        self._log_check_common('warning', self.warn_check_regex)
 
     def _log_check_error(self):
         self._log_check_common('error', self.log_check_regex)