recipes: use oe.utils.conditional instead of deprecated base_conditional

PATCH In review Martin Jansa 2 participants 5 messages Jan 30, 2018 – Jan 31, 2018 Broadcom BCM2711/BCM2835 Arm architecture

lore

Share & tools

lore

Martin Jansa

author

2018-01-30 13:31 UTC #0 lore raw

PATCH 1/1 recipes: use oe.utils.conditional instead of deprecated base_conditional

Signed-off-by Martin Jansa <[email protected]>

---
 recipes-kernel/linux/linux-raspberrypi.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

recipes-kernel/linux/linux-raspberrypi.inc +3 -3

index df3a3d7..a1c4e52 100644
@@ -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

Signature · 1 line

2.15.1

Andrea Galbusera

2018-01-31 07:05 UTC #1 lore raw

Hi Martin,

Quoted 34 lines · Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 recipes-kernel/linux/linux-raspberrypi.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

recipes-kernel/linux/linux-raspberrypi.inc +3 -4

index df3a3d7..a1c4e52 100644
@@ -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

Quoted 5 lines

--
_______________________________________________
yocto mailing list
[email protected]
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.

Andrea Galbusera

2018-01-31 07:20 UTC #2 lore raw

Quoted 47 lines · Andrea Galbusera

Hi Martin,

Quoted 34 lines · Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 recipes-kernel/linux/linux-raspberrypi.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

recipes-kernel/linux/linux-raspberrypi.inc +3 -4

index df3a3d7..a1c4e52 100644
@@ -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

Quoted 5 lines

--
_______________________________________________
yocto mailing list
[email protected]
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...

Quoted 3 lines

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

Also consider that, according to [1] patches should be submitted as pull request on github, being the mailing list only a

[1] https://github.com/agherzan/meta-raspberrypi/blob/master/docs/contributing.md#patches-and-pull-requests

Andrea Galbusera

2018-01-31 07:23 UTC #3 lore raw

Quoted 48 lines · Andrea Galbusera

Quoted 47 lines · Andrea Galbusera

Hi Martin,

Quoted 34 lines · Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 recipes-kernel/linux/linux-raspberrypi.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

recipes-kernel/linux/linux-raspberrypi.inc +3 -4

index df3a3d7..a1c4e52 100644
@@ -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

Quoted 5 lines

--
_______________________________________________
yocto mailing list
[email protected]
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...

Quoted 8 lines

Quoted 3 lines
$ git show df3a3d7
fatal: ambiguous argument 'df3a3d7': unknown revision or path not in
the working tree.
Also consider that, according to [1] patches should be submitted as pull request on github, being the mailing list only a
[1] https://github.com/agherzan/meta-raspberrypi/blob/master/docs/contributing.md#patches-and-pull-requests

Sorry! Hit "send" too early on my previous one... Well you know what I
meant: "...being the mailing list only an additional place for discussion".

Martin Jansa

author

2018-01-31 12:13 UTC #4 lore raw

https://github.com/agherzan/meta-raspberrypi/pull/188

Quoted 77 lines · Andrea Galbusera

Quoted 1 line · Andrea Galbusera
On Wed, Jan 31, 2018 at 8:05 AM, Andrea Galbusera <[email protected]>
Quoted 3 lines · wrote:
Quoted 3 lines
Hi Martin,
On Tue, Jan 30, 2018 at 2:31 PM, Martin Jansa <[email protected]>
Quoted 6 lines · wrote:
Quoted 6 lines
Review
Quoted 6 lines
Signed-off-by Martin Jansa <[email protected]>
---
 recipes-kernel/linux/linux-raspberrypi.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
(quoted diff) +0 -0
b/recipes-kernel/linux/linux-raspberrypi.inc
Quoted 4 lines
Quoted 4 lines
recipes-kernel/linux/linux-raspberrypi.inc KBUILD_DEFCONFIG_raspberrypi3-64 ?=
Quoted 4 lines
index df3a3d7..a1c4e52 100644
recipes-kernel/linux/linux-raspberrypi.inc +0 -0
@@ -22,10 +22,10 @@ KBUILD_DEFCONFIG_raspberrypi3-64 ?=
"bcmrpi3_defconfig"
Quoted 1 line
Quoted 1 line
recipes-kernel/linux/linux-raspberrypi.inc KBUILD_DEFCONFIG_raspberrypi3-64 ?= · line 22
Quoted 1 line
recipes-kernel/linux/linux-raspberrypi.inc +0 -0
 CMDLINE ?= "dwc_otg.lpm_enable=0 console=serial0,115200
