[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6837/8267] classes/base: set do_unpack dependencies for rpm files



commit b5e42005e96d0c3ed5da72007f6c41722332afe6
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Thu Jul 20 16:48:12 2017 +0200

    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.
    
    (From OE-Core rev: 2f31f1795bc0c85b1646bc7d9596bbe778cb84e5)
    
    Signed-off-by: Paul Eggleton <paul eggleton linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/base.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 27a28b8..9c40e01 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)}")


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]