Re: [PATCH v2 0/4] Make adjust_git work in both worlds

[Uladzimir Bely <ubely@ilbers.de>]

[-- Attachment #1.1: Type: text/plain, Size: 3076 bytes --]

In addition to this series we still need something like I had done in "[RFC,2/2] 
dpkg-gdb: Reset git to SRCREV revision before patching".

Because the problem with git has gone, but there is a problem that we try 
apply patch on top of git tree where it's already applied.

Steps to reproduce are quite simple:

- Run first build: bitbake mc:qemuamd64-buster:isar-image-base
- Modify local.conf (e.g. set ISAR_USE_CACHED_BASE_REPO ?= "1" or do 
something else that will cause packages rebuild)
- Run second build: bitbake mc:qemuamd64-buster:isar-image-base

It ends up with:

ERROR: mc:qemuamd64-buster:cowsay-git-r0 do_patch: Applying 'isar.patch' 
failed: 
The next patch would create the file debian/patches/isar.patch, 
which already exists!  Assume -R? [n] 

In CI tests we remove build/tmp, so that we don't face this problem.


On Friday, August 13, 2021 at 1:13:08 PM UTC+3 Jan Kiszka wrote:

> On 13.08.21 10:31, Uladzimir Bely wrote:
> > I've checked your series in CI (fast run) and it was OK.
> > 
> > Actually, the problem with cowsay rebuild appeared on some manual work
> > with ISAR, when some changes in configuration were done and rebuild was
> > started on top of previous build. So, the problem was reproducable only
> > in such manual conditions.
> > 
> > I'm going to add some test to CI that will reproduce these conditions so
> > that we would be sure the fix is complete.
> > 
>
> Great, thanks in advance!
>
> Jan
>
> > On Thursday, August 12, 2021 at 2:48:54 PM UTC+3 Jan Kiszka wrote:
> > 
> > Finally allow the adjusted git repos work both inside and outside the
> > buildchroots. Also fixes the race introduced by patching links in
> > DL_DIR.
> > 
> > Changes in v2:
> > - build relative alternates path so that destsuffix paths are respected
> > - fix task dependencies so that devshell gets adjusted git again
> > 
> > NOTE: Still not yet fully tested, fast CI takes 3:30h (plus retries).
> > 
> > Jan
> > 
> > Jan Kiszka (4):
> > dpkg-base: Lock do_adjust_git against each other
> > dpkg-base: Make mirror link relative
> > Rework do_adjust_git to support inside and outside usage
> > Revert "dpkg: adjust task order to allow using "git" for patching"
> > 
> > meta/classes/dpkg-base.bbclass | 22 ++++++++++++++-----
> > meta/conf/bitbake.conf | 1 +
> > .../buildchroot/buildchroot.inc | 2 ++
> > 3 files changed, 20 insertions(+), 5 deletions(-)
> > 
> > -- 
> > 2.31.1
> > 
> > -- 
> > You received this message because you are subscribed to the Google
> > Groups "isar-users" group.
> > To unsubscribe from this group and stop receiving emails from it, send
> > an email to isar-users+...@googlegroups.com
> > <mailto:isar-users+...@googlegroups.com>.
> > To view this discussion on the web visit
> > 
> https://groups.google.com/d/msgid/isar-users/3710f21b-429e-40c2-8a8f-814bf1b734c2n%40googlegroups.com
> > <
> https://groups.google.com/d/msgid/isar-users/3710f21b-429e-40c2-8a8f-814bf1b734c2n%40googlegroups.com?utm_medium=email&utm_source=footer
> >.
>
>
> -- 
> Siemens AG, T RDA IOT
> Corporate Competence Center Embedded Linux
>

[-- Attachment #1.2: Type: text/html, Size: 5509 bytes --]