[oe] [meta-qt5][PATCHv2] nativesdk-qtbase: do qmake replacement in ${D} instead of ${B}

[Otavio Salvador]

On Mon, Feb 24, 2014 at 12:44 PM, Martin Jansa <martin.jansa at gmail.com> wrote:
> On Mon, Feb 24, 2014 at 12:18:48PM -0300, Otavio Salvador wrote:
>> Hello Martin,
>>
>> On Sat, Feb 22, 2014 at 5:05 AM, Martin Jansa <martin.jansa at gmail.com> wrote:
>> > On Thu, Feb 20, 2014 at 12:12:11PM -0500, Denys Dmytriyenko wrote:
>> >> From: Denys Dmytriyenko <denys at ti.com>
>> >>
>> >> * This way we don't mangle ${B} and can repeat do_install if necessary. And
>> >>   previously it would require running do_compile again to restore the proper
>> >>   state of ${B}.
>> >> * Need to bump PR, since do_compile isn't changing, but needs to re-run to
>> >>   re-populate qmake-real binary.
>> >>
>> >> Signed-off-by: Denys Dmytriyenko <denys at ti.com>
>> >> ---
>> >>  recipes-qt/qt5/nativesdk-qtbase.inc | 12 ++++++------
>> >>  1 file changed, 6 insertions(+), 6 deletions(-)
>> >>
>> >> diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc
>> >> index fa44009..3cb9b0e 100644
>> >> --- a/recipes-qt/qt5/nativesdk-qtbase.inc
>> >> +++ b/recipes-qt/qt5/nativesdk-qtbase.inc
>> >> @@ -10,6 +10,8 @@ require nativesdk-qt5.inc
>> >>  # it's already included with newer oe-core, but include it here for dylan
>> >>  FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
>> >>
>> >> +PR = "r1"
>> >> +
>> >
>> > It's already merged, but please don't add new PRs, especially to .inc
>> > files.
>>
>> As explained by Denys this is really need, in this case.  I agree it
>> could have been put in the bb recipe though.
>
> Sorry I've overlooked it in message.
>
> with rm_work you wouldn't see this issue, but for cost of reexecuting
> do_compile :)
>
>> Denys, could you move this to the bb recipe? This avoids the PR to be
>> kept when we update to newer version.
>
> I can try to remember this and remove it when doing next upgrade to
> 5.2.2.

Yes but I keep rm_work off in my builders to get this kind of failure ;-)

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750