diff options
| author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2016-05-12 10:37:56 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-13 13:41:27 +0100 |
| commit | 700ce6b5e31eba3d528d15225d26916f519d62c8 (patch) | |
| tree | 8da292b4ccbb190e515d39b481f485a7547336ee | |
| parent | 40d19d920894f6a5fb04fe5b3b0b526c4a355290 (diff) | |
| download | poky-700ce6b5e31eba3d528d15225d26916f519d62c8.tar.gz | |
signing-keys: Use SYSROOT_DIRS to add dirs to stage in sysroot
(From OE-Core rev: 4a37960e504d6c0bbd0f4c088bef8f3a99beab6a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/meta/signing-keys.bb | 6 |
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 | |||
| 12 | EXCLUDE_FROM_WORLD = "1" | 12 | EXCLUDE_FROM_WORLD = "1" |
| 13 | INHIBIT_DEFAULT_DEPS = "1" | 13 | INHIBIT_DEFAULT_DEPS = "1" |
| 14 | 14 | ||
| 15 | SYSROOT_DIRS += "${sysconfdir}/pki" | ||
| 16 | |||
| 15 | PACKAGES =+ "${PN}-ipk ${PN}-rpm ${PN}-packagefeed" | 17 | PACKAGES =+ "${PN}-ipk ${PN}-rpm ${PN}-packagefeed" |
| 16 | 18 | ||
| 17 | FILES_${PN}-rpm = "${sysconfdir}/pki/rpm-gpg" | 19 | FILES_${PN}-rpm = "${sysconfdir}/pki/rpm-gpg" |
| @@ -54,10 +56,6 @@ do_install () { | |||
| 54 | fi | 56 | fi |
| 55 | } | 57 | } |
| 56 | 58 | ||
| 57 | sysroot_stage_all_append () { | ||
| 58 | sysroot_stage_dir ${D}${sysconfdir}/pki ${SYSROOT_DESTDIR}${sysconfdir}/pki | ||
| 59 | } | ||
| 60 | |||
| 61 | do_deploy () { | 59 | do_deploy () { |
| 62 | if [ -f "${B}/rpm-key" ]; then | 60 | if [ -f "${B}/rpm-key" ]; then |
| 63 | install -D -m 0644 "${B}/rpm-key" "${DEPLOYDIR}/RPM-GPG-KEY-${DISTRO_VERSION}" | 61 | install -D -m 0644 "${B}/rpm-key" "${DEPLOYDIR}/RPM-GPG-KEY-${DISTRO_VERSION}" |
