summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-10 10:36:43 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-10 12:01:04 +0000
commit388a92bb7c0ea64b18a31c0c82437cc03ab309d8 (patch)
treecf15299a9f971e174f35f7667cb75ba5427b160e
parentb1c0b3de20385457fdba4786c5cd11ef9024e6af (diff)
downloadopenembedded-core-388a92bb7c0ea64b18a31c0c82437cc03ab309d8.tar.gz
openembedded-core-388a92bb7c0ea64b18a31c0c82437cc03ab309d8.tar.bz2
openembedded-core-388a92bb7c0ea64b18a31c0c82437cc03ab309d8.tar.xz
openembedded-core-388a92bb7c0ea64b18a31c0c82437cc03ab309d8.zip
debian.bbclass: Only set rdeptask for do_package if packaging is enabled
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/debian.bbclass14
1 files changed, 10 insertions, 4 deletions
diff --git a/meta/classes/debian.bbclass b/meta/classes/debian.bbclass
index 8f6e7d88c..d35882fa4 100644
--- a/meta/classes/debian.bbclass
+++ b/meta/classes/debian.bbclass
@@ -8,10 +8,16 @@
#
# Better expressed as ensure all RDEPENDS package before we package
# This means we can't have circular RDEPENDS/RRECOMMENDS
-do_package_write_ipk[rdeptask] = "do_package"
-do_package_write_deb[rdeptask] = "do_package"
-do_package_write_tar[rdeptask] = "do_package"
-do_package_write_rpm[rdeptask] = "do_package"
+DEBIANRDEP = "do_package"
+do_package_write_ipk[rdeptask] = "${DEBIANRDEP}"
+do_package_write_deb[rdeptask] = "${DEBIANRDEP}"
+do_package_write_tar[rdeptask] = "${DEBIANRDEP}"
+do_package_write_rpm[rdeptask] = "${DEBIANRDEP}"
+
+python () {
+ if not d.getVar("PACKAGES", True):
+ d.setVar("DEBIANRDEP", "")
+}
python debian_package_name_hook () {
import glob, copy, stat, errno, re