Re: [PATCH 4/4] patch: suffix patch files copied to .applied_patches with "~"

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

Am Mon, 21 Oct 2019 13:36:25 +0200
schrieb Cedric Hombourger <cedric_hombourger@mentor.com>:

> Hi Henning
> 
> On 10/21/2019 1:26 PM, Henning Schild wrote:
> > I think that whole patching keeps the files so we can roll back and
> > i think Jan wanted to somehow continue working on it using quilt.  
> 
> Ok the last I heard from him is that he felt that the approach he had 
> implemented and upstream'ed was far easier than having to implement 
> something ala Yocto. I guess we can let him comment?
> 
> >
> > Renaming that file might break that, did you check?  
> 
> yes, no issues observed on my end with e.g. the linux-mainline kernel 
> recipe on the de0-nano machine. The .patch_commands file carries the 
> full "patch" command and the expected filename (suffixed with ~).
> Isar simply appends -R to the patch command line when it needs to
> revert previously applied patches.
> 
> > I guess we could introduce a test for parts of that by adding a
> > patch to the hello recipe.  
> 
> We sure could though the linux-mainline recipe is already testing
> this.

I was talking about the combination apt://-URI + patch(es)

Henning

> >
> > Henning
> >
> > Am Mon, 21 Oct 2019 11:34:54 +0200
> > schrieb Cedric Hombourger <Cedric_Hombourger@mentor.com>:
> >  
> >> When patches are applied to a source Debian package, patches
> >> specified in SRC_URI get copied to ${S}/.applied_patches (as
> >> intended) but dpkg-source then believes the source tree was
> >> modified and exits with an error. Make dpkg-source ignore patch
> >> files that were copied by this class by appending a "~" suffix to
> >> them.
> >>
> >> Signed-off-by: Cedric Hombourger <Cedric_Hombourger@mentor.com>
> >> ---
> >>   meta/classes/patch.bbclass | 2 +-
> >>   1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/meta/classes/patch.bbclass
> >> b/meta/classes/patch.bbclass index c5ba463..1d8041f 100644
> >> --- a/meta/classes/patch.bbclass
> >> +++ b/meta/classes/patch.bbclass
> >> @@ -54,7 +54,7 @@ python do_patch() {
> >>   
> >>               cmds = open(applied_patches_dir + ".patch-commands",
> >> "a") 
> >> -            patch_file = applied_patches_dir + path
> >> +            patch_file = applied_patches_dir + path + "~"
> >>               bb.utils.mkdirhier(os.path.dirname(patch_file))
> >>               shutil.copyfile(workdir + path, patch_file)
> >>