Patchwork [4/4] lib/oe/package_manager.py: Add processing for alternative SDK_OS

login
register
mail settings
Submitter Mark Hatle
Date June 25, 2014, 12:28 a.m.
Message ID <f9dc89ac10b9500ff75a40d2c16b59770a2a8d10.1403655933.git.mark.hatle@windriver.com>
Download mbox | patch
Permalink /patch/74345/
State New
Headers show

Comments

Mark Hatle - June 25, 2014, 12:28 a.m.
For the meta-mingw layer, we need to process alternative SDK_OS, since this
is not a Linux based OS.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 meta/lib/oe/package_manager.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Patch

diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 1c64205..18eb792 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -739,11 +739,15 @@  class RpmPM(PackageManager):
 
         channel_priority = 5
         platform_dir = os.path.join(self.etcrpm_dir, "platform")
+        sdkos = self.d.getVar("SDK_OS", True)
         with open(platform_dir, "w+") as platform_fd:
             platform_fd.write(platform + '\n')
             for pt in platform_extra:
                 channel_priority += 5
-                platform_fd.write(re.sub("-linux.*$", "-linux.*\n", pt))
+                if sdkos:
+                    tmp = re.sub("-%s$" % sdkos, "-%s\n" % sdkos, pt)
+                tmp = re.sub("-linux.*$", "-linux.*\n", tmp)
+                platform_fd.write(tmp)
 
         # Tell RPM that the "/" directory exist and is available
         bb.note("configuring RPM system provides")