Re: [yocto] [meta-raspberrypi][PATCH] linux-raspberrypi: Adjust for libexecdir changes

[Khem Raj]

On Fri, Feb 26, 2016 at 3:35 AM, Jonathan Liu  wrote:
> Hi Khem,
>
> I just posted another patch which does basically the same thing but
> uses ${STAGING_LIBEXECDIR_NATIVE}.
> I checked the expansion of ${STAGING_LIBEXECDIR_NATIVE} on daisy
> branch and master.
>
> daisy:
> [...]/sysroots/x86_64-linux/usr/lib/rpi-mkimage/mkknlimg
> which matches the previous hardcoded path before the patch
>
> master:
> [...]/sysroots/x86_64-linux/usr/libexec/mkknlimg
>
> So it looks like my patch should work on older branches too...
>

yes this approach is better. Therefore I have picked it into
kraj/master, I will test it out and push is
shortly.

> Regards,
> Jonathan
>
> On 25 February 2016 at 08:44, Khem Raj  wrote:
>>
>> On Feb 24, 2016 1:30 PM, "Anders Darander"  wrote:
>>>
>>> * Andreas Müller  [160223 22:38]:
>>> > > * Khem Raj  [160130 18:07]:
>>> > >
>>> > >> diff --git a/recipes-kernel/linux/linux-raspberrypi.inc
>>> > >> b/recipes-kernel/linux/linux-raspberrypi.inc
>>> > >> index 70e8bfe..0798788 100644
>>> > >> --- a/recipes-kernel/linux/linux-raspberrypi.inc
>>> > >> +++ b/recipes-kernel/linux/linux-raspberrypi.inc
>>> > >> @@ -60,7 +60,7 @@ do_rpiboot_mkimage() {
>>> > >>  if test "x${KERNEL_IMAGETYPE}" != "xuImage" ; then
>>> > >>  if test -n "${KERNEL_DEVICETREE}"; then
>>> > >>  # Add RPi bootloader trailer to kernel image to enable
>>> > >> DeviceTree support
>>> > >> -${STAGING_DIR_NATIVE}/usr/lib/rpi-mkimage/mkknlimg
>>> > >> --dtok ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}
>>> > >> +${STAGING_DIR_NATIVE}${libexecdir}/mkknlimg --dtok
>>> > >> ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}
>>> > >>  fi
>>> > >>  fi
>>> > >>  }
>>> > This patch is mandatory but there was a serial with additional fixes
>>> > send by Maciej Borzecki on Feb 2nd. I think this is worth taken into
>>> > account.
>>> >
>>>
>>> Yes, that's right.
>>>
>>> If the rest of the patches in that series is non-controversial, could we
>>> have them applied? Otherwise, could we have Khem's patch applied, and
>>> the other series rebased upon that?
>>>
>>
>> This will also make layer incompatible with jethro and older releases. So
>> before applying this patch jethro has to branch out
>>
>>> We've had the master branch non-building for quite a while now...
>>>
>>> I'm just keen to get either of those patches applied to
>>> meta-raspberrypi. I'd like to avoid having to use a local fork as much
>>> as possible...
>>>
>>> Cheers,
>>> Anders
>>>
>>> --
>>> Anders Darander, Senior System Architect
>>> ChargeStorm AB / eStorm AB
>>> --
>>> ___
>>> yocto mailing list
>>> yocto@yoctoproject.org
>>> https://lists.yoctoproject.org/listinfo/yocto
>>
>>
>> --
>> ___
>> yocto mailing list
>> yocto@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/yocto
>>
-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

Re: [yocto] [meta-raspberrypi][PATCH] linux-raspberrypi: Adjust for libexecdir changes

[Jonathan Liu]

Hi Khem,

I just posted another patch which does basically the same thing but
uses ${STAGING_LIBEXECDIR_NATIVE}.
I checked the expansion of ${STAGING_LIBEXECDIR_NATIVE} on daisy
branch and master.

daisy:
[...]/sysroots/x86_64-linux/usr/lib/rpi-mkimage/mkknlimg
which matches the previous hardcoded path before the patch

master:
[...]/sysroots/x86_64-linux/usr/libexec/mkknlimg

So it looks like my patch should work on older branches too...

Regards,
Jonathan

