diff options
author | Andrea Galbusera <gizero@gmail.com> | 2017-07-31 11:19:18 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-09 09:24:16 +0100 |
commit | 1df5a58b12c5f6d0e1492e20ddea81af5ec2221e (patch) | |
tree | a2d289014f77640808e879b1c68cd89aa35278b7 /scripts | |
parent | 6346d12d8df311526f6fc625f34ee6b222d8dc8d (diff) | |
download | poky-1df5a58b12c5f6d0e1492e20ddea81af5ec2221e.tar.gz |
scripts/oe-publish-sdk: use hook to call git update-server-info
The author's initial intent was to use a git hook to automatically call
update-server-info, but the wrong hook type was chosen (post-update). A
post-commit one will do the job, hence allowing to drop the explicit call to
update-server-info.
(From OE-Core rev: 0a8ae997c782794b6ef32654cb245b496ab1de8e)
Signed-off-by: Andrea Galbusera <gizero@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-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 9f7963c249..ee33acf902 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\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) | 117 | cmd = 'set -e; mkdir -p %s/layers; cd %s/layers; if [ ! -e .git ]; then git init .; cp .git/hooks/post-update.sample .git/hooks/post-commit; 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' % (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\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) | 119 | cmd = "ssh %s 'set -e; mkdir -p %s/layers; cd %s/layers; if [ ! -e .git ]; then git init .; cp .git/hooks/post-update.sample .git/hooks/post-commit; 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'" % (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') |