Patch files not apply while devtool modify linux-aspeed

[Henbin Chang]

Thanks Joel.

The issue could be duplicated following the steps in the romulus machine.

1. 'devtool modify linux-aspeed'
2. 'cd workspace/sources/linux-aspeed/' and edit
'arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts'
3. 'git add -A' and 'git commit -m 'Test modify dts' '
4. go to build directory and 'devtool update-recipe -m patch -a
../meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/ linux-aspeed'
5. Confirm the below files are generated.
meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed/0001-Test-modify-dts.patch
meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed_git.bbappend
6. 'devtool reset linux-aspeed' and remove ' workspace/sources/linux-aspeed/
'
7. 'devtool modify linux-aspeed' again
8. 'cd workspace/sources/linux-aspeed/ ' and the commit with the 'Test
modify dts' message not found while 'git log'
9. 'git branch'
  dev
  dev-4.10
  dev-4.13
  dev-4.17
  dev-4.3
  dev-4.4
  dev-4.6
  dev-4.7
* devtool
  devtool-no-overrides
  devtool-override-df-obmc-ubi-fs
  master
10. 'git checkout dev-4.17' and 'git log'

commit 2310638091e7b4dd97014f1b373a9ba111ac4e58
Author: Henbin.Chang <henbin-chang at mic.com.tw>
Date:   Thu Aug 9 16:15:48 2018 +0800

    Test modify dts

I had no idea why the patch was not applied in the 'devtool' branch.

BRs,
Henbin

2018-08-10 9:01 GMT+08:00 Joel Stanley <joel at jms.id.au>:

> Hello,
>
> On Tue, 7 Aug 2018 at 11:13, Henbin Chang <henbinchang at gmail.com> wrote:
> > We found the patch files would be applied while 'devtool modify
> linux-aspeed' after upgrade to Yocto 2.5.
> > And show the below warning message.
> >
> > 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)
>
> I do not use yocto when developing the kernel, so I can't help here. I
> have cc'd some other developers that my have encountered this issue.
>
> Cheers,
>
> Joel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ozlabs.org/pipermail/openbmc/attachments/20180810/92832080/attachment.html>