summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2014-06-24 19:28:07 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-25 11:49:39 +0100
commitb31e015d2e379c24610948d345c5970545887468 (patch)
tree958e1c428a36536249925b5b7113059baa9a383f
parente67b24401a366b20644510703c7140be975869ea (diff)
downloadopenembedded-core-contrib-b31e015d2e379c24610948d345c5970545887468.tar.gz
openembedded-core-contrib-b31e015d2e379c24610948d345c5970545887468.tar.bz2
openembedded-core-contrib-b31e015d2e379c24610948d345c5970545887468.zip
lib/oe/package_manager.py: Add processing for alternative SDK_OS
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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/package_manager.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 1c64205330..18eb7929a9 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")