]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
classes/base: set do_unpack dependencies for rpm files
authorPaul Eggleton <paul.eggleton@linux.intel.com>
Thu, 20 Jul 2017 08:52:02 +0000 (10:52 +0200)
committerPaul Eggleton <paul.eggleton@linux.intel.com>
Thu, 20 Jul 2017 14:35:47 +0000 (16:35 +0200)
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>
meta/classes/base.bbclass

index 27a28b8b8c47c27c8e180117706ca0ce4b411558..9c40e017f4e302ff67103853a2844929fecbc649 100644 (file)
@@ -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)}")