On 25 February 2016 at 08:44, Khem Raj  wrote:
>
> On Feb 24, 2016 1:30 PM, "Anders Darander"  wrote:
>>
>> * Andreas Müller  [160223 22:38]:
>> > > * Khem Raj  [160130 18:07]:
>> > >
>> > >> diff --git a/recipes-kernel/linux/linux-raspberrypi.inc
>> > >> b/recipes-kernel/linux/linux-raspberrypi.inc
>> > >> index 70e8bfe..0798788 100644
>> > >> --- a/recipes-kernel/linux/linux-raspberrypi.inc
>> > >> +++ b/recipes-kernel/linux/linux-raspberrypi.inc
>> > >> @@ -60,7 +60,7 @@ do_rpiboot_mkimage() {
>> > >>  if test "x${KERNEL_IMAGETYPE}" != "xuImage" ; then
>> > >>  if test -n "${KERNEL_DEVICETREE}"; then
>> > >>  # Add RPi bootloader trailer to kernel image to enable
>> > >> DeviceTree support
>> > >> -${STAGING_DIR_NATIVE}/usr/lib/rpi-mkimage/mkknlimg
>> > >> --dtok ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}
>> > >> +${STAGING_DIR_NATIVE}${libexecdir}/mkknlimg --dtok
>> > >> ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}
>> > >>  fi
>> > >>  fi
>> > >>  }
>> > This patch is mandatory but there was a serial with additional fixes
>> > send by Maciej Borzecki on Feb 2nd. I think this is worth taken into
>> > account.
>> >
>>
>> Yes, that's right.
>>
>> If the rest of the patches in that series is non-controversial, could we
>> have them applied? Otherwise, could we have Khem's patch applied, and
>> the other series rebased upon that?
>>
>
> This will also make layer incompatible with jethro and older releases. So
> before applying this patch jethro has to branch out
>
>> We've had the master branch non-building for quite a while now...
>>
>> I'm just keen to get either of those patches applied to
>> meta-raspberrypi. I'd like to avoid having to use a local fork as much
>> as possible...
>>
>> Cheers,
>> Anders
>>
>> --
>> Anders Darander, Senior System Architect
>> ChargeStorm AB / eStorm AB
>> --
>> ___
>> yocto mailing list
>> yocto@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/yocto
>
>
> --
> ___
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto
>
-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

Re: [yocto] [meta-raspberrypi][PATCH] linux-raspberrypi: Adjust for libexecdir changes

[Trevor Woerner]

On 02/23/16 23:21, Khem Raj wrote:

You can try to use github.com/kraj/meta-raspberrypi kraj/master
I plan to test out more and more pending submissions on that branch


Thanks, and done.

It's too bad meta-raspberrypi didn't have a master-next branch :-)
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

Re: [yocto] [meta-raspberrypi][PATCH] linux-raspberrypi: Adjust for libexecdir changes

[Trevor Woerner]

On 02/24/16 15:28, Anders Darander wrote:

If the rest of the patches in that series is non-controversial, could we
have them applied? Otherwise, could we have Khem's patch applied, and
the other series rebased upon that?

We've had the master branch non-building for quite a while now...

I'm just keen to get either of those patches applied to
meta-raspberrypi. I'd like to avoid having to use a local fork as much
as possible...


+1
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

Re: [yocto] [meta-raspberrypi][PATCH] linux-raspberrypi: Adjust for libexecdir changes

[Anders Darander]

* Andreas Müller  [160223 22:38]:
> > * Khem Raj  [160130 18:07]:
> >
> >> diff --git a/recipes-kernel/linux/linux-raspberrypi.inc 
> >> b/recipes-kernel/linux/linux-raspberrypi.inc
> >> index 70e8bfe..0798788 100644
> >> --- a/recipes-kernel/linux/linux-raspberrypi.inc
> >> +++ b/recipes-kernel/linux/linux-raspberrypi.inc
> >> @@ -60,7 +60,7 @@ do_rpiboot_mkimage() {
> >>  if test "x${KERNEL_IMAGETYPE}" != "xuImage" ; then
> >>  if test -n "${KERNEL_DEVICETREE}"; then
> >>  # Add RPi bootloader trailer to kernel image to enable 
> >> DeviceTree support
> >> -${STAGING_DIR_NATIVE}/usr/lib/rpi-mkimage/mkknlimg --dtok 
> >> ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}
> >> +${STAGING_DIR_NATIVE}${libexecdir}/mkknlimg --dtok 
> >> ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}
> >>  fi
> >>  fi
> >>  }
> This patch is mandatory but there was a serial with additional fixes
> send by Maciej Borzecki on Feb 2nd. I think this is worth taken into
> account.
> 

