aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-07-20 10:52:02 +0200
committerPaul Eggleton <paul.eggleton@linux.intel.com>2017-07-20 16:35:47 +0200
commit2ef340f8455cf236cb192243e48e92808cf19512 (patch)
treeecb05bb101716d97dc825b859b606b97ed2514cc
parent27330c09ce0a5e4127c7aa469caf038ff925df4d (diff)
downloadopenembedded-core-contrib-2ef340f8455cf236cb192243e48e92808cf19512.tar.gz
openembedded-core-contrib-2ef340f8455cf236cb192243e48e92808cf19512.tar.bz2
openembedded-core-contrib-2ef340f8455cf236cb192243e48e92808cf19512.zip
classes/base: set do_unpack dependencies for rpm files
If we're unpacking any rpm (not just .src.rpm) then we'll need to call rpm2cpio.sh. As of OE-Core rev a7da1aade118d1ccf1b286f82556cd9f706bd2a4 that script no longer uses file-native, but there is a chance that the rpm file will be compressed internally using xz (for example, rpms from Fedora) and therefore the script will need xzcat provided xz-native. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--meta/classes/base.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 27a28b8b8c..9c40e017f4 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -632,8 +632,8 @@ python () {
d.appendVarFlag('do_unpack', 'depends', ' unzip-native:do_populate_sysroot')
# file is needed by rpm2cpio.sh
- elif path.endswith('.src.rpm'):
- d.appendVarFlag('do_unpack', 'depends', ' file-native:do_populate_sysroot')
+ elif path.endswith('.rpm'):
+ d.appendVarFlag('do_unpack', 'depends', ' xz-native:do_populate_sysroot')
if needsrcrev:
d.setVar("SRCPV", "${@bb.fetch2.get_srcrev(d)}")