summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorChris Larson <clarson@mvista.com>2009-06-18 12:41:50 -0700
committerChris Larson <clarson@mvista.com>2009-08-19 14:54:27 -0700
commite20e2ebb2a22138227b1420e625b8df8593c51b9 (patch)
tree1e5628cea5de2f79ec312d054ce3d8cf297cadfe /classes
parent7001e26671dc76aa5f6c4b4bc3a7d341d012b024 (diff)
package_rpm: don't run against native/cross recipes, explicitly
In the past, it only avoided adding the rpm-native/fakeroot-native deps if PACKAGES is empty, but unfortunately some native recipes have PACKAGES set to non-empty, so let's explicitly check for native/cross. Signed-off-by: Chris Larson <clarson@mvista.com>
Diffstat (limited to 'classes')
-rw-r--r--classes/package_rpm.bbclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
index 9755bf1d2d..13cb8773af 100644
--- a/classes/package_rpm.bbclass
+++ b/classes/package_rpm.bbclass
@@ -210,7 +210,9 @@ python do_package_rpm () {
python () {
import bb
- if bb.data.getVar('PACKAGES', d, True) != '':
+ if bb.data.getVar('PACKAGES', d, True) != '' and \
+ not bb.data.inherits_class('native', d) and \
+ not bb.data.inherits_class('cross', d):
deps = (bb.data.getVarFlag('do_package_write_rpm', 'depends', d) or "").split()
deps.append('rpm-native:do_populate_staging')
deps.append('fakeroot-native:do_populate_staging')