From: Hans Verkuil <hverkuil@xs4all.nl>
To: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: linux-media@vger.kernel.org
Subject: Re: Build failed in Jenkins: v4l-utils #43
Date: Wed, 2 Oct 2019 11:49:20 +0200 [thread overview]
Message-ID: <90907ad0-6fe3-5293-aeeb-44ecdfb840da@xs4all.nl> (raw)
In-Reply-To: <20191002063658.3771c1fa@coco.lan>
On 10/2/19 11:36 AM, Mauro Carvalho Chehab wrote:
> Em Wed, 2 Oct 2019 10:25:02 +0200
> Hans Verkuil <hverkuil@xs4all.nl> escreveu:
>
>> Hi Mauro,
>>
>> On 10/2/19 10:16 AM, Jenkins Builder Robot wrote:
>>> See <https://builder.linuxtv.org/job/v4l-utils/43/display/redirect?page=changes>
>>>
>>> Changes:
>>>
>>> [hverkuil-cisco] keytable: add new generated keymaps
>>>
>>> [hverkuil-cisco] msg2ctl.pl: add newline after log_msg
>>>
>>> [hverkuil-cisco] cec-follower: drop the hardcoded UI commands list
>>>
>>> [hverkuil-cisco] cec-ctl/cec-log: use new CEC_OP_UI_CMD defines
>>
>> You need to remove utils/cec-follower/cec-log.h.
>>
>> This file was generated but the generated file is now called cec-log-gen.h.
>> A new cec-log.h was also added to utils/common as a companion to cec-log.cpp.
>>
>> Unfortunately, the old cec-log.h clashes with the new cec-log.h. And since
>> the old cec-log.h was generated and so is not part of the git repo it is
>> not removed as part of a 'git pull'.
>>
>> Anyway, just remove utils/cec-follower/cec-log.h and it compiles again.
>
> I manually removed the file at the builder and at the slave machines and
> asked for a new build. The build now succeeded.
>
> That's said, we should really avoid disruptive changes like that, fixing
> the building system for it to do the right thing, as users of the v4l-utils
> will also face the same issue if they update their git trees.
>
> At any time, a clean git update with something similar to:
>
> git remote update
> git fetch origin
> git reset --hard origin/master
> ./bootstrap.sh
> ./configure
> make
>
> should work.
>
> Regards,
> Mauro
>
Yes, I discovered it too late. That said, I'm not sure what to do about
it since the old generated file is not under the control of git.
A 'make distclean' before the 'git fetch' would remove it, but after the
update it is just an orphaned file.
I've actually added a 'make distclean' in my daily build scripts.
Regards,
Hans
next prev parent reply other threads:[~2019-10-02 9:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-02 8:16 Build failed in Jenkins: v4l-utils #43 Jenkins Builder Robot
2019-10-02 8:25 ` Hans Verkuil
2019-10-02 9:36 ` Mauro Carvalho Chehab
2019-10-02 9:49 ` Hans Verkuil [this message]
2019-10-02 10:41 ` Mauro Carvalho Chehab
2019-10-02 10:56 ` Hans Verkuil
2019-10-02 9:01 ` Build failed in Jenkins: v4l-utils #44 Jenkins Builder Robot
2019-10-02 9:30 ` Jenkins build is back to normal : v4l-utils #45 Jenkins Builder Robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=90907ad0-6fe3-5293-aeeb-44ecdfb840da@xs4all.nl \
--to=hverkuil@xs4all.nl \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).