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

Andreas Müller schnitzeltony at googlemail.com
Tue Feb 23 13:37:13 PST 2016


On Tue, Feb 23, 2016 at 10:02 PM, Anders Darander <anders at chargestorm.se> wrote:
> Ping?
>
> We can't build on master branch without this fix...
>
> Cheers,
> Anders
>
> * Khem Raj <raj.khem at gmail.com> [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 <raj.khem at gmail.com>
>> ---
>>  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



More information about the yocto mailing list