From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6920502129401528320 X-Received: by 2002:a19:5d42:: with SMTP id p2mr2341309lfj.308.1611322849730; Fri, 22 Jan 2021 05:40:49 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9ad2:: with SMTP id p18ls1189277ljj.5.gmail; Fri, 22 Jan 2021 05:40:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJwTzhM7JwN94BSeS2PVzzZtfdhruUauPc+eyG1wuH3MM8RNi/j6JEr44b0VrVlsq5ZrrVBF X-Received: by 2002:a2e:9b4d:: with SMTP id o13mr2334991ljj.163.1611322848654; Fri, 22 Jan 2021 05:40:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611322848; cv=none; d=google.com; s=arc-20160816; b=dHRnxMBwMrjR4B7mwHJN9y1ONTUf8n1GvFp11aWxG3zMqbpAD6oLDn+mwZSBE/88cg J0Atnx5eodoNwimiRK1y30dHobVytbLuo424+Kj3dEyXfSGNty/1+VXPyD6S2UsN1Hj7 Y6yAO3JMXn8vZWO4HItzec83XaTifgKEI5ri8KioziRgxcqq2uiqEFFQqCJlujeluev+ VD12jYiZvonj00W8din4SYDnQlDEzMfj5RUMy3dIqIxE2ZwMBWcRY2wg9AU2UcJviZoI gbcgPXpE0B6LCLEPVrhpj0EcmVwGnLuqHo9YyUXE5y/D0i6Y4fY3pHCt3YATaZTC2Gl9 6/tA== 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=XHAkChHvEy0kp7tEPXljeHDwrFMFHRoG2AxpUYZ96gQ=; b=U8uhQULQ+KY+3M3vZ8eO+5apx4kjk6rTeREDbQbG9+Tq/pUYSrULHJF07yDuIcBupX 0P+Xl8PmjRrDcYkF8QAeqUwLrex+9pSXKbzXuOJCO0yswAyAyfXVVawbMKY56FLoFWmm d1Bh11LmQmsUmahGWK/4AFSGTstLUlKUK8w5oXVjJRjynn+BzdbF/CXNU5puOJAL5Njp 53OvdK9QVZ+ZI3VAZ/qxsufmkAMRDK2cg0NRG5goK0H57NzlL4tycEYQ2j9XIFnrh2qd VZpW/37TWCZ2Bt+3+46Gp2RPgfgN2OxhbRC+4O0aBEdpqDxOwDogL23XWpFQJo+Ytl7S kdSw== 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 z9si287498ljk.2.2021.01.22.05.40.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jan 2021 05:40:48 -0800 (PST) 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 mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 10MDemsm021179 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 22 Jan 2021 14:40:48 +0100 Received: from md1za8fc.ad001.siemens.net ([167.87.28.222]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 10MDelxX011521; Fri, 22 Jan 2021 14:40:47 +0100 Date: Fri, 22 Jan 2021 14:40:46 +0100 From: Henning Schild To: Jan Kiszka Cc: isar-users Subject: Re: [PATCH 1/3] dpkg: adjust task order to allow using "git" for patching Message-ID: <20210122144046.363d033a@md1za8fc.ad001.siemens.net> In-Reply-To: <2a620d4e-3b5d-65fa-5af5-cd656c448e6b@siemens.com> References: <20210122084241.10573-1-henning.schild@siemens.com> <20210122084241.10573-2-henning.schild@siemens.com> <2a620d4e-3b5d-65fa-5af5-cd656c448e6b@siemens.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: Vcnkn5ncs7P4 Am Fri, 22 Jan 2021 11:53:58 +0100 schrieb Jan Kiszka : > On 22.01.21 09:42, [ext] Henning Schild wrote: > > From: Henning Schild > > > > The adjust_git task breaks the git tree for use outside the > > buildchroot. And our patch implementation supports using "git am" > > when setting PATCHTOOL = "git". In order to actually apply git > > patches we have to adjust after patching. > > That will likely not work as is when rerunning the job for a partial > rebuild, e.g. after adding a patch and not changing the git URL. We > now need a "restore_git" prior to patch, no? I was also afraid of that. So i tried modifying a patch, which triggerd a new fetch/unpack cycle and was fine. I guess adding a patch will do the same. Changing the patch function would become problematic, but that is a task for isar developers. So i am almost certain that will not cause fun on partial rebuilds. Henning > Jan > > > > > Signed-off-by: Henning Schild > > --- > > meta/classes/dpkg-base.bbclass | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/meta/classes/dpkg-base.bbclass > > b/meta/classes/dpkg-base.bbclass index 01c6eb658e..5c7bddc9ba 100644 > > --- a/meta/classes/dpkg-base.bbclass > > +++ b/meta/classes/dpkg-base.bbclass > > @@ -47,10 +47,10 @@ python do_adjust_git() { > > bb.fatal(str(e)) > > } > > > > -addtask adjust_git after do_unpack before do_patch > > +addtask adjust_git before do_dpkg_build > > > > inherit patch > > -addtask patch after do_adjust_git before do_dpkg_build > > +addtask patch before do_adjust_git > > > > SRC_APT ?= "" > > > > >