From: Christopher Larson <kergoth@gmail.com>
Date: Mon, 6 Jan 2014 17:17:27 +0000 (-0700)
Subject: base.bbclass: pull in file-native for src.rpm
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=a4ae70638314a88c3abfcca0d29e1c425f86bea0;p=openembedded-core.git

base.bbclass: pull in file-native for src.rpm

Unpacking an src.rpm uses rpm2cpio.sh, which requires 'file'.

Without this, builds of rpm on a host without 'file' installed will fail with
very strange messages.

(From OE-Core master rev: 97e1d84e2d1a74791ce6af88ddc27963bc0e1bec)

Signed-off-by: Christopher Larson <kergoth@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 73920fde47..2e5217b147 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -582,6 +582,10 @@ python () {
     if ".zip" in srcuri:
         d.appendVarFlag('do_unpack', 'depends', ' unzip-native:do_populate_sysroot')
 
+    # file is needed by rpm2cpio.sh
+    if ".src.rpm" in srcuri:
+        d.appendVarFlag('do_unpack', 'depends', ' file-native:do_populate_sysroot')
+
     set_packagetriplet(d)
 
     # 'multimachine' handling