Re: [PATCH 4/8] oe-publish-sdk: add pyshtables.py to .gitignore

Paul Eggleton
2016-12-13T04:59:29Z

On Wed, 16 Nov 2016 22:19:33 Robert Yang wrote:
> 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 #10647]

The actual fix looks OK but I don't think 10647 is really the right bug
number. Coincidentally today someone else reported this issue, so this would
probably be a better one:

https://bugzilla.yoctoproject.org/show_bug.cgi?id=10796

> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
> scripts/oe-publish-sdk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/oe-publish-sdk b/scripts/oe-publish-sdk
> index d95c623..e2b1b95 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;"

Cheers,
Paul

--

Paul Eggleton
Intel Open Source Technology Centre