From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6995471841453146112 X-Received: by 2002:a5d:510b:: with SMTP id s11mr4723124wrt.63.1629118175642; Mon, 16 Aug 2021 05:49:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:c4c3:: with SMTP id g3ls4165823wmk.0.gmail; Mon, 16 Aug 2021 05:49:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx3z4vPrj9EAshVN5/rhwRnzCOsS2i1zyIofRBsq4kMkfiNsrBWO5Yk7OO2JTcvC91ZPsD/ X-Received: by 2002:a7b:c7c3:: with SMTP id z3mr15125088wmk.96.1629118174572; Mon, 16 Aug 2021 05:49:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629118174; cv=none; d=google.com; s=arc-20160816; b=benc2OwXT0VcXZ+ePq+nfxY85BqHKfu/H8EZg2ar3oOOOcoo3syqZ6yVg8kqWqrd0q 0EXRp1ueWZjfbGLFrus+YTOXb7C0KZeoAxmFjxL6AYm6yW1/VZgQuW2uwXBdd/kjr/Ag WxgDE+w2yRBtvnRl7r0zskZ2wmxCsXlzS0zrZf6EsYQB8oSTjQxd+W/1DJaWfvq8UkzR y1DOd2ObkpN6JaEaSDRNjNLiMSbdP/pDXbwNMCw0zdx2C+K6rqQ1ShmgneEIv3jzjX/H Sy1Nu46AFbZ9ATfT3HcIlA/85xdEMgjSJqtjqbtRvJFFAjPWJnLIMKnqaFC7H2pJZQJb DHaA== 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:date:subject:to:from; bh=5QqGG8ppaJs2hxuQiHxkDqyiSlJuAmyTJBWvnQShsos=; b=twwbk+mqSEmlyZGEYWi/wLmSChzJu0rMjkVzX73Fd4iEhGtOtgUQGilUF6I34daix8 468hsyWsulOYSlQaV7EoOzno2O0aTW603nUu2erfhSQ9kLpzeFg+Xzj1jKsYKFS5cvYx AaUTyZMwn5HpSirSAbjgaVKS9jfZfU4xcZpbcYt29BrvxNRHzxkw9dzJEDIhEUjYXW7k 0VzXL+3cI6CDYDTzzJbHlBNXUtUwKqR0UvQMAmnHBXAAbj85sFCSMQa7baLo2TzBSIFA zlwzDdrQsBvA314QwkTCpSZV54nQgI6qgYEKln57r3IIYzr6ja/h1dpY/bxa9r4vI1s+ i9Lw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id l23si357020wmi.4.2021.08.16.05.49.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Aug 2021 05:49:34 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from home.localnet (44-208-124-178-static.mgts.by [178.124.208.44] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 17GCnXvf003885 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 16 Aug 2021 14:49:33 +0200 From: Uladzimir Bely To: isar-users , Jan Kiszka Subject: Re: [PATCH v2 0/4] Make adjust_git work in both worlds Date: Mon, 16 Aug 2021 15:49:31 +0300 Message-ID: <4618094.OV4Wx5bFTl@home> In-Reply-To: <45d215f0-c157-cfa2-812c-84e7b66466d1@siemens.com> References: <4bdfae48-445b-d80a-ad1c-ce1315074788@siemens.com> <45d215f0-c157-cfa2-812c-84e7b66466d1@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: Jyw+DSQ9YJOg In the email from Monday, 16 Aug 2021 =D0=B3. 14:01:43 +03 user Jan Kiszka = wrote: > On 16.08.21 12:45, Jan Kiszka wrote: > > On 16.08.21 10:27, Uladzimir Bely wrote: > >> 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>>=20 > >> wrote: > >>> On 16.08.21 09:52, Uladzimir Bely wrote: > >>>> 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 > >>>> Kiszka> > >>>>=20 > >>>> wrote: > >>>>> On 13.08.21 14:40, Uladzimir Bely wrote: > >>>>>> When I previously looked at patch.bbclass, I noted, that we don't = use > >>>>>> it > >>>>>> completely. > >>>>>>=20 > >>>>>> 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 a= re > >>>>>> never > >>>>>> run due to not using PATCH_COMMIT_FUNCTIONS in isar. > >>>>>>=20 > >>>>>> I suppose (but can't be completely sure without deep look to OE) t= hat > >>>>>> 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. > >>>>>=20 > >>>>> 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/reci= pe > >>>>> needs to requests that. > >>>>>=20 > >>>>> Jan > >>>>=20 > >>>> Yes, I also tried this way. > >>>>=20 > >>>> Actually, enabling PATCH_COMMIT_FUNCTIONS also forces to make some m= ore > >>>> changes in patch.bbclass (like sys.path.insert for OE lib path) that > >>>> makes > >>>> the difference increase. > >>>>=20 > >>>> Anyway, even if this set to "1", the problem of patch reapply is sti= ll > >>>> here - custom patch is going to be applied despite it was already do= ne > >>>> 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 wh= at > >>> happens there? > >>>=20 > >>> Jan > >>=20 > >> Not yet, while it's expected to take much time to compile. > >>=20 > >> 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 > > 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 > 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? >=20 > Jan One of the easiest way, for example: bitbake -v mc:qemuamd64-buster:cowsay edit conf/local.conf # (e.g, (un)comment something global, like=20 ISAR_USE_CACHED_BASE_REPO) bitbake -v mc:qemuamd64-buster:cowsay =2D-=20 Uladzimir Bely Promwad Ltd. External service provider of ilbers GmbH Maria-Merian-Str. 8 85521 Ottobrunn, Germany +49 (89) 122 67 24-0 Commercial register Munich, HRB 214197 General Manager: Baurzhan Ismagulov