summaryrefslogtreecommitdiffstats
path: root/scripts/oe-publish-sdk
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-03-31 21:53:33 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-31 23:01:37 +0100
commit2aec71e028a0ea0df64ddcd35402c8753b721226 (patch)
tree0ca7b30b3126949d59b7f8dec2592a0fb7ef31cb /scripts/oe-publish-sdk
parent8ef70163fc88128f2490f11bb1c28fa80b04cfb1 (diff)
downloadpoky-2aec71e028a0ea0df64ddcd35402c8753b721226.tar.gz
oe-publish-sdk: exclude sstate-cache if publishing minimal SDK
If SDK_EXT_TYPE is set to "minimal" then the SDK won't contain many sstate artifacts, and you're required to set up an sstate mirror in this case anyway so there's no point publishing the "stub" sstate-cache directory from within the SDK since it won't be useful for update purposes and may be confused with the real sstate-cache. There is however a possibility that people might publish the real sstate-cache directory under the same output directory provided to oe-publish-sdk, thus deleting it after extracting (as we were doing with other files we wanted to clean up at the end) would be problematic, besides which extracting it and then deleting it is wasteful. Thus, introduce a "-p" command line option to the SDK installer that we can use to tell tar not to extract the items we don't want when publishing. This has the added benefit of mostly keeping references to these in the place they belong i.e. in populate_sdk_ext.bbclass. (From OE-Core rev: 774b85d42db1d81936d4e4af4f6fb2c57cb51d2c) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/oe-publish-sdk')
-rwxr-xr-xscripts/oe-publish-sdk8
1 files changed, 3 insertions, 5 deletions
diff --git a/scripts/oe-publish-sdk b/scripts/oe-publish-sdk
index 992de19955..e6cb7af861 100755
--- a/scripts/oe-publish-sdk
+++ b/scripts/oe-publish-sdk
@@ -94,19 +94,17 @@ def publish(args):
94 94
95 # Unpack the SDK 95 # Unpack the SDK
96 logger.info("Unpacking SDK") 96 logger.info("Unpacking SDK")
97 cleanupfiles = [dest_sdk, os.path.join(destdir, 'ext-sdk-prepare.py')]
98 if not is_remote: 97 if not is_remote:
99 cmd = "sh %s -n -y -d %s" % (dest_sdk, destination) 98 cmd = "sh %s -p -y -d %s" % (dest_sdk, destination)
100 ret = subprocess.call(cmd, shell=True) 99 ret = subprocess.call(cmd, shell=True)
101 if ret == 0: 100 if ret == 0:
102 logger.info('Successfully unpacked %s to %s' % (dest_sdk, destination)) 101 logger.info('Successfully unpacked %s to %s' % (dest_sdk, destination))
103 for cleanupfile in cleanupfiles: 102 os.remove(dest_sdk)
104 os.remove(cleanupfile)
105 else: 103 else:
106 logger.error('Failed to unpack %s to %s' % (dest_sdk, destination)) 104 logger.error('Failed to unpack %s to %s' % (dest_sdk, destination))
107 return ret 105 return ret
108 else: 106 else:
109 cmd = "ssh %s 'sh %s -n -y -d %s && rm -f %s'" % (host, dest_sdk, destdir, ' '.join(cleanupfiles)) 107 cmd = "ssh %s 'sh %s -p -y -d %s && rm -f %s'" % (host, dest_sdk, destdir, dest_sdk)
110 ret = subprocess.call(cmd, shell=True) 108 ret = subprocess.call(cmd, shell=True)
111 if ret == 0: 109 if ret == 0:
112 logger.info('Successfully unpacked %s to %s' % (dest_sdk, destdir)) 110 logger.info('Successfully unpacked %s to %s' % (dest_sdk, destdir))