diff options
| author | Andrea Galbusera <gizero@gmail.com> | 2017-01-27 00:34:55 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-31 14:43:00 +0000 |
| commit | 6476182c33760cb4e55b85853331a6aa916eb365 (patch) | |
| tree | ab9510893ab5945248db5c64f51bf8bb2614cfd2 | |
| parent | c13a94660f5089121a62c69f7208bb13a64bbdcc (diff) | |
| download | poky-6476182c33760cb4e55b85853331a6aa916eb365.tar.gz | |
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 ]
(From OE-Core rev: 0ac1387bd12b5d023dea06ffe65d1fdcb050bcb4)
Signed-off-by: Andrea Galbusera <gizero@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rwxr-xr-x | scripts/oe-publish-sdk | 4 |
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): | |||
| 114 | 114 | ||
| 115 | # Setting up the git repo | 115 | # Setting up the git repo |
| 116 | if not is_remote: | 116 | if not is_remote: |
| 117 | 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) | 117 | 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) |
| 118 | else: | 118 | else: |
| 119 | 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) | 119 | 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) |
| 120 | ret = subprocess.call(cmd, shell=True) | 120 | ret = subprocess.call(cmd, shell=True) |
| 121 | if ret == 0: | 121 | if ret == 0: |
| 122 | logger.info('SDK published successfully') | 122 | logger.info('SDK published successfully') |