summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2016-05-12 10:37:56 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-13 13:40:49 +0100
commit4a37960e504d6c0bbd0f4c088bef8f3a99beab6a (patch)
tree14674f7c5d2e118e67fd75c53bd77e23800e3691
parent94196ee196aafca7e8e5a553e54e9437b5e11990 (diff)
downloadopenembedded-core-4a37960e504d6c0bbd0f4c088bef8f3a99beab6a.tar.gz
openembedded-core-4a37960e504d6c0bbd0f4c088bef8f3a99beab6a.tar.bz2
openembedded-core-4a37960e504d6c0bbd0f4c088bef8f3a99beab6a.zip
signing-keys: Use SYSROOT_DIRS to add dirs to stage in sysroot
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/meta/signing-keys.bb6
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-core/meta/signing-keys.bb b/meta/recipes-core/meta/signing-keys.bb
index e843301b2e..ea7400b012 100644
--- a/meta/recipes-core/meta/signing-keys.bb
+++ b/meta/recipes-core/meta/signing-keys.bb
@@ -12,6 +12,8 @@ inherit allarch deploy
EXCLUDE_FROM_WORLD = "1"
INHIBIT_DEFAULT_DEPS = "1"
+SYSROOT_DIRS += "${sysconfdir}/pki"
+
PACKAGES =+ "${PN}-ipk ${PN}-rpm ${PN}-packagefeed"
FILES_${PN}-rpm = "${sysconfdir}/pki/rpm-gpg"
@@ -54,10 +56,6 @@ do_install () {
fi
}
-sysroot_stage_all_append () {
- sysroot_stage_dir ${D}${sysconfdir}/pki ${SYSROOT_DESTDIR}${sysconfdir}/pki
-}
-
do_deploy () {
if [ -f "${B}/rpm-key" ]; then
install -D -m 0644 "${B}/rpm-key" "${DEPLOYDIR}/RPM-GPG-KEY-${DISTRO_VERSION}"