[OE-core][PATCH] piglit: rename virtual/opencl-icd to virtual/libopencl1

public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed

* [OE-core][PATCH] piglit: rename virtual/opencl-icd to virtual/libopencl1
@ 2025-09-23 14:21 Ryan Eatmon
  2025-09-23 14:21 ` [OE-core][PATCH] u-boot: Add specifying make options as part the config looping Ryan Eatmon
       [not found] ` <1867EF4716E8ED43.18262@lists.openembedded.org>
  0 siblings, 2 replies; 3+ messages in thread
From: Ryan Eatmon @ 2025-09-23 14:21 UTC (permalink / raw)
  To: openembedded-core

A change in meta-openembedded that provided virtual/opencl-icd [1]
changed the name to virtual/libopencl1.

[1] https://git.openembedded.org/meta-openembedded/commit/?id=87b44d29b6942427bfb1fab02a4564e41dcc01a0

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 meta/recipes-graphics/piglit/piglit_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index 59f014afee..63c0cf1ac0 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -42,7 +42,7 @@ PACKAGECONFIG ??= " \
 "
 PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut,"
 PACKAGECONFIG[glx] = "-DPIGLIT_BUILD_GLX_TESTS=ON,-DPIGLIT_BUILD_GLX_TESTS=OFF"
-PACKAGECONFIG[opencl] = "-DPIGLIT_BUILD_CL_TESTS=ON,-DPIGLIT_BUILD_CL_TESTS=OFF,virtual/opencl-icd"
+PACKAGECONFIG[opencl] = "-DPIGLIT_BUILD_CL_TESTS=ON,-DPIGLIT_BUILD_CL_TESTS=OFF,virtual/libopencl1"
 PACKAGECONFIG[x11] = "-DPIGLIT_USE_X11=1 -DPIGLIT_BUILD_GL_TESTS=ON -DPIGLIT_BUILD_DMA_BUF_TESTS=ON,-DPIGLIT_USE_X11=0 -DPIGLIT_BUILD_GL_TESTS=OFF -DPIGLIT_BUILD_DMA_BUF_TESTS=OFF,${X11_DEPS}, ${X11_RDEPS}"
 PACKAGECONFIG[vulkan] = "-DPIGLIT_BUILD_VK_TESTS=ON,-DPIGLIT_BUILD_VK_TESTS=OFF,glslang-native vulkan-loader,glslang"
 PACKAGECONFIG[wayland] = "-DPIGLIT_USE_WAYLAND=1,-DPIGLIT_USE_WAYLAND=0,wayland-native wayland wayland-protocols"
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [OE-core][PATCH] u-boot: Add specifying make options as part the config looping
  2025-09-23 14:21 [OE-core][PATCH] piglit: rename virtual/opencl-icd to virtual/libopencl1 Ryan Eatmon
@ 2025-09-23 14:21 ` Ryan Eatmon
       [not found] ` <1867EF4716E8ED43.18262@lists.openembedded.org>
  1 sibling, 0 replies; 3+ messages in thread
From: Ryan Eatmon @ 2025-09-23 14:21 UTC (permalink / raw)
  To: openembedded-core

There is a need to generate alternative versions of the uboot files
using the existing config looping system, but we need to add additional
settings to the make call rather simply specifying a different config.
Specifically we have two use cases:

1) We want to sign the same uboot files with two different keys where
   the key will be passed on the make call.
2) We want to include the alternative defconfigs from a different
   repository and need to add the path to this new location on the make
   command line.

This introduces a fourth value for the UBOOT_CONFIG settings:

  config,images,binary,make_opts

The values are placed into a new generated variable
UBOOT_CONFIG_MAKE_OPTS which is a '?' separated list since space can be
present if you need to specify multiple options.  This is handled by
changing IFS in the shell code when looping over the variable.

Additionally, add in a new variable UBOOT_MAKE_OPTS which is added to
the make calls in the various do_compile functions that do the actual
compiling.

