summaryrefslogtreecommitdiffstats
path: root/meta
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 13:51:47 +0100
commit94dbe8515d0322688c0e04b18f76962532e16cae (patch)
tree9b808167b7f3c9fa088620d1d808ae7931be1b1e /meta
parente110809a52f0ccfd757e5eaab55a59b22528e3f4 (diff)
downloadpoky-94dbe8515d0322688c0e04b18f76962532e16cae.tar.gz
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. (From OE-Core rev: b31e015d2e379c24610948d345c5970545887468) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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):
739 739
740 channel_priority = 5 740 channel_priority = 5
741 platform_dir = os.path.join(self.etcrpm_dir, "platform") 741 platform_dir = os.path.join(self.etcrpm_dir, "platform")
742 sdkos = self.d.getVar("SDK_OS", True)
742 with open(platform_dir, "w+") as platform_fd: 743 with open(platform_dir, "w+") as platform_fd:
743 platform_fd.write(platform + '\n') 744 platform_fd.write(platform + '\n')
744 for pt in platform_extra: 745 for pt in platform_extra:
745 channel_priority += 5 746 channel_priority += 5
746 platform_fd.write(re.sub("-linux.*$", "-linux.*\n", pt)) 747 if sdkos:
748 tmp = re.sub("-%s$" % sdkos, "-%s\n" % sdkos, pt)
749 tmp = re.sub("-linux.*$", "-linux.*\n", tmp)
750 platform_fd.write(tmp)
747 751
748 # Tell RPM that the "/" directory exist and is available 752 # Tell RPM that the "/" directory exist and is available
749 bb.note("configuring RPM system provides") 753 bb.note("configuring RPM system provides")