summaryrefslogtreecommitdiff
path: root/scripts/oe-publish-sdk
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-03-21 18:14:06 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-23 14:24:25 +0000
commita9ec72b7897ffc0b901c1ccbcbe3cabbc7ac41ee (patch)
treeed2c7be2108c05c79d217ca2a5e63407ece4a705 /scripts/oe-publish-sdk
parenta7b6b1f8cc1c096724f794ac9dee312b0f771f66 (diff)
downloadopenembedded-core-a9ec72b7897ffc0b901c1ccbcbe3cabbc7ac41ee.tar.gz
openembedded-core-a9ec72b7897ffc0b901c1ccbcbe3cabbc7ac41ee.tar.bz2
openembedded-core-a9ec72b7897ffc0b901c1ccbcbe3cabbc7ac41ee.zip
oe-publish-sdk: drop SDK installer file from published output
We don't really need the SDK installer in the published output, for two reasons: 1) The directory produced is for the consumption of devtool sdk-update, and the installer isn't used by that at all 2) It wouldn't really make sense to point users at the update directory to download the SDK installer because it contains a bunch of things that aren't meant for manual download, so it wouldn't be very tidy. Leaving the file present can mislead you into thinking the opposite of both of the above. 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-sdk6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/oe-publish-sdk b/scripts/oe-publish-sdk
index 9e4f1bfc65..e91888f8d8 100755
--- a/scripts/oe-publish-sdk
+++ b/scripts/oe-publish-sdk
@@ -53,6 +53,7 @@ def publish(args):
else:
is_remote = False
dest_sdk = os.path.join(destination, sdk_basename)
+ destdir = destination
# Making sure the directory exists
logger.debug("Making sure the destination directory exists")
@@ -83,16 +84,19 @@ def publish(args):
# Unpack the SDK
logger.info("Unpacking SDK")
+ cleanupfiles = [dest_sdk, os.path.join(destdir, 'ext-sdk-prepare.py')]
if not is_remote:
cmd = "sh %s -n -y -d %s" % (dest_sdk, destination)
ret = subprocess.call(cmd, shell=True)
if ret == 0:
logger.info('Successfully unpacked %s to %s' % (dest_sdk, destination))
+ for cleanupfile in cleanupfiles:
+ os.remove(cleanupfile)
else:
logger.error('Failed to unpack %s to %s' % (dest_sdk, destination))
return ret
else:
- cmd = "ssh %s 'sh %s -n -y -d %s'" % (host, dest_sdk, destdir)
+ cmd = "ssh %s 'sh %s -n -y -d %s && rm -f %s'" % (host, dest_sdk, destdir, ' '.join(cleanupfiles))
ret = subprocess.call(cmd, shell=True)
if ret == 0:
logger.info('Successfully unpacked %s to %s' % (dest_sdk, destdir))