From d238eafa48aa8f294d2c3f07b6e01a16d0e41f3b Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Mon, 21 Mar 2016 16:37:05 +0200 Subject: package signing: mak tasks depend on GPG_* variables Use an explicit vardeps dependency. Bitbake is not able to find these dependeny as the variables are only used inside the constructor of LocalSigner class. Signed-off-by: Markus Lehtonen --- meta/classes/sign_ipk.bbclass | 2 ++ meta/classes/sign_package_feed.bbclass | 3 +++ meta/classes/sign_rpm.bbclass | 2 ++ 3 files changed, 7 insertions(+) diff --git a/meta/classes/sign_ipk.bbclass b/meta/classes/sign_ipk.bbclass index a481f6d9a8..30369dfbef 100644 --- a/meta/classes/sign_ipk.bbclass +++ b/meta/classes/sign_ipk.bbclass @@ -50,3 +50,5 @@ def sign_ipk(d, ipk_to_sign): d.getVar('IPK_GPG_NAME', True), d.getVar('IPK_GPG_PASSPHRASE_FILE', True), armor=is_ascii_sig) + +sign_ipk[vardeps] += " GPG_BIN GPG_PATH" diff --git a/meta/classes/sign_package_feed.bbclass b/meta/classes/sign_package_feed.bbclass index 31a6e9b042..62f7797968 100644 --- a/meta/classes/sign_package_feed.bbclass +++ b/meta/classes/sign_package_feed.bbclass @@ -41,3 +41,6 @@ python () { do_package_index[depends] += "signing-keys:do_deploy" do_rootfs[depends] += "signing-keys:do_populate_sysroot" + +do_package_index[vardeps] += " GPG_BIN GPG_PATH" +do_rootfs[vardeps] += " GPG_BIN GPG_PATH" diff --git a/meta/classes/sign_rpm.bbclass b/meta/classes/sign_rpm.bbclass index c21e3f09af..6183370664 100644 --- a/meta/classes/sign_rpm.bbclass +++ b/meta/classes/sign_rpm.bbclass @@ -47,5 +47,7 @@ python sign_rpm () { d.getVar('RPM_GPG_PASSPHRASE_FILE', True)) } +sign_rpm[vardeps] += " GPG_BIN GPG_PATH" + do_package_index[depends] += "signing-keys:do_deploy" do_rootfs[depends] += "signing-keys:do_populate_sysroot" -- cgit 1.2.3-korg