[yocto] [meta-raspberrypi][PATCH] recipes: use oe.utils.conditional instead of deprecated base_conditional

Andrea Galbusera gizero at gmail.com
Tue Jan 30 23:05:42 PST 2018


Hi Martin,

On Tue, Jan 30, 2018 at 2:31 PM, Martin Jansa <martin.jansa at gmail.com> wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
> ---
>  recipes-kernel/linux/linux-raspberrypi.inc | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc
> index df3a3d7..a1c4e52 100644
> --- a/recipes-kernel/linux/linux-raspberrypi.inc
> +++ b/recipes-kernel/linux/linux-raspberrypi.inc
> @@ -22,10 +22,10 @@ KBUILD_DEFCONFIG_raspberrypi3-64 ?= "bcmrpi3_defconfig"
>  CMDLINE ?= "dwc_otg.lpm_enable=0 console=serial0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
>
>  # Add the kernel debugger over console kernel command line option if enabled
> -CMDLINE_append = ' ${@base_conditional("ENABLE_KGDB", "1", "kgdboc=serial0,115200", "", d)}'
> +CMDLINE_append = ' ${@oe.utils.conditional("ENABLE_KGDB", "1", "kgdboc=serial0,115200", "", d)}'
>
>  # Disable rpi logo on boot
> -CMDLINE_append += ' ${@base_conditional("DISABLE_RPI_BOOT_LOGO", "1", "logo.nologo", "", d)}'
> +CMDLINE_append += ' ${@oe.utils.conditional("DISABLE_RPI_BOOT_LOGO", "1", "logo.nologo", "", d)}'
>
>  # You can define CMDLINE_DEBUG as "debug" in your local.conf or distro.conf
>  # to enable kernel debugging.
> @@ -124,7 +124,7 @@ do_configure_prepend() {
>          kernel_configure_variable ROOT_NFS y
>          kernel_configure_variable CMDLINE "\"${CMDLINE_NFSROOT_USB}\""
>      fi
> -    if [ "${@base_conditional('INITRAMFS_IMAGE_BUNDLE', '1', 'True', 'False', d)}" ]; then
> +    if [ "${@oe.utils.conditional('INITRAMFS_IMAGE_BUNDLE', '1', 'True', 'False', d)}" ]; then
>          kernel_configure_variable BLK_DEV_INITRD y
>          kernel_configure_variable INITRAMFS_SOURCE ""
>          kernel_configure_variable RD_GZIP y
> --
> 2.15.1
>
> --
> _______________________________________________
> yocto mailing list
> yocto at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto

Although it's trivial, this one doesn't look to apply neither to
current master nor to any object in the index of meta-raspberrypi
repo...

$ git show df3a3d7
fatal: ambiguous argument 'df3a3d7': unknown revision or path not in
the working tree.



More information about the yocto mailing list