summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2016-03-21 16:37:05 +0200
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>2016-03-21 18:22:45 +0200
commitd238eafa48aa8f294d2c3f07b6e01a16d0e41f3b (patch)
tree51c3a47c578538c90db6551227bb21261864407f
parentef398438aec0692bf98e2e6e75194f18beae3169 (diff)
downloadopenembedded-core-contrib-marquiz/rpmsign2.tar.gz
openembedded-core-contrib-marquiz/rpmsign2.tar.bz2
openembedded-core-contrib-marquiz/rpmsign2.zip
package signing: mak tasks depend on GPG_* variablesmarquiz/rpmsign2
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 <markus.lehtonen@linux.intel.com>
-rw-r--r--meta/classes/sign_ipk.bbclass2
-rw-r--r--meta/classes/sign_package_feed.bbclass3
-rw-r--r--meta/classes/sign_rpm.bbclass2
3 files changed, 7 insertions, 0 deletions
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"