<div dir="ltr">Thanks Joel.<div><br></div><div>The issue could be duplicated following the steps in the <span style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">romulus machine.</span></div><div><br></div><div>1. 'devtool modify linux-aspeed'</div><div>2. 'cd workspace/sources/linux-aspeed/' and edit 'arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts'</div><div>3. 'git add -A' and 'git commit -m 'Test modify dts' '</div><div>4. go to build directory and 'devtool update-recipe -m patch -a ../meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/ linux-aspeed'</div><div>5. Confirm the below files are generated.</div><div><div>meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed/0001-Test-modify-dts.patch</div><div>meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed_git.bbappend</div></div><div>6. 'devtool reset linux-aspeed' and remove '
<span style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">workspace/sources/linux-aspeed/</span>'</div><div>7. <span style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">'devtool modify linux-aspeed' again</span></div><div><span style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">8. 'cd
<span style="text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">workspace/sources/linux-aspeed/</span>
' and the commit with the '<span style="text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">Test modify dts' message not found while 'git log'</span></span></div><div><span style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline"><span style="text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">9. 'git branch'</span></span></div><div><span style="background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline"><span style="text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline"><div> dev</div><div> dev-4.10</div><div> dev-4.13</div><div> dev-4.17</div><div> dev-4.3</div><div> dev-4.4</div><div> dev-4.6</div><div> dev-4.7</div><div>* devtool</div><div> devtool-no-overrides</div><div> devtool-override-df-obmc-ubi-fs</div><div> master</div><div>10. 'git checkout
<span style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">dev-4.17' and 'git log'</span></div><div><span style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline"><br></span></div><div><span style="background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline"><div>commit 2310638091e7b4dd97014f1b373a9ba111ac4e58</div><div>Author: Henbin.Chang <<a href="mailto:henbin-chang@mic.com.tw">henbin-chang@mic.com.tw</a>></div><div>Date: Thu Aug 9 16:15:48 2018 +0800</div><div><br></div><div> Test modify dts</div></span></div></span></span></div><div><span style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline"><br></span></div><div><span style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">I had no idea why the patch was not applied in the 'devtool' branch.</span></div><div><span style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline"><br></span></div><div><span style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">BRs,</span></div><div><span style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">Henbin</span></div><div class="gmail_extra"><br><div class="gmail_quote">2018-08-10 9:01 GMT+08:00 Joel Stanley <span dir="ltr"><<a href="mailto:joel@jms.id.au" target="_blank">joel@jms.id.au</a>></span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hello,<br>
<span class=""><br>
On Tue, 7 Aug 2018 at 11:13, Henbin Chang <<a href="mailto:henbinchang@gmail.com">henbinchang@gmail.com</a>> wrote:<br>
> We found the patch files would be applied while 'devtool modify linux-aspeed' after upgrade to Yocto 2.5.<br>
> And show the below warning message.<br>
><br>
> WARNING: SRC_URI is conditionally overridden in this recipe, thus several devtool-override-* branches have been created, one for each override that makes changes to SRC_URI. It is recommended that you make changes to the devtool branch first, then checkout and rebase each devtool-override-* branch and update any unique patches there (duplicates on those branches will be ignored by devtool finish/update-recipe)<br>
<br>
</span>I do not use yocto when developing the kernel, so I can't help here. I<br>
have cc'd some other developers that my have encountered this issue.<br>
<br>
Cheers,<br>
<br>
Joel<br>
</blockquote></div><br></div></div>