summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Galbusera <gizero@gmail.com>2017-01-27 00:34:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-31 14:40:16 +0000
commit0ac1387bd12b5d023dea06ffe65d1fdcb050bcb4 (patch)
tree246d681d50ed0e7b9d95797340f4016c39d50f68
parent0c4d6dec32615af10fdaa4f1685b8c4f2a167feb (diff)
downloadopenembedded-core-0ac1387bd12b5d023dea06ffe65d1fdcb050bcb4.tar.gz
openembedded-core-0ac1387bd12b5d023dea06ffe65d1fdcb050bcb4.tar.bz2
openembedded-core-0ac1387bd12b5d023dea06ffe65d1fdcb050bcb4.zip
oe-publish-sdk: add pyshtables.py to .gitignore
pyshtables.py should be ignored by git as it is generated. If kept in the repo, causes subsequent runs of sdk-update to fail. [ YOCTO #10963 ] Signed-off-by: Andrea Galbusera <gizero@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/oe-publish-sdk4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/oe-publish-sdk b/scripts/oe-publish-sdk
index 4fe8974dee..9f7963c249 100755
--- a/scripts/oe-publish-sdk
+++ b/scripts/oe-publish-sdk
@@ -114,9 +114,9 @@ def publish(args):
# Setting up the git repo
if not is_remote:
- cmd = 'set -e; mkdir -p %s/layers; cd %s/layers; if [ ! -e .git ]; then git init .; mv .git/hooks/post-update.sample .git/hooks/post-update; echo "*.pyc\n*.pyo" > .gitignore; fi; git add -A .; git config user.email "oe@oe.oe" && git config user.name "OE" && git commit -q -m "init repo" || true; git update-server-info' % (destination, destination)
+ cmd = 'set -e; mkdir -p %s/layers; cd %s/layers; if [ ! -e .git ]; then git init .; mv .git/hooks/post-update.sample .git/hooks/post-update; echo "*.pyc\n*.pyo\npyshtables.py" > .gitignore; fi; git add -A .; git config user.email "oe@oe.oe" && git config user.name "OE" && git commit -q -m "init repo" || true; git update-server-info' % (destination, destination)
else:
- cmd = "ssh %s 'set -e; mkdir -p %s/layers; cd %s/layers; if [ ! -e .git ]; then git init .; mv .git/hooks/post-update.sample .git/hooks/post-update; echo '*.pyc\n*.pyo' > .gitignore; fi; git add -A .; git config user.email 'oe@oe.oe' && git config user.name 'OE' && git commit -q -m \"init repo\" || true; git update-server-info'" % (host, destdir, destdir)
+ cmd = "ssh %s 'set -e; mkdir -p %s/layers; cd %s/layers; if [ ! -e .git ]; then git init .; mv .git/hooks/post-update.sample .git/hooks/post-update; echo '*.pyc\n*.pyo\npyshtables.py' > .gitignore; fi; git add -A .; git config user.email 'oe@oe.oe' && git config user.name 'OE' && git commit -q -m \"init repo\" || true; git update-server-info'" % (host, destdir, destdir)
ret = subprocess.call(cmd, shell=True)
if ret == 0:
logger.info('SDK published successfully')