Message ID | 20230104220902.1530659-1-sandeep.gundlupet-raju@amd.com |
---|---|
State | New |
Headers | show |
Series | [v2,1/2] kernel-fitimage: Adjust order of dtb/dtbo files | expand |
Hi Sandeep Am 04.01.23 um 23:09 schrieb Sandeep Gundlupet Raju via lists.openembedded.org: > The dtb files must be before the dtbo files, otherwise the overlays may > not be applied correctly. ... Thanks for the patch updates! There's a problem with the way your patches are received on the Yocto Project mailing lists though. I used to have it too. If I apply your patch through "git am", the author of the commit will be: Sandeep Gundlupet Raju via lists.openembedded.org <sandeep.gundlupet-raju=amd.com@lists.openembedded.org> instead of Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com> That's because of the configuration of the Yocto Project mailing lists, if I understood correctly. Because of this issue, the maintainer has to manually fix this field when accepting your patch. Worse, if he doesn't catch this, that's harder to fix afterwards. You should be able to fix this by running: git config --global sendemail.from "sandeep.gundlupet-raju@amd.com" This should add a "From" field to the sent patch which "git am" should be able to match with your name. At least this worked for me. See https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded#Sending_using_git-send-email Could you try to send an update (don't hesitate to send a private one to me first)? Thanks in advance Michael.
Hi Michael, On 1/5/2023 2:12 AM, Michael Opdenacker wrote: > Hi Sandeep > > Am 04.01.23 um 23:09 schrieb Sandeep Gundlupet Raju via > lists.openembedded.org: >> The dtb files must be before the dtbo files, otherwise the overlays may >> not be applied correctly. > ... > > Thanks for the patch updates! > > There's a problem with the way your patches are received on the Yocto > Project mailing lists though. I used to have it too. > > If I apply your patch through "git am", the author of the commit will be: > Sandeep Gundlupet Raju via lists.openembedded.org > <sandeep.gundlupet-raju=amd.com@lists.openembedded.org> > instead of > Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com> [Sandeep]: Even I was wondering why I'm receiving multiple copy of patch when I sent, Interesting I didn't face this issue with other mailing list. MAIL FROM:<sandeep.gundlupet-raju@amd.com> RCPT TO:<openembedded-core@lists.openembedded.org> RCPT TO:<bruce.ashfield@gmail.com> RCPT TO:<mark.hatle@kernel.crashing.org> RCPT TO:<sandeep.gundlupet-raju@amd.com> From: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com> To: openembedded-core@lists.openembedded.org, bruce.ashfield@gmail.com Cc: mark.hatle@kernel.crashing.org, Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com> Subject: [OE-core][PATCH v2 1/2] kernel-fitimage: Adjust order of dtb/dtbo files Date: Wed, 4 Jan 2023 15:09:01 -0700 Message-Id: <20230104220902.1530659-1-sandeep.gundlupet-raju@amd.com> > That's because of the configuration of the Yocto Project mailing lists, > if I understood correctly. > > Because of this issue, the maintainer has to manually fix this field > when accepting your patch. Worse, if he doesn't catch this, that's > harder to fix afterwards. > > You should be able to fix this by running: > git config --global sendemail.from "sandeep.gundlupet-raju@amd.com" [Sandeep]: I just checked with ~/.gitconfig and it was still using my xilinx id sandeep.gundlupet-raju@xilinx.com, Now I've fixed it. > > This should add a "From" field to the sent patch which "git am" should > be able to match with your name. > At least this worked for me. See > https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded#Sending_using_git-send-email > > Could you try to send an update (don't hesitate to send a private one to > me first)? [Sandeep]: Sure I sent a private one, if everything looks ok then will send it to mailing list. > > Thanks in advance > Michael. >
diff --git a/meta/classes-recipe/kernel-fitimage.bbclass b/meta/classes-recipe/kernel-fitimage.bbclass index 7980910aa8..92e236a0a4 100644 --- a/meta/classes-recipe/kernel-fitimage.bbclass +++ b/meta/classes-recipe/kernel-fitimage.bbclass @@ -590,8 +590,9 @@ 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 - # Skip DTB if we've picked it up previously + for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" -name '*.dtb' -printf '%P\n' | sort) \ + $(find "${EXTERNAL_KERNEL_DEVICETREE}" -name '*.dtbo' -printf '%P\n' | sort); do + # Skip DTB/DTBO if we've picked it up previously echo "$DTBS" | tr ' ' '\n' | grep -xq "$DTB" && continue DTBS="$DTBS $DTB"
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 <sandeep.gundlupet-raju@amd.com> --- 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(-)