From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6995471841453146112 Date: Fri, 13 Aug 2021 05:23:45 -0700 (PDT) From: Uladzimir Bely To: isar-users Message-Id: In-Reply-To: <0a83a4d0-ecbb-e5ae-047d-c362daa8e55f@siemens.com> References: <3710f21b-429e-40c2-8a8f-814bf1b734c2n@googlegroups.com> <0a83a4d0-ecbb-e5ae-047d-c362daa8e55f@siemens.com> Subject: Re: [PATCH v2 0/4] Make adjust_git work in both worlds MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_3466_1280799666.1628857425258" X-TUID: R9fPAqso9NlV ------=_Part_3466_1280799666.1628857425258 Content-Type: multipart/alternative; boundary="----=_Part_3467_1064704695.1628857425258" ------=_Part_3467_1064704695.1628857425258 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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 > > . > > 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 > ------=_Part_3467_1064704695.1628857425258 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable
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-b= uster:isar-image-base
- Mo= dify local.conf (e.g. set ISAR_USE_CACHED_BASE_REPO ?=3D "1" or do somethin= g else that will cause packages rebuild)
- Run second build: bitbake mc:qemuamd64-buster:isar-image-bas= e

It ends up with:

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

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


=
On Friday= , August 13, 2021 at 1:13:08 PM UTC+3 Jan Kiszka wrote:
On 13.08.21 10:31, Uladzimir Bel= y wrote:
> I've checked your series in CI (fast run) and it was OK.
>=20
> Actually, the problem with cowsay rebuild appeared on some manual = work
> with ISAR, when some changes in configuration were done and rebuil= d was
> started on top of previous build. So, the problem was reproducable= only
> in such manual conditions.
>=20
> I'm going to add some test to CI that will reproduce these con= ditions so
> that we would be sure the fix is complete.
>=20

Great, thanks in advance!

Jan

> On Thursday, August 12, 2021 at 2:48:54 PM UTC+3 Jan Kiszka wrote:
>=20
> Finally allow the adjusted git repos work both inside and outs= ide the
> buildchroots. Also fixes the race introduced by patching links= in
> DL_DIR.
>=20
> Changes in v2:
> - build relative alternates path so that destsuffix paths are = respected
> - fix task dependencies so that devshell gets adjusted git aga= in
>=20
> NOTE: Still not yet fully tested, fast CI takes 3:30h (plus re= tries).
>=20
> Jan
>=20
> 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&= quot; for patching"
>=20
> meta/classes/dpkg-base.bbclass | 22 ++++++++++++++-----
> meta/conf/bitbake.conf | 1 +
> .../buildchroot/buildchroot.inc | 2 ++
> 3 files changed, 20 insertions(+), 5 deletions(-)
>=20
> --=20
> 2.31.1
>=20
> --=20
> 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/m= sgid/isar-users/3710f21b-429e-40c2-8a8f-814bf1b734c2n%40googlegroups.com
> <https://groups.g= oogle.com/d/msgid/isar-users/3710f21b-429e-40c2-8a8f-814bf1b734c2n%40google= groups.com?utm_medium=3Demail&utm_source=3Dfooter>.


--=20
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux
------=_Part_3467_1064704695.1628857425258-- ------=_Part_3466_1280799666.1628857425258--