aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-11-15 21:55:44 -0800
committerRobert Yang <liezhi.yang@windriver.com>2016-12-21 06:18:56 +0000
commit60a58a2c83ad7383816a2fcd34f4022b26e36d53 (patch)
treee34779ca217bb6de909db2b88d816cdc555ea066
parent60659ebc25824ef806750aea16c822c3995974eb (diff)
downloadopenembedded-core-contrib-60a58a2c83ad7383816a2fcd34f4022b26e36d53.tar.gz
openembedded-core-contrib-60a58a2c83ad7383816a2fcd34f4022b26e36d53.tar.bz2
openembedded-core-contrib-60a58a2c83ad7383816a2fcd34f4022b26e36d53.zip
oe-publish-sdk: add pyshtables.py to .gitignore
Fixed: MACHINE = "qemux86-64" require conf/multilib.conf MULTILIBS = "multilib:lib32" DEFAULTTUNE_virtclass-multilib-lib32 = "x86" $ bitbake core-image-minimal -cpopulate_sdk_ext [snip] ERROR: Failed to update metadata as there have been changes made to it. Aborting.\nERROR: Changed files:\nb' M poky/bitbake/lib/bb/pysh/pyshtables.py\\n'\n" [snip] This is because the test case will run twice (environment-setup-core2-64-poky-linux and environment-setup-x86-pokymllib32-linux), it would fail in the second run since pyshtables.py is regenerated in the first run. This file is generated automatically, publish it doesn't make any sense, so add it to .gitignore. [YOCTO #10796] Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-rwxr-xr-xscripts/oe-publish-sdk2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/oe-publish-sdk b/scripts/oe-publish-sdk
index d95c623b2c9..e2b1b9501dc 100755
--- a/scripts/oe-publish-sdk
+++ b/scripts/oe-publish-sdk
@@ -116,7 +116,7 @@ def publish(args):
cmd_common = "if [ ! -e .git ]; then"
cmd_common += " git init .;"
cmd_common += " mv .git/hooks/post-update.sample .git/hooks/post-update;"
- cmd_common += " echo '*.pyc\n*.pyo' > .gitignore;"
+ cmd_common += " echo '*.pyc\n*.pyo\npyshtables.py' > .gitignore;"
cmd_common += "fi;"
cmd_common += "git add -A .;"
cmd_common += "git config user.email 'oe@oe.oe' && git config user.name 'OE' && git commit -q -m 'init repo' || true;"