Upstream-Status: Pending

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 meta/classes-recipe/uboot-config.bbclass     | 15 +++++++++++++--
 meta/recipes-bsp/u-boot/u-boot-configure.inc | 18 +++++++++++++++---
 meta/recipes-bsp/u-boot/u-boot.inc           | 16 ++++++++++++++--
 3 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/meta/classes-recipe/uboot-config.bbclass b/meta/classes-recipe/uboot-config.bbclass
index bc20913f73..eb82dd3583 100644
--- a/meta/classes-recipe/uboot-config.bbclass
+++ b/meta/classes-recipe/uboot-config.bbclass
@@ -35,6 +35,7 @@ UBOOT_BINARYNAME ?= "${@os.path.splitext(d.getVar("UBOOT_BINARY"))[0]}"
 UBOOT_IMAGE ?= "${UBOOT_BINARYNAME}-${MACHINE}-${UBOOT_VERSION}.${UBOOT_SUFFIX}"
 UBOOT_SYMLINK ?= "${UBOOT_BINARYNAME}-${MACHINE}.${UBOOT_SUFFIX}"
 UBOOT_MAKE_TARGET ?= "all"
+UBOOT_MAKE_OPTS ?= ""
 
 # Output the ELF generated. Some platforms can use the ELF file and directly
 # load it (JTAG booting, QEMU) additionally the ELF can be used for debugging
