diff options
| -rw-r--r-- | meta-signing-key/recipes-support/key-store/key-store_0.1.bb | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/meta-signing-key/recipes-support/key-store/key-store_0.1.bb b/meta-signing-key/recipes-support/key-store/key-store_0.1.bb index 30485a7..f5c3e75 100644 --- a/meta-signing-key/recipes-support/key-store/key-store_0.1.bb +++ b/meta-signing-key/recipes-support/key-store/key-store_0.1.bb | |||
| @@ -133,22 +133,20 @@ key_store_sysroot_preprocess() { | |||
| 133 | sysroot_stage_dir "${D}${sysconfdir}" "${SYSROOT_DESTDIR}${sysconfdir}" | 133 | sysroot_stage_dir "${D}${sysconfdir}" "${SYSROOT_DESTDIR}${sysconfdir}" |
| 134 | } | 134 | } |
| 135 | 135 | ||
| 136 | pkg_postinst_${PN}-rpm-pubkey() { | 136 | pkg_postinst_ontarget_${PN}-rpm-pubkey() { |
| 137 | if [ -z "$D" ]; then | 137 | keydir="${RPM_KEY_DIR}" |
| 138 | keydir="${RPM_KEY_DIR}" | ||
| 139 | 138 | ||
| 140 | [ ! -d "$keydir" ] && mkdir -p "$keydir" | 139 | [ ! -d "$keydir" ] && mkdir -p "$keydir" |
| 141 | 140 | ||
| 142 | # XXX: only import the new key | 141 | # XXX: only import the new key |
| 143 | for keyfile in `ls $keydir/RPM-GPG-KEY-*`; do | 142 | for keyfile in `ls $keydir/RPM-GPG-KEY-*`; do |
| 144 | [ -s "$keyfile" ] || continue | 143 | [ -s "$keyfile" ] || continue |
| 145 | 144 | ||
| 146 | rpm --import "$keyfile" || { | 145 | rpm --import "$keyfile" || { |
| 147 | echo "Unable to import the public key $keyfile" | 146 | echo "Unable to import the public key $keyfile" |
| 148 | exit 1 | 147 | exit 1 |
| 149 | } | 148 | } |
| 150 | done | 149 | done |
| 151 | fi | ||
| 152 | } | 150 | } |
| 153 | 151 | ||
| 154 | PACKAGES = "\ | 152 | PACKAGES = "\ |