Yes, that's right.

If the rest of the patches in that series is non-controversial, could we
have them applied? Otherwise, could we have Khem's patch applied, and
the other series rebased upon that?

We've had the master branch non-building for quite a while now...

I'm just keen to get either of those patches applied to
meta-raspberrypi. I'd like to avoid having to use a local fork as much
as possible... 

Cheers,
Anders

-- 
Anders Darander, Senior System Architect
ChargeStorm AB / eStorm AB
-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

Re: [yocto] [meta-raspberrypi][PATCH] linux-raspberrypi: Adjust for libexecdir changes

[Khem Raj]

> On Feb 23, 2016, at 4:37 PM, Andreas Müller  
> wrote:
> 
> On Tue, Feb 23, 2016 at 10:02 PM, Anders Darander  
> wrote:
>> Ping?
>> 
>> We can't build on master branch without this fix...
>> 
>> Cheers,
>> Anders
>> 
>> * Khem Raj  [160130 18:07]:
>> 
>>> libexecdir has changed its location in latest OE core, it used to be
>>> pointing to /usr/lib which was essentially same as libdir and when
>>> hardcoded in do_rpiboot_mkimage it worked.
>> 
>>> Fixes kernel build failures e.g.
>> 
>>> DEBUG: Executing shell function do_rpiboot_mkimage
>>> /a/builder/mnt/build-oe/tmp-musl/work/raspberrypi2-oe-linux-musleabi/linux-raspberrypi/1_4.1.10+gitAUTOINC+b74df9228c-r0/temp/run.do_rpiboot_mkimage.5543:
>>> line 111:
>>> /a/builder/mnt/build-oe/tmp-musl/sysroots/x86_64-linux/usr/lib/rpi-mkimage/mkknlimg:
>>>  No such file or directory
>> 
>>> Signed-off-by: Khem Raj 
>>> ---
>>> recipes-kernel/linux/linux-raspberrypi.inc | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>>> diff --git a/recipes-kernel/linux/linux-raspberrypi.inc 
>>> b/recipes-kernel/linux/linux-raspberrypi.inc
>>> index 70e8bfe..0798788 100644
>>> --- a/recipes-kernel/linux/linux-raspberrypi.inc
>>> +++ b/recipes-kernel/linux/linux-raspberrypi.inc
>>> @@ -60,7 +60,7 @@ do_rpiboot_mkimage() {
>>> if test "x${KERNEL_IMAGETYPE}" != "xuImage" ; then
>>> if test -n "${KERNEL_DEVICETREE}"; then
>>> # Add RPi bootloader trailer to kernel image to enable 
>>> DeviceTree support
>>> -${STAGING_DIR_NATIVE}/usr/lib/rpi-mkimage/mkknlimg --dtok 
>>> ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}
>>> +${STAGING_DIR_NATIVE}${libexecdir}/mkknlimg --dtok 
>>> ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}
>>> fi
>>> fi
>>> }
>> --
>> Anders Darander, Senior System Architect
>> ChargeStorm AB / eStorm AB
>> --
> This patch is mandatory but there was a serial with additional fixes
> send by Maciej Borzecki on Feb 2nd. I think this is worth taken into
> account.

You can try to use github.com/kraj/meta-raspberrypi kraj/master
I plan to test out more and more pending submissions on that branch

> 
> Andreas
> --
> ___
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto



signature.asc
Description: Message signed with OpenPGP using GPGMail
-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

Re: [yocto] [meta-raspberrypi][PATCH] linux-raspberrypi: Adjust for libexecdir changes

[Andreas Müller]

