From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6995471841453146112 X-Received: by 2002:ac2:4e11:: with SMTP id e17mr11153711lfr.76.1629113169117; Mon, 16 Aug 2021 04:26:09 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3f02:: with SMTP id y2ls861870lfa.3.gmail; Mon, 16 Aug 2021 04:26:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwwP7W+ki7fJYmlaO79U25POwgyXtkAWAkb8IpqBx1o6/mSavpZrujquQWHkVVIIat5OFna X-Received: by 2002:a05:6512:3483:: with SMTP id v3mr1146567lfr.100.1629113168089; Mon, 16 Aug 2021 04:26:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629113168; cv=none; d=google.com; s=arc-20160816; b=uLzMjIT9gdvafAyqAmaNV0nfJY02CNSLQFYwTL9mmprbvcclNI9tLiol4SkHXqtjiw uXtPSFPWY4O6HbOg3zfcmLM2+kJx5RcMAxhsLQERtFZd7FZ6mYgqu+r4zSzTRxQKz4Nn CKupC4U8s98/qeZP/7YxbmqhnY2ejYuGSE75qWDgXw/sItJUCx/9/5BIjFrU3uq29QQC hfkFFsJjUYut/d55gre0LCh599mMfhfvE3J/SWao8RJt9Io9zXXCfN9qmqlBiU7hGbNd VKqXYl4UMQLl2QUduV/q6IbUZy1eECDl4ZRrOlX+urm4Wouk7ySTie7UZwcBwaF0Udep c3XQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date; bh=p11N+JaQ0KyIJX0RYbO4NL9siYgcxta61aDChyyZq0o=; b=x1F738vlH3qu24WaAWzAoYX3WLTaz06HSMtJZOPi4R82qP/TYIjmwtMqgwohq2TGSu 4PTtn1QTYDAvZ7k5sEQh93f9y96GR1kbWOph8z/nKUqds4wa/eu3JcYIdqVUSXiVRnZI TLxZzPczUFe6Z+og1yNAwHWKsm3E4kwAHqxJexYkla1afjqUi8/skNhJa03WYsd8DG7w mkNeCydH2Y60LBmh7Uooan0w5VMpU7NSR5YqFqMqA/+Ux10KJXoRsV8fPKCCRI1bl7FI xBBCo7rLswk0+BqEvOEZ2iQS8xtPfpxnrwgliJVQSBFM0YcelhnTlyl65tbpYMijtc8F xo8w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id q8si420181ljb.6.2021.08.16.04.26.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Aug 2021 04:26:08 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 17GBQ7uc030025 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 16 Aug 2021 13:26:07 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.59]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 17GBQ7Km009763; Mon, 16 Aug 2021 13:26:07 +0200 Date: Mon, 16 Aug 2021 13:26:06 +0200 From: Henning Schild To: Jan Kiszka Cc: Uladzimir Bely , isar-users Subject: Re: [PATCH v2 0/4] Make adjust_git work in both worlds Message-ID: <20210816132606.717781d8@md1za8fc.ad001.siemens.net> In-Reply-To: <45d215f0-c157-cfa2-812c-84e7b66466d1@siemens.com> References: <2143861.vFx2qVVIhK@home> <5292418.rdbgypaU67@home> <4bdfae48-445b-d80a-ad1c-ce1315074788@siemens.com> <45d215f0-c157-cfa2-812c-84e7b66466d1@siemens.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-TUID: J8etFNc65ycy Am Mon, 16 Aug 2021 13:01:43 +0200 schrieb Jan Kiszka : > On 16.08.21 12:45, Jan Kiszka wrote: > > On 16.08.21 10:27, Uladzimir Bely wrote: =20 > >> In the email from =D0=BF=D0=BE=D0=BD=D0=B5=D0=B4=D0=B5=D0=BB=D1=8C=D0= =BD=D0=B8=D0=BA, 16 =D0=B0=D0=B2=D0=B3=D1=83=D1=81=D1=82=D0=B0 2021 =D0=B3.= 10:55:31 +03 > >> user Jan Kiszka wrote: =20 > >>> On 16.08.21 09:52, Uladzimir Bely wrote: =20 > >>>> In the email from =D0=B2=D0=BE=D1=81=D0=BA=D1=80=D0=B5=D1=81=D0=B5= =D0=BD=D1=8C=D0=B5, 15 =D0=B0=D0=B2=D0=B3=D1=83=D1=81=D1=82=D0=B0 2021 =D0= =B3. 22:02:25 +03 > >>>> user Jan =20 > >>>> Kiszka> =20 > >>>> wrote: =20 > >>>>> On 13.08.21 14:40, Uladzimir Bely wrote: =20 > >>>>>> When I previously looked at patch.bbclass, I noted, that we > >>>>>> don't use it completely. > >>>>>> > >>>>>> There are some patch_task_patch_prefunc() and > >>>>>> patch_task_postfunc() here that are used in OE when > >>>>>> PATCHTOOL=3D'git'. But in our case they are never run due to not > >>>>>> using PATCH_COMMIT_FUNCTIONS in isar. > >>>>>> > >>>>>> I suppose (but can't be completely sure without deep look to > >>>>>> OE) that prefunc may fix this 'patch is allready applied' > >>>>>> issue in OE. =20 > >>>>> > >>>>> If you can still reproduce the issue, just set > >>>>> PATCH_COMMIT_FUNCTIONS=3D1 to check if it has any impact. > >>>>> > >>>>> Browsing poky and OE-core, I only find devtool setting this > >>>>> var. But both aren't using git as patch tool anyway, a > >>>>> downstream layer/recipe needs to requests that. > >>>>> > >>>>> Jan =20 > >>>> > >>>> Yes, I also tried this way. > >>>> > >>>> Actually, enabling PATCH_COMMIT_FUNCTIONS also forces to make > >>>> some more changes in patch.bbclass (like sys.path.insert for OE > >>>> lib path) that makes the difference increase. > >>>> > >>>> Anyway, even if this set to "1", the problem of patch reapply is > >>>> still here - custom patch is going to be applied despite it was > >>>> already done on previous build. So, reset to SRC_REV is still > >>>> required. =20 > >>> > >>> Strange. Did you try the same procedure in an OE setup, to > >>> compare what happens there? > >>> > >>> Jan =20 > >> > >> Not yet, while it's expected to take much time to compile. > >> > >> Anyway, to catch the similar error, I need to find some package to > >> rebuild in Yocto/OE that follows the approach similar to one > >> isar's cowsay uses: a patch used by recipe that adds new patch to > >> debian series.=20 > >=20 > > Nope, this is unrelated. You just need to find a recipe that adds a > > patch, then switch to PATCHTOOL=3Dgit, and finally trigger the > > rebuild in a way that patch is re-run. That should be doable in OE > > without building a complete system. In fact, you only need to > > force-run patch for a specific recipe twice. > > =20 >=20 > In fact, I'm not even sure we have a problem here. This is what I just > did over my patch queue: >=20 > bitbake mc:qemuarm64-buster:cowsay > edit isar.patch > bitbake mc:qemuarm64-buster:cowsay >=20 > And that succeeded, thus do_patch did a proper revert before trying to > apply the updated patch again. >=20 > How exactly do you trigger the problem you still see? I bet the problem has to do with adjust_git. If do_patch runs after adjust_git it will not work. Not be able to revert because git ops will be broken. If you edit isar.patch you rerun fetch/unpack and therefore revert adjust_git. The problem should be gone with the adjust_git patches from me or Jan. Or should be re-analyzed on top of those. Henning > Jan >=20