@@ -103,6 +104,7 @@ python () {
     ubootconfigflags = d.getVarFlags('UBOOT_CONFIG')
     ubootbinary = d.getVar('UBOOT_BINARY')
     ubootbinaries = d.getVar('UBOOT_BINARIES')
+    ubootconfigmakeopts = d.getVar('UBOOT_CONFIG_MAKE_OPTS')
     # The "doc" varflag is special, we don't want to see it here
     ubootconfigflags.pop('doc', None)
     ubootconfig = (d.getVar('UBOOT_CONFIG') or "").split()
@@ -120,6 +122,9 @@ python () {
     if ubootconfigflags and ubootbinaries:
         raise bb.parse.SkipRecipe("You cannot use UBOOT_BINARIES as it is internal to uboot_config.bbclass.")
 
+    if ubootconfigflags and ubootconfigmakeopts:
+        raise bb.parse.SkipRecipe("You cannot use UBOOT_CONFIG_MAKE_OPTS as it is internal to uboot_config.bbclass.")
+
     if len(ubootconfig) > 0:
         for config in ubootconfig:
             found = False
@@ -127,8 +132,8 @@ python () {
                 if config == f: 
                     found = True
                     items = v.split(',')
-                    if items[0] and len(items) > 3:
-                        raise bb.parse.SkipRecipe('Only config,images,binary can be specified!')
+                    if items[0] and len(items) > 4:
+                        raise bb.parse.SkipRecipe('Only config,images,binary,make_opts can be specified!')
                     d.appendVar('UBOOT_MACHINE', ' ' + items[0])
                     # IMAGE_FSTYPES appending
                     if len(items) > 1 and items[1]:
@@ -140,6 +145,12 @@ python () {
                     else:
                         bb.debug(1, "Appending '%s' to UBOOT_BINARIES." % ubootbinary)
                         d.appendVar('UBOOT_BINARIES', ' ' + ubootbinary)
+                    if len(items) > 3 and items[3]:
+                        bb.debug(1, "Appending '%s' to UBOOT_CONFIG_MAKE_OPTS." % items[3])
+                        d.appendVar('UBOOT_CONFIG_MAKE_OPTS', items[3] + " ? ")
+                    else:
+                        bb.debug(1, "Appending '%s' to UBOOT_CONFIG_MAKE_OPTS." % "")
+                        d.appendVar('UBOOT_CONFIG_MAKE_OPTS', " ? ")
                     break
 
             if not found:
diff --git a/meta/recipes-bsp/u-boot/u-boot-configure.inc b/meta/recipes-bsp/u-boot/u-boot-configure.inc
index a15511f8b2..bada506b66 100644
--- a/meta/recipes-bsp/u-boot/u-boot-configure.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-configure.inc
@@ -33,7 +33,19 @@ uboot_configure_config () {
     config=$1
     type=$2
 
-    oe_runmake -C ${S} O=${B}/${config} ${config}
+    unset k
+    IFS="?"
+    uboot_config_make_opts="${UBOOT_CONFIG_MAKE_OPTS}"
+    for config_make_opts in $uboot_config_make_opts; do
+        k=$(expr $k + 1);
+        if [ $k -eq $i ]; then
+            break
+        fi
+    done
+    unset IFS
+    unset k
+
+    oe_runmake -C ${S} O=${B}/${config} ${config_make_opts} ${UBOOT_MAKE_OPTS} ${config}
     if [ -n "${@' '.join(find_cfgs(d))}" ]; then
         merge_config.sh -m -O ${B}/${config} ${B}/${config}/.config ${@" ".join(find_cfgs(d))}
         oe_runmake -C ${S} O=${B}/${config} oldconfig
@@ -42,9 +54,9 @@ uboot_configure_config () {
 
 uboot_configure () {
     if [ -n "${UBOOT_MACHINE}" ]; then
-        oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE}
+        oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_OPTS} ${UBOOT_MACHINE}
     else
-        oe_runmake -C ${S} O=${B} oldconfig
+        oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_OPTS} oldconfig
     fi
     merge_config.sh -m .config ${@" ".join(find_cfgs(d))}
     cml1_do_configure
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index b7242de5de..e0a69e740e 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -75,7 +75,19 @@ uboot_compile_config () {
     config=$2
     type=$3
 
-    oe_runmake -C ${S} O=${B}/${config} ${UBOOT_MAKE_TARGET}
+    unset k
+    IFS="?"
+    uboot_config_make_opts="${UBOOT_CONFIG_MAKE_OPTS}"
+    for config_make_opts in $uboot_config_make_opts; do
+        k=$(expr $k + 1);
+        if [ $k -eq $i ]; then
+            break
+        fi
+    done
+    unset IFS
+    unset k
+
+    oe_runmake -C ${S} O=${B}/${config} ${config_make_opts} ${UBOOT_MAKE_OPTS} ${UBOOT_MAKE_TARGET}
 
     unset k
     for binary in ${UBOOT_BINARIES}; do
@@ -102,7 +114,7 @@ uboot_compile_config_copy_binary () {
 }
 
 uboot_compile () {
-    oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_TARGET}
+    oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_OPTS} ${UBOOT_MAKE_TARGET}
 
     # Generate the uboot-initial-env
     if [ -n "${UBOOT_INITIAL_ENV}" ]; then
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 3+ messages in thread

[parent not found: <1867EF4716E8ED43.18262@lists.openembedded.org>]

* Re: [OE-core][PATCH] u-boot: Add specifying make options as part the config looping
       [not found] ` <1867EF4716E8ED43.18262@lists.openembedded.org>
@ 2025-09-23 14:22   ` Ryan Eatmon
  0 siblings, 0 replies; 3+ messages in thread
From: Ryan Eatmon @ 2025-09-23 14:22 UTC (permalink / raw)
  To: openembedded-core


Ignore this patch...  I accidentally sent it (not sure how).  I'm not 
ready to send it yet.  Still need to do some more testing internally.

Feel free to comment as an RFC in the meantime if you would like.



On 9/23/2025 9:21 AM, Ryan Eatmon via lists.openembedded.org wrote:
> There is a need to generate alternative versions of the uboot files
> using the existing config looping system, but we need to add additional
> settings to the make call rather simply specifying a different config.
> Specifically we have two use cases:
> 
> 1) We want to sign the same uboot files with two different keys where
>     the key will be passed on the make call.
> 2) We want to include the alternative defconfigs from a different
>     repository and need to add the path to this new location on the make
>     command line.
> 
> This introduces a fourth value for the UBOOT_CONFIG settings:
> 
>    config,images,binary,make_opts
> 
> The values are placed into a new generated variable
> UBOOT_CONFIG_MAKE_OPTS which is a '?' separated list since space can be
> present if you need to specify multiple options.  This is handled by
> changing IFS in the shell code when looping over the variable.
> 
> Additionally, add in a new variable UBOOT_MAKE_OPTS which is added to
> the make calls in the various do_compile functions that do the actual
> compiling.
> 
> Upstream-Status: Pending
> 
> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
> ---
>   meta/classes-recipe/uboot-config.bbclass     | 15 +++++++++++++--
>   meta/recipes-bsp/u-boot/u-boot-configure.inc | 18 +++++++++++++++---
>   meta/recipes-bsp/u-boot/u-boot.inc           | 16 ++++++++++++++--
>   3 files changed, 42 insertions(+), 7 deletions(-)
> 
> diff --git a/meta/classes-recipe/uboot-config.bbclass b/meta/classes-recipe/uboot-config.bbclass
> index bc20913f73..eb82dd3583 100644
> --- a/meta/classes-recipe/uboot-config.bbclass
> +++ b/meta/classes-recipe/uboot-config.bbclass
> @@ -35,6 +35,7 @@ UBOOT_BINARYNAME ?= "${@os.path.splitext(d.getVar("UBOOT_BINARY"))[0]}"
>   UBOOT_IMAGE ?= "${UBOOT_BINARYNAME}-${MACHINE}-${UBOOT_VERSION}.${UBOOT_SUFFIX}"
>   UBOOT_SYMLINK ?= "${UBOOT_BINARYNAME}-${MACHINE}.${UBOOT_SUFFIX}"
>   UBOOT_MAKE_TARGET ?= "all"
> +UBOOT_MAKE_OPTS ?= ""
>   
>   # Output the ELF generated. Some platforms can use the ELF file and directly
>   # load it (JTAG booting, QEMU) additionally the ELF can be used for debugging
> @@ -103,6 +104,7 @@ python () {
>       ubootconfigflags = d.getVarFlags('UBOOT_CONFIG')
>       ubootbinary = d.getVar('UBOOT_BINARY')
>       ubootbinaries = d.getVar('UBOOT_BINARIES')
> +    ubootconfigmakeopts = d.getVar('UBOOT_CONFIG_MAKE_OPTS')
>       # The "doc" varflag is special, we don't want to see it here
>       ubootconfigflags.pop('doc', None)
>       ubootconfig = (d.getVar('UBOOT_CONFIG') or "").split()
> @@ -120,6 +122,9 @@ python () {
>       if ubootconfigflags and ubootbinaries:
>           raise bb.parse.SkipRecipe("You cannot use UBOOT_BINARIES as it is internal to uboot_config.bbclass.")
>   
> +    if ubootconfigflags and ubootconfigmakeopts:
> +        raise bb.parse.SkipRecipe("You cannot use UBOOT_CONFIG_MAKE_OPTS as it is internal to uboot_config.bbclass.")
> +
>       if len(ubootconfig) > 0:
>           for config in ubootconfig:
>               found = False
> @@ -127,8 +132,8 @@ python () {
>                   if config == f:
>                       found = True
>                       items = v.split(',')
> -                    if items[0] and len(items) > 3:
> -                        raise bb.parse.SkipRecipe('Only config,images,binary can be specified!')
> +                    if items[0] and len(items) > 4:
> +                        raise bb.parse.SkipRecipe('Only config,images,binary,make_opts can be specified!')
>                       d.appendVar('UBOOT_MACHINE', ' ' + items[0])
>                       # IMAGE_FSTYPES appending
>                       if len(items) > 1 and items[1]:
> @@ -140,6 +145,12 @@ python () {
>                       else:
>                           bb.debug(1, "Appending '%s' to UBOOT_BINARIES." % ubootbinary)
>                           d.appendVar('UBOOT_BINARIES', ' ' + ubootbinary)
> +                    if len(items) > 3 and items[3]:
> +                        bb.debug(1, "Appending '%s' to UBOOT_CONFIG_MAKE_OPTS." % items[3])
> +                        d.appendVar('UBOOT_CONFIG_MAKE_OPTS', items[3] + " ? ")
> +                    else:
> +                        bb.debug(1, "Appending '%s' to UBOOT_CONFIG_MAKE_OPTS." % "")
> +                        d.appendVar('UBOOT_CONFIG_MAKE_OPTS', " ? ")
>                       break
>   
>               if not found:
> diff --git a/meta/recipes-bsp/u-boot/u-boot-configure.inc b/meta/recipes-bsp/u-boot/u-boot-configure.inc
> index a15511f8b2..bada506b66 100644
> --- a/meta/recipes-bsp/u-boot/u-boot-configure.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot-configure.inc
> @@ -33,7 +33,19 @@ uboot_configure_config () {
>       config=$1
>       type=$2
>   
> -    oe_runmake -C ${S} O=${B}/${config} ${config}
> +    unset k
> +    IFS="?"
> +    uboot_config_make_opts="${UBOOT_CONFIG_MAKE_OPTS}"
> +    for config_make_opts in $uboot_config_make_opts; do
> +        k=$(expr $k + 1);
> +        if [ $k -eq $i ]; then
> +            break
> +        fi
> +    done
> +    unset IFS
> +    unset k
> +
> +    oe_runmake -C ${S} O=${B}/${config} ${config_make_opts} ${UBOOT_MAKE_OPTS} ${config}
>       if [ -n "${@' '.join(find_cfgs(d))}" ]; then
>           merge_config.sh -m -O ${B}/${config} ${B}/${config}/.config ${@" ".join(find_cfgs(d))}
>           oe_runmake -C ${S} O=${B}/${config} oldconfig
> @@ -42,9 +54,9 @@ uboot_configure_config () {
>   
>   uboot_configure () {
>       if [ -n "${UBOOT_MACHINE}" ]; then
> -        oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE}
> +        oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_OPTS} ${UBOOT_MACHINE}
>       else
> -        oe_runmake -C ${S} O=${B} oldconfig
> +        oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_OPTS} oldconfig
>       fi
>       merge_config.sh -m .config ${@" ".join(find_cfgs(d))}
>       cml1_do_configure
> diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
> index b7242de5de..e0a69e740e 100644
> --- a/meta/recipes-bsp/u-boot/u-boot.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot.inc
> @@ -75,7 +75,19 @@ uboot_compile_config () {
>       config=$2
>       type=$3
>   
> -    oe_runmake -C ${S} O=${B}/${config} ${UBOOT_MAKE_TARGET}
> +    unset k
> +    IFS="?"
> +    uboot_config_make_opts="${UBOOT_CONFIG_MAKE_OPTS}"
> +    for config_make_opts in $uboot_config_make_opts; do
> +        k=$(expr $k + 1);
> +        if [ $k -eq $i ]; then
> +            break
> +        fi
> +    done
> +    unset IFS
> +    unset k
> +
> +    oe_runmake -C ${S} O=${B}/${config} ${config_make_opts} ${UBOOT_MAKE_OPTS} ${UBOOT_MAKE_TARGET}
>   
>       unset k
>       for binary in ${UBOOT_BINARIES}; do
> @@ -102,7 +114,7 @@ uboot_compile_config_copy_binary () {
>   }
>   
>   uboot_compile () {
> -    oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_TARGET}
> +    oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_OPTS} ${UBOOT_MAKE_TARGET}
>   
>       # Generate the uboot-initial-env
>       if [ -n "${UBOOT_INITIAL_ENV}" ]; then
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#223880): https://lists.openembedded.org/g/openembedded-core/message/223880
> Mute This Topic: https://lists.openembedded.org/mt/115394716/6551054
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [reatmon@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 

-- 
Ryan Eatmon                reatmon@ti.com
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2025-09-23 14:22 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-09-23 14:21 [OE-core][PATCH] piglit: rename virtual/opencl-icd to virtual/libopencl1 Ryan Eatmon
2025-09-23 14:21 ` [OE-core][PATCH] u-boot: Add specifying make options as part the config looping Ryan Eatmon
     [not found] ` <1867EF4716E8ED43.18262@lists.openembedded.org>
2025-09-23 14:22   ` Ryan Eatmon

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox