Re: [PATCH 1/3] dpkg: adjust task order to allow using "git" for patching

[Henning Schild <henning.schild@siemens.com>]

Am Fri, 22 Jan 2021 11:53:58 +0100
schrieb Jan Kiszka <jan.kiszka@siemens.com>:

> On 22.01.21 09:42, [ext] Henning Schild wrote:
> > From: Henning Schild <henning.schild@siemens.com>
> > 
> > The adjust_git task breaks the git tree for use outside the
> > buildchroot. And our patch implementation supports using "git am"
> > when setting PATCHTOOL = "git". In order to actually apply git
> > patches we have to adjust after patching.  
> 
> That will likely not work as is when rerunning the job for a partial
> rebuild, e.g. after adding a patch and not changing the git URL. We
> now need a "restore_git" prior to patch, no?

I was also afraid of that. So i tried modifying a patch, which triggerd
a new fetch/unpack cycle and was fine. I guess adding a patch will do
the same.
Changing the patch function would become problematic, but that is a
task for isar developers.

So i am almost certain that will not cause fun on partial rebuilds.

Henning

> Jan
> 
> > 
> > Signed-off-by: Henning Schild <henning.schild@siemens.com>
> > ---
> >  meta/classes/dpkg-base.bbclass | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/meta/classes/dpkg-base.bbclass
> > b/meta/classes/dpkg-base.bbclass index 01c6eb658e..5c7bddc9ba 100644
> > --- a/meta/classes/dpkg-base.bbclass
> > +++ b/meta/classes/dpkg-base.bbclass
> > @@ -47,10 +47,10 @@ python do_adjust_git() {
> >              bb.fatal(str(e))
> >  }
> >  
> > -addtask adjust_git after do_unpack before do_patch
> > +addtask adjust_git before do_dpkg_build
> >  
> >  inherit patch
> > -addtask patch after do_adjust_git before do_dpkg_build
> > +addtask patch before do_adjust_git
> >  
> >  SRC_APT ?= ""
> >  
> >   
>