root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
Quoted 2 lines
Quoted 2 lines
recipes-kernel/linux/linux-raspberrypi.inc KBUILD_DEFCONFIG_raspberrypi3-64 ?= · line 23
Quoted 2 lines
recipes-kernel/linux/linux-raspberrypi.inc +0 -0
 # Add the kernel debugger over console kernel command line option if
enabled
Quoted 1 line
Quoted 1 line
recipes-kernel/linux/linux-raspberrypi.inc KBUILD_DEFCONFIG_raspberrypi3-64 ?= · line 24
Quoted 1 line
recipes-kernel/linux/linux-raspberrypi.inc +0 -1
-CMDLINE_append = ' ${@base_conditional("ENABLE_KGDB", "1",
"kgdboc=serial0,115200", "", d)}'
Quoted 1 line
Quoted 1 line
recipes-kernel/linux/linux-raspberrypi.inc KBUILD_DEFCONFIG_raspberrypi3-64 ?= · line 24
Quoted 1 line
recipes-kernel/linux/linux-raspberrypi.inc +1 -0
+CMDLINE_append = ' ${@oe.utils.conditional("ENABLE_KGDB", "1",
"kgdboc=serial0,115200", "", d)}'
Quoted 3 lines
Quoted 3 lines
recipes-kernel/linux/linux-raspberrypi.inc KBUILD_DEFCONFIG_raspberrypi3-64 ?= · line 26
Quoted 3 lines
recipes-kernel/linux/linux-raspberrypi.inc +0 -1
 # Disable rpi logo on boot
-CMDLINE_append += ' ${@base_conditional("DISABLE_RPI_BOOT_LOGO",
"1", "logo.nologo", "", d)}'
Quoted 1 line
Quoted 1 line
recipes-kernel/linux/linux-raspberrypi.inc KBUILD_DEFCONFIG_raspberrypi3-64 ?= · line 26
Quoted 1 line
recipes-kernel/linux/linux-raspberrypi.inc +1 -0
+CMDLINE_append += ' ${@oe.utils.conditional("DISABLE_RPI_BOOT_LOGO",
"1", "logo.nologo", "", d)}'
Quoted 2 lines
Quoted 2 lines
recipes-kernel/linux/linux-raspberrypi.inc KBUILD_DEFCONFIG_raspberrypi3-64 ?= · line 27
Quoted 2 lines
recipes-kernel/linux/linux-raspberrypi.inc +0 -0
 # You can define CMDLINE_DEBUG as "debug" in your local.conf or
distro.conf
Quoted 6 lines
Quoted 6 lines
recipes-kernel/linux/linux-raspberrypi.inc do_configure_prepend() { · line 127
Quoted 6 lines
recipes-kernel/linux/linux-raspberrypi.inc +0 -1
 # 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
Quoted 1 line
Quoted 1 line
recipes-kernel/linux/linux-raspberrypi.inc do_configure_prepend() { · line 127
Quoted 1 line
recipes-kernel/linux/linux-raspberrypi.inc +1 -0
+    if [ "${@oe.utils.conditional('INITRAMFS_IMAGE_BUNDLE', '1',
'True', 'False', d)}" ]; then
Quoted 16 lines
Quoted 16 lines
Quoted 11 lines
recipes-kernel/linux/linux-raspberrypi.inc +0 -1
         kernel_configure_variable BLK_DEV_INITRD y
         kernel_configure_variable INITRAMFS_SOURCE ""
         kernel_configure_variable RD_GZIP y
--
2.15.1
--
_______________________________________________
yocto mailing list
[email protected]
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...
Quoted 8 lines
Quoted 3 lines
$ git show df3a3d7
fatal: ambiguous argument 'df3a3d7': unknown revision or path not in
the working tree.
Also consider that, according to [1] patches should be submitted as pull request on github, being the mailing list only a
[1] https://github.com/agherzan/meta-raspberrypi/blob/master/
docs/contributing.md#patches-and-pull-requests
Sorry! Hit "send" too early on my previous one... Well you know what I
meant: "...being the mailing list only an additional place for discussion".