On Tue, Jan 17, 2023 at 6:35 AM Sandeep Gundlupet Raju via lists.openembedded.org <[email protected]> wrote: > > Hi All, > > Can someone merge these patches to langdale branch?
I already have them in my current test queue, which you can monitor at: https://git.openembedded.org/openembedded-core-contrib/log/?h=stable/langdale-nut Steve > On 1/13/2023 9:51 AM, Gundlupet Raju, Sandeep wrote: > > Hi Richard, Alex, > > > > Thanks for merging the patches in master. Can you merge these patches > > to langdale release as well? > > > > Thanks, > > > > Sandeep > > > > On 1/12/2023 7:19 PM, Gundlupet Raju, Sandeep wrote: > >> Hi Michael, > >> > >> Any updates on patch merge? > >> > >> Thanks, > >> > >> Sandeep > >> > >> On 1/8/2023 10:25 AM, [email protected] wrote: > >>> From: Sandeep Gundlupet Raju <[email protected]> > >>> > >>> The dtb files must be before the dtbo files, otherwise the overlays may > >>> not be applied correctly. > >>> > >>> From Bruce Ashfield: > >>> > >>> We can split between dtbs and dtbos, they just need to be sorted > >>> for reproducibility reasons. > >>> > >>> Of course, this was only working by luck previously (before the > >>> sort), since it has always been gathering dtbs and dtbo's with > >>> find, depending on filesystem ordering for the order in the > >>> fitimage). > >>> > >>> Signed-off-by: Sandeep Gundlupet Raju <[email protected]> > >>> --- > >>> > >>> Changes in v2: > >>> - Remove 2 loops and use single loop for dtb and dtbo with same > >>> logic. > >>> > >>> --- > >>> meta/classes-recipe/kernel-fitimage.bbclass | 5 +++-- > >>> 1 file changed, 3 insertions(+), 2 deletions(-) > >>> > >>> diff --git a/meta/classes-recipe/kernel-fitimage.bbclass > >>> b/meta/classes-recipe/kernel-fitimage.bbclass > >>> index 8ddebf8dd8..06cdc4f1ec 100644 > >>> --- a/meta/classes-recipe/kernel-fitimage.bbclass > >>> +++ b/meta/classes-recipe/kernel-fitimage.bbclass > >>> @@ -546,10 +546,11 @@ fitimage_assemble() { > >>> if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ]; then > >>> dtbcount=1 > >>> - for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name > >>> '*.dtb' -o -name '*.dtbo' \) -printf '%P\n' | sort); do > >>> + for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" -name > >>> '*.dtb' -printf '%P\n' | sort) \ > >>> + $(find "${EXTERNAL_KERNEL_DEVICETREE}" -name '*.dtbo' > >>> -printf '%P\n' | sort); do > >>> DTB=$(echo "$DTB" | tr '/' '_') > >>> - # Skip DTB if we've picked it up previously > >>> + # Skip DTB/DTBO if we've picked it up previously > >>> echo "$DTBS" | tr ' ' '\n' | grep -xq "$DTB" && continue > >>> DTBS="$DTBS $DTB" > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176102): https://lists.openembedded.org/g/openembedded-core/message/176102 Mute This Topic: https://lists.openembedded.org/mt/96134986/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
