[oe-commits] Mark Hatle : lib/oe/package_manager.py: Add processing for alternative SDK_OS

git at git.openembedded.org git at git.openembedded.org
Wed Jun 25 12:52:37 UTC 2014


Module: openembedded-core.git
Branch: master-next
Commit: b31e015d2e379c24610948d345c5970545887468
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b31e015d2e379c24610948d345c5970545887468

Author: Mark Hatle <mark.hatle at windriver.com>
Date:   Tue Jun 24 19:28:07 2014 -0500

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 at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/lib/oe/package_manager.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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")



More information about the Openembedded-commits mailing list