diff options
Diffstat (limited to 'meta/recipes-core/meta')
-rw-r--r-- | meta/recipes-core/meta/signing-keys.bb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-core/meta/signing-keys.bb b/meta/recipes-core/meta/signing-keys.bb index ebfb08c433..2c1cc3845e 100644 --- a/meta/recipes-core/meta/signing-keys.bb +++ b/meta/recipes-core/meta/signing-keys.bb | |||
@@ -44,25 +44,25 @@ addtask get_public_keys before do_install | |||
44 | 44 | ||
45 | do_install () { | 45 | do_install () { |
46 | if [ -f "${B}/rpm-key" ]; then | 46 | if [ -f "${B}/rpm-key" ]; then |
47 | install -D -m 0644 "${B}/rpm-key" "${D}${sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-${DISTRO_VERSION}" | 47 | install -D -m 0644 "${B}/rpm-key" "${D}${sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-${DISTRO}-${DISTRO_CODENAME}" |
48 | fi | 48 | fi |
49 | if [ -f "${B}/ipk-key" ]; then | 49 | if [ -f "${B}/ipk-key" ]; then |
50 | install -D -m 0644 "${B}/ipk-key" "${D}${sysconfdir}/pki/ipk-gpg/IPK-GPG-KEY-${DISTRO_VERSION}" | 50 | install -D -m 0644 "${B}/ipk-key" "${D}${sysconfdir}/pki/ipk-gpg/IPK-GPG-KEY-${DISTRO}-${DISTRO_CODENAME}" |
51 | fi | 51 | fi |
52 | if [ -f "${B}/pf-key" ]; then | 52 | if [ -f "${B}/pf-key" ]; then |
53 | install -D -m 0644 "${B}/pf-key" "${D}${sysconfdir}/pki/packagefeed-gpg/PACKAGEFEED-GPG-KEY-${DISTRO_VERSION}" | 53 | install -D -m 0644 "${B}/pf-key" "${D}${sysconfdir}/pki/packagefeed-gpg/PACKAGEFEED-GPG-KEY-${DISTRO}-${DISTRO_CODENAME}" |
54 | fi | 54 | fi |
55 | } | 55 | } |
56 | 56 | ||
57 | do_deploy () { | 57 | do_deploy () { |
58 | if [ -f "${B}/rpm-key" ]; then | 58 | if [ -f "${B}/rpm-key" ]; then |
59 | install -D -m 0644 "${B}/rpm-key" "${DEPLOYDIR}/RPM-GPG-KEY-${DISTRO_VERSION}" | 59 | install -D -m 0644 "${B}/rpm-key" "${DEPLOYDIR}/RPM-GPG-KEY-${DISTRO}-${DISTRO_CODENAME}" |
60 | fi | 60 | fi |
61 | if [ -f "${B}/ipk-key" ]; then | 61 | if [ -f "${B}/ipk-key" ]; then |
62 | install -D -m 0644 "${B}/ipk-key" "${DEPLOYDIR}/IPK-GPG-KEY-${DISTRO_VERSION}" | 62 | install -D -m 0644 "${B}/ipk-key" "${DEPLOYDIR}/IPK-GPG-KEY-${DISTRO}-${DISTRO_CODENAME}" |
63 | fi | 63 | fi |
64 | if [ -f "${B}/pf-key" ]; then | 64 | if [ -f "${B}/pf-key" ]; then |
65 | install -D -m 0644 "${B}/pf-key" "${DEPLOYDIR}/PACKAGEFEED-GPG-KEY-${DISTRO_VERSION}" | 65 | install -D -m 0644 "${B}/pf-key" "${DEPLOYDIR}/PACKAGEFEED-GPG-KEY-${DISTRO}-${DISTRO_CODENAME}" |
66 | fi | 66 | fi |
67 | } | 67 | } |
68 | do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_RPM}" | 68 | do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_RPM}" |