[oe-commits] Chris Larson : package_rpm: don't run against native/cross recipes, explicitly

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: e20e2ebb2a22138227b1420e625b8df8593c51b9
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=e20e2ebb2a22138227b1420e625b8df8593c51b9

Author: Chris Larson <clarson at mvista.com>
Date:   Thu Jun 18 12:41:50 2009 -0700

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 at mvista.com>

---

 classes/package_rpm.bbclass |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
index 9755bf1..13cb877 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')