On Tue, Feb 23, 2016 at 10:02 PM, Anders Darander  wrote:
> Ping?
>
> We can't build on master branch without this fix...
>
> Cheers,
> Anders
>
> * Khem Raj  [160130 18:07]:
>
>> libexecdir has changed its location in latest OE core, it used to be
>> pointing to /usr/lib which was essentially same as libdir and when
>> hardcoded in do_rpiboot_mkimage it worked.
>
>> Fixes kernel build failures e.g.
>
>> DEBUG: Executing shell function do_rpiboot_mkimage
>> /a/builder/mnt/build-oe/tmp-musl/work/raspberrypi2-oe-linux-musleabi/linux-raspberrypi/1_4.1.10+gitAUTOINC+b74df9228c-r0/temp/run.do_rpiboot_mkimage.5543:
>> line 111:
>> /a/builder/mnt/build-oe/tmp-musl/sysroots/x86_64-linux/usr/lib/rpi-mkimage/mkknlimg:
>>  No such file or directory
>
>> Signed-off-by: Khem Raj 
>> ---
>>  recipes-kernel/linux/linux-raspberrypi.inc | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>
>> diff --git a/recipes-kernel/linux/linux-raspberrypi.inc 
>> b/recipes-kernel/linux/linux-raspberrypi.inc
>> index 70e8bfe..0798788 100644
>> --- a/recipes-kernel/linux/linux-raspberrypi.inc
>> +++ b/recipes-kernel/linux/linux-raspberrypi.inc
>> @@ -60,7 +60,7 @@ do_rpiboot_mkimage() {
>>  if test "x${KERNEL_IMAGETYPE}" != "xuImage" ; then
>>  if test -n "${KERNEL_DEVICETREE}"; then
>>  # Add RPi bootloader trailer to kernel image to enable 
>> DeviceTree support
>> -${STAGING_DIR_NATIVE}/usr/lib/rpi-mkimage/mkknlimg --dtok 
>> ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}
>> +${STAGING_DIR_NATIVE}${libexecdir}/mkknlimg --dtok 
>> ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}
>>  fi
>>  fi
>>  }
> --
> Anders Darander, Senior System Architect
> ChargeStorm AB / eStorm AB
> --
This patch is mandatory but there was a serial with additional fixes
send by Maciej Borzecki on Feb 2nd. I think this is worth taken into
account.

Andreas
-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

Re: [yocto] [meta-raspberrypi][PATCH] linux-raspberrypi: Adjust for libexecdir changes

[Anders Darander]

Ping?

We can't build on master branch without this fix...

Cheers,
Anders

* Khem Raj  [160130 18:07]:

> libexecdir has changed its location in latest OE core, it used to be
> pointing to /usr/lib which was essentially same as libdir and when
> hardcoded in do_rpiboot_mkimage it worked.

> Fixes kernel build failures e.g.

> DEBUG: Executing shell function do_rpiboot_mkimage
> /a/builder/mnt/build-oe/tmp-musl/work/raspberrypi2-oe-linux-musleabi/linux-raspberrypi/1_4.1.10+gitAUTOINC+b74df9228c-r0/temp/run.do_rpiboot_mkimage.5543:
> line 111:
> /a/builder/mnt/build-oe/tmp-musl/sysroots/x86_64-linux/usr/lib/rpi-mkimage/mkknlimg:
>  No such file or directory

> Signed-off-by: Khem Raj 
> ---
>  recipes-kernel/linux/linux-raspberrypi.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

> diff --git a/recipes-kernel/linux/linux-raspberrypi.inc 
> b/recipes-kernel/linux/linux-raspberrypi.inc
> index 70e8bfe..0798788 100644
> --- a/recipes-kernel/linux/linux-raspberrypi.inc
> +++ b/recipes-kernel/linux/linux-raspberrypi.inc
> @@ -60,7 +60,7 @@ do_rpiboot_mkimage() {
>  if test "x${KERNEL_IMAGETYPE}" != "xuImage" ; then
>  if test -n "${KERNEL_DEVICETREE}"; then
>  # Add RPi bootloader trailer to kernel image to enable 
> DeviceTree support
> -${STAGING_DIR_NATIVE}/usr/lib/rpi-mkimage/mkknlimg --dtok 
> ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}
> +${STAGING_DIR_NATIVE}${libexecdir}/mkknlimg --dtok 
> ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}
>  fi
>  fi
>  }
-- 
Anders Darander, Senior System Architect
ChargeStorm AB / eStorm AB
-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto