diff mbox series

[whinlatter,09/67] uki.bbclass: use basename for dtbs available via KERNEL_DEVICETREE

Message ID 20251213095931.2571498-9-ankur.tyagi85@gmail.com
State Changes Requested
Delegated to: Steve Sakoman
Headers show
Series [whinlatter,01/67] bluez5: upgrade 5.84 -> 5.85 | expand

Commit Message

Ankur Tyagi Dec. 13, 2025, 9:58 a.m. UTC 
From: Ricardo Salveti <ricardo@foundries.io>

Device-tree files set via KERNEL_DEVICETREE are deployed without any
vendor sub-directory (e.g. arm/juno.dtb gets deployed as juno.dtb).

Same is also done in kernel-fit-image.bbclass.

Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
(cherry picked from commit 27a7fbb767c0a25b34a03cae90320908f8ade8de)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 meta/classes-recipe/uki.bbclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Ankur Tyagi Dec. 16, 2025, 3:42 p.m. UTC | #1 
This patch doesn't bring any critical bug fix, hence can be dropped.

On Sat, Dec 13, 2025 at 3:30 PM <ankur.tyagi85@gmail.com> wrote:
>
> From: Ricardo Salveti <ricardo@foundries.io>
>
> Device-tree files set via KERNEL_DEVICETREE are deployed without any
> vendor sub-directory (e.g. arm/juno.dtb gets deployed as juno.dtb).
>
> Same is also done in kernel-fit-image.bbclass.
>
> Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
> (cherry picked from commit 27a7fbb767c0a25b34a03cae90320908f8ade8de)
> Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
> ---
>  meta/classes-recipe/uki.bbclass | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/meta/classes-recipe/uki.bbclass b/meta/classes-recipe/uki.bbclass
> index fedff222c6..a2b1c8a82d 100644
> --- a/meta/classes-recipe/uki.bbclass
> +++ b/meta/classes-recipe/uki.bbclass
> @@ -152,7 +152,9 @@ python do_uki() {
>      # dtb
>      if d.getVar('KERNEL_DEVICETREE'):
>          for dtb in d.getVar('KERNEL_DEVICETREE').split():
> -            dtb_path = "%s/%s" % (deploy_dir_image, dtb)
> +            # DTBs are without sub-directories in deploy_dir
> +            dtb_name = os.path.basename(dtb)
> +            dtb_path = "%s/%s" % (deploy_dir_image, dtb_name)
>              if not os.path.exists(dtb_path):
>                  bb.fatal(f"ERROR: cannot find {dtb_path}.")
>              ukify_cmd += " --devicetree %s" % (dtb_path)
Alexander Kanavin Dec. 16, 2025, 3:43 p.m. UTC | #2 
Ankur, you are doing it backwards. You need to review this original
set privately, and then send a v2 set including only the patches that
comply with the stable branch policy.

Alex

On Tue, 16 Dec 2025 at 16:42, Ankur Tyagi via lists.openembedded.org
<ankur.tyagi85=gmail.com@lists.openembedded.org> wrote:
>
> This patch doesn't bring any critical bug fix, hence can be dropped.
>
> On Sat, Dec 13, 2025 at 3:30 PM <ankur.tyagi85@gmail.com> wrote:
> >
> > From: Ricardo Salveti <ricardo@foundries.io>
> >
> > Device-tree files set via KERNEL_DEVICETREE are deployed without any
> > vendor sub-directory (e.g. arm/juno.dtb gets deployed as juno.dtb).
> >
> > Same is also done in kernel-fit-image.bbclass.
> >
> > Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
> > Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
> > (cherry picked from commit 27a7fbb767c0a25b34a03cae90320908f8ade8de)
> > Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
> > ---
> >  meta/classes-recipe/uki.bbclass | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta/classes-recipe/uki.bbclass b/meta/classes-recipe/uki.bbclass
> > index fedff222c6..a2b1c8a82d 100644
> > --- a/meta/classes-recipe/uki.bbclass
> > +++ b/meta/classes-recipe/uki.bbclass
> > @@ -152,7 +152,9 @@ python do_uki() {
> >      # dtb
> >      if d.getVar('KERNEL_DEVICETREE'):
> >          for dtb in d.getVar('KERNEL_DEVICETREE').split():
> > -            dtb_path = "%s/%s" % (deploy_dir_image, dtb)
> > +            # DTBs are without sub-directories in deploy_dir
> > +            dtb_name = os.path.basename(dtb)
> > +            dtb_path = "%s/%s" % (deploy_dir_image, dtb_name)
> >              if not os.path.exists(dtb_path):
> >                  bb.fatal(f"ERROR: cannot find {dtb_path}.")
> >              ukify_cmd += " --devicetree %s" % (dtb_path)
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#227972): https://lists.openembedded.org/g/openembedded-core/message/227972
> Mute This Topic: https://lists.openembedded.org/mt/116760385/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Ankur Tyagi Dec. 16, 2025, 4:11 p.m. UTC | #3 
On Tue, Dec 16, 2025 at 9:14 PM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> Ankur, you are doing it backwards. You need to review this original
> set privately, and then send a v2 set including only the patches that
> comply with the stable branch policy.
>

Thanks Alex, understood.

> Alex
>
> On Tue, 16 Dec 2025 at 16:42, Ankur Tyagi via lists.openembedded.org
> <ankur.tyagi85=gmail.com@lists.openembedded.org> wrote:
> >
> > This patch doesn't bring any critical bug fix, hence can be dropped.
> >
> > On Sat, Dec 13, 2025 at 3:30 PM <ankur.tyagi85@gmail.com> wrote:
> > >
> > > From: Ricardo Salveti <ricardo@foundries.io>
> > >
> > > Device-tree files set via KERNEL_DEVICETREE are deployed without any
> > > vendor sub-directory (e.g. arm/juno.dtb gets deployed as juno.dtb).
> > >
> > > Same is also done in kernel-fit-image.bbclass.
> > >
> > > Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
> > > Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
> > > (cherry picked from commit 27a7fbb767c0a25b34a03cae90320908f8ade8de)
> > > Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
> > > ---
> > >  meta/classes-recipe/uki.bbclass | 4 +++-
> > >  1 file changed, 3 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/meta/classes-recipe/uki.bbclass b/meta/classes-recipe/uki.bbclass
> > > index fedff222c6..a2b1c8a82d 100644
> > > --- a/meta/classes-recipe/uki.bbclass
> > > +++ b/meta/classes-recipe/uki.bbclass
> > > @@ -152,7 +152,9 @@ python do_uki() {
> > >      # dtb
> > >      if d.getVar('KERNEL_DEVICETREE'):
> > >          for dtb in d.getVar('KERNEL_DEVICETREE').split():
> > > -            dtb_path = "%s/%s" % (deploy_dir_image, dtb)
> > > +            # DTBs are without sub-directories in deploy_dir
> > > +            dtb_name = os.path.basename(dtb)
> > > +            dtb_path = "%s/%s" % (deploy_dir_image, dtb_name)
> > >              if not os.path.exists(dtb_path):
> > >                  bb.fatal(f"ERROR: cannot find {dtb_path}.")
> > >              ukify_cmd += " --devicetree %s" % (dtb_path)
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#227972): https://lists.openembedded.org/g/openembedded-core/message/227972
> > Mute This Topic: https://lists.openembedded.org/mt/116760385/1686489
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
diff mbox series

Patch

diff --git a/meta/classes-recipe/uki.bbclass b/meta/classes-recipe/uki.bbclass
index fedff222c6..a2b1c8a82d 100644
--- a/meta/classes-recipe/uki.bbclass
+++ b/meta/classes-recipe/uki.bbclass
@@ -152,7 +152,9 @@  python do_uki() {
     # dtb
     if d.getVar('KERNEL_DEVICETREE'):
         for dtb in d.getVar('KERNEL_DEVICETREE').split():
-            dtb_path = "%s/%s" % (deploy_dir_image, dtb)
+            # DTBs are without sub-directories in deploy_dir
+            dtb_name = os.path.basename(dtb)
+            dtb_path = "%s/%s" % (deploy_dir_image, dtb_name)
             if not os.path.exists(dtb_path):
                 bb.fatal(f"ERROR: cannot find {dtb_path}.")
             ukify_cmd += " --devicetree %s" % (dtb_path)