If DISTRO_CODENAME is not set in the environment, bash quietly
drops the string resulting in a key such as PACKAGEFEED-GPG-KEY-defaultsetup-
However, when python calls self.d.getVar('DISTRO_CODENAME'), the resulting
string is 'None', leading to a configuration file pointing to a key such
as PACKAGEFEED-GPG-KEY-defaultsetup-None
Add a default value in signing-keys.bb to set DISTRO_CODENAME to None if
DISTRO_CODENAME is not set.
Signed-off-by: Adam Duskett <[email protected]>
---
meta/recipes-core/meta/signing-keys.bb | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/meta/recipes-core/meta/signing-keys.bb
b/meta/recipes-core/meta/signing-keys.bb
index 94f4032911..c7713ed4a6 100644
--- a/meta/recipes-core/meta/signing-keys.bb
+++ b/meta/recipes-core/meta/signing-keys.bb
@@ -45,6 +45,10 @@ addtask get_public_keys before do_install
do_get_public_keys[depends] += "gnupg-native:do_populate_sysroot"
do_install () {
+ # Python evalutes an empty DISTRO_CODENAME to "None" which would cause
mismatched files
+ # as the update config file would show GPG-KEY-${DISTRO}-None but the
filename is
+ # installed as GPG-KEY-${DISTRO}-
+ DISTRO_CODENAME="${DISTRO_CODENAME:-None}"
if [ -f "${B}/rpm-key" ]; then
install -D -m 0644 "${B}/rpm-key"
"${D}${sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-${DISTRO}-${DISTRO_CODENAME}"
fi
@@ -57,6 +61,7 @@ do_install () {
}
do_deploy () {
+ DISTRO_CODENAME="${DISTRO_CODENAME:-None}"
if [ -f "${B}/rpm-key" ]; then
install -D -m 0644 "${B}/rpm-key"
"${DEPLOYDIR}/RPM-GPG-KEY-${DISTRO}-${DISTRO_CODENAME}"
fi
--
2.52.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#227717):
https://lists.openembedded.org/g/openembedded-core/message/227717
Mute This Topic: https://lists.openembedded.org/mt/116789989/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
