From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6995471841453146112 X-Received: by 2002:ac2:5d45:: with SMTP id w5mr10981966lfd.642.1629110715017; Mon, 16 Aug 2021 03:45:15 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:160f:: with SMTP id f15ls1275511ljq.3.gmail; Mon, 16 Aug 2021 03:45:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzmrFeYMIaohv7aap83E3aX/GF+iCQ85GhMhvbDOH8QYj1n8QjVXaApgZ6UKDOyw8ZpJDvH X-Received: by 2002:a05:651c:1796:: with SMTP id bn22mr12368266ljb.362.1629110713692; Mon, 16 Aug 2021 03:45:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629110713; cv=none; d=google.com; s=arc-20160816; b=Eqs/ekwf8Kjesv3GK3/CUkmg9TcpuqLOGG7FZJbOhJ7U8MMxEYVdaQlukvacU7GKTL UiatcrJsgp4hX8NqJ5xjangnHbvHBDSPFZMjpPksym2H9hN62ls2TOG+beyMIXvPOC4x Ku8LVISsQM1/bbEEwFvTSI09iIyruI332rexpz5tW4lFewtdB+mwhLK24eTgRnPJVvIe qFdEO/L+KbKKIbL/LjSDi2fJJlKs3+njunmuvpkIF1HIfyTPAn3MFNZvAX59hoFotaQx feSmJABeEYUfkiI8ZUuR/3ctWNQD92lYzCOc3dy2YxZrq603wRakkBhqcUwfTiuuRkVY HqpQ== 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:from:references:to:subject; bh=p0TcEBFbHTLnV8qYMTcsr1KrwGW253zbJpEXWQjcXaE=; b=1BjAnR8ZFbUHUsAvuONre/DjW5l2zhPcGN/beC2l5KAzUp0O7BHg6ilCRjug2O7l3I cRmauHA8XlPeYU+eDZCl3kkqCO/Ifh82GdsC1ltsfJLAI4L0i6LD2AqBunkB0cXuiBbN zKTFpI+lOxChuTtfq45FX6zvnyCTGVPcaSA/nZXqibsVIoxL/OynZx/RzxwFL9kBw+EX 4zM9EJyGbYaeEQDGZKlob9BEi5OwwcrGoICGjICgvKRUmkaj2iL+XJN6x9FHDxkmba46 hsmjzjJcwPSaE6JTCCmftGycRmAINtmxiPwBxHrWeNM4nCYDiwzNbkPAB/OcvenkIoKq 72fQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id v15si417043lfa.6.2021.08.16.03.45.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Aug 2021 03:45:13 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 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 thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 17GAjCJb011587 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 16 Aug 2021 12:45:12 +0200 Received: from [167.87.73.147] ([167.87.73.147]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 17GAjC1T006000; Mon, 16 Aug 2021 12:45:12 +0200 Subject: Re: [PATCH v2 0/4] Make adjust_git work in both worlds To: Uladzimir Bely , isar-users References: <2143861.vFx2qVVIhK@home> <5292418.rdbgypaU67@home> From: Jan Kiszka Message-ID: <4bdfae48-445b-d80a-ad1c-ce1315074788@siemens.com> Date: Mon, 16 Aug 2021 12:45:12 +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: <5292418.rdbgypaU67@home> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-TUID: l62sBf4cVfEg 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. Jan -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux