Merge pull request 'Use openSUSE-build key and import gpkeys to recognize ALP key' (#1) from master into 16.0

Reviewed-on: #1
This commit is contained in:
Lubos Kocman 2024-06-24 13:15:29 +02:00
commit db1d411765
2 changed files with 15 additions and 2 deletions

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- OBS-Profiles: @BUILD_FLAVOR@ -->
<!-- OBS-Milestone: %current_milestone -->
<!-- OBS-BcntSyncTag: Leap-Micro -->
<!-- OBS-BcntSyncTag: Leap -->
<image schemaversion="7.5" name="openSUSE-Leap-Micro" displayname="openSUSE Leap">
<description type="system">
<author>openSUSE</author>
@ -695,7 +695,7 @@
<package name="firewalld"/>
<package name="NetworkManager-tui"/>
<package name="growpart-generator"/>
<package name="suse-build-key"/>
<package name="openSUSE-build-key"/>
<!-- for debugging -->
<package name="less"/>
<package name="vim-small"/>

View File

@ -314,4 +314,17 @@ if [[ "$kiwi_profiles" =~ ^(x86-qcow|x86-vmware|aarch64-qcow)$ ]]; then
echo "policy: search,found=all,maybe=disabled,notfound=disabled" > /etc/cloud/ds-identify.cfg
fi
#======================================
# Import trusted rpm keys
#--------------------------------------
for i in /usr/lib/rpm/gnupg/keys/gpg-pubkey*asc; do
# importing can fail if it already exists
rpm --import $i || true
done
#======================================
# Refresh zypper services / repos
#--------------------------------------
zypper refs
exit 0