From: Chris Larson <clarson@mvista.com>
Date: Thu, 18 Jun 2009 19:41:50 +0000 (-0700)
Subject: package_rpm: don't run against native/cross recipes, explicitly
X-Git-Tag: Release-2010-05/1~2649
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e20e2ebb2a22138227b1420e625b8df8593c51b9;p=openembedded.git

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>
---

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')