From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6995471841453146112 X-Received: by 2002:ac2:4312:: with SMTP id l18mr11885421lfh.602.1629111707576; Mon, 16 Aug 2021 04:01:47 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4146:: with SMTP id c6ls818756lfi.2.gmail; Mon, 16 Aug 2021 04:01:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZhKpElPyWWkq1BLs/Ga3EdEtBa7GM+grzigkP2DOFlPGc1t5H5Pc7ndq0fE4+NRdYOo0Z X-Received: by 2002:a05:6512:32c8:: with SMTP id f8mr8812205lfg.351.1629111706228; Mon, 16 Aug 2021 04:01:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629111706; cv=none; d=google.com; s=arc-20160816; b=JSENzru1OlgRRkBKIAqONeFUrGVKz15GoPBI/TyUWwzo+LGLCFuFSlfE+ZLW2cVTuS PwnIKlOp94DR23U6y+Qpdvb9zrFy5SCle+ZwHCMAQDU8EI9sxm0ZM42Q2UbuyRxCEep2 sNm/eJ6WbB3RXR1uwR/Lm2rlzSuEHSy5Cs+MeXcA9c+4XsxNPp+pt1KZeTEyCLe2eVWA fPN5Ffv1JOJb96PkRpDd+LOJDZX38PCHBSVa+JPaGnnSpXli23j6ltBrGDfbSEZrhl7v Lw3UosEIRE7bMrQQk4nj2SAO7eIk6U7kam1NVwhQFOIrs0aoy3OsRvL8FiYFiyBoiqL2 zQ2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:references:to:from:subject; bh=79z/FfRc06xU8jp3TjRQugPv15jOLyllWoiRwbUgJ9M=; b=L956pbOe6zlpof6BPxyCVMvfPQB4qGn8RS3TEeS/mJndG79IRnbVqIxq6jiR//dMQ8 9nH/i/hzSv4G4dPMuWZH+WlhJC+af2RdeklbBihqVh8KT9Lb5oxWJSppy9kjTm22CI6k I7JgUJJfh4GMK037M18PSnDIb4rEiDbjFMjGqs6r/T7dyIcg/FtiTdODdG6GHNqbHgt4 10EncJd2zAzwMZvz5Ot6D86N76YLn1yp23yT5S8SBUTR2BcbTS01edjzzhq7pFn7LYcM 9fAvXCgNikkb/8Ya0YVhxuCEKnWzxYC/DGmdzBH0pO1ewLBwacwGI3aDECs8Ht3zePwU UROw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id q8si561757ljm.2.2021.08.16.04.01.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Aug 2021 04:01:46 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 17GB1iVE027495 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 16 Aug 2021 13:01:44 +0200 Received: from [167.87.73.147] ([167.87.73.147]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 17GB1hjA015154; Mon, 16 Aug 2021 13:01:44 +0200 Subject: Re: [PATCH v2 0/4] Make adjust_git work in both worlds From: Jan Kiszka To: Uladzimir Bely , isar-users References: <2143861.vFx2qVVIhK@home> <5292418.rdbgypaU67@home> <4bdfae48-445b-d80a-ad1c-ce1315074788@siemens.com> Message-ID: <45d215f0-c157-cfa2-812c-84e7b66466d1@siemens.com> Date: Mon, 16 Aug 2021 13:01:43 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <4bdfae48-445b-d80a-ad1c-ce1315074788@siemens.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-TUID: ICYC1sfmmbad On 16.08.21 12:45, Jan Kiszka wrote: > On 16.08.21 10:27, Uladzimir Bely wrote: >> In the email from понедельник, 16 августа 2021 г. 10:55:31 +03 user Jan Kiszka >> wrote: >>> On 16.08.21 09:52, Uladzimir Bely wrote: >>>> In the email from воскресенье, 15 августа 2021 г. 22:02:25 +03 user Jan >>>> Kiszka> >>>> 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. >>>>>> >>>>>> There are some patch_task_patch_prefunc() and patch_task_postfunc() here >>>>>> that are used in OE when PATCHTOOL='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. >>>>> >>>>> If you can still reproduce the issue, just set PATCH_COMMIT_FUNCTIONS=1 >>>>> 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 >>>> >>>> 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. >>> >>> Strange. Did you try the same procedure in an OE setup, to compare what >>> happens there? >>> >>> Jan >> >> 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. >> > > Nope, this is unrelated. You just need to find a recipe that adds a > patch, then switch to PATCHTOOL=git, 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. > In fact, I'm not even sure we have a problem here. This is what I just did over my patch queue: bitbake mc:qemuarm64-buster:cowsay edit isar.patch bitbake mc:qemuarm64-buster:cowsay And that succeeded, thus do_patch did a proper revert before trying to apply the updated patch again. How exactly do you trigger the problem you still see? Jan -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux