From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6920502129401528320 X-Received: by 2002:a1c:e905:: with SMTP id q5mr3395065wmc.84.1611312840810; Fri, 22 Jan 2021 02:54:00 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:fd09:: with SMTP id e9ls497687wrr.0.gmail; Fri, 22 Jan 2021 02:53:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJzez54A9ybP7oN6DG/3XRKcMbD1fktsFm0WWNVwmjEii94M0U432ycEJQHUiAZi9+6KKYqN X-Received: by 2002:adf:c454:: with SMTP id a20mr3828874wrg.314.1611312839773; Fri, 22 Jan 2021 02:53:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611312839; cv=none; d=google.com; s=arc-20160816; b=gtH5uaF75vCksT77Dzf9m4w8Ibb3jkLueS2BClBQXSOytvkg9PomO6I+uFy1JBsLLU /mjkGjGxk9Kub0tki44OeLh53miNkfbCZ7qQCCUC3nJ9Wd21AQK6Ta2YueCh0XQ//qxX w56ixRKlu4+rljevZqIjW2a0PlKiLcWbDsblKUA9ON75J/3jPCiKbq2djggwQGY/dnmT njRRE1bZBHE3pOoz7PPThgq4LJdlXmr7lltVAsZ0LWb7isSzIlb41Z1E4YZ8JiSZtzQV LkL5TzXu9anypo/4XLJnwUQvz9w/uBP+HX8JSTsNnBSx9tkTKbGw251DeIkih/MQX4zR EC5w== 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=lQSiWCWxQyS6YZtKAJK9UXH4MWrnMrgGEtFRvEHZTho=; b=QJiuWM1EdRmY6L7Mlsyx/8evXJQCIjLZtOi32YfW9U1saTdvn1hMm9yBg66TyieTbF s4ZdyZ26iq9fKS8a2yoJ/RNlYzZQeaTFfhIGGq+PSc+IwSp3MkzYqoquO1X7NRPEzHL1 nTc61h0lPu4lBH65kKfg9S3begJSQCNQXPEuiecFH9xxYcnOFTsJm0SzeqQDGfP2hQlu iTZgBrGqsB2em++wcHwaRRe+S4XDAWWuThdLmWyCC2vvwM4kJxFliuJWI9xnbSalNXXg R1nAva2mbg5uTqysQmGOvZ2ZyG999JzVbA6GqqDrEDrK6AlXO75PbTXen8x0kTVfLs7l 0mug== 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 u24si441393wmm.1.2021.01.22.02.53.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jan 2021 02:53:59 -0800 (PST) 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 10MArxVg005469 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 22 Jan 2021 11:53:59 +0100 Received: from [167.87.46.116] ([167.87.46.116]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 10MArwo1011583; Fri, 22 Jan 2021 11:53:59 +0100 Subject: Re: [PATCH 1/3] dpkg: adjust task order to allow using "git" for patching To: "[ext] Henning Schild" , isar-users References: <20210122084241.10573-1-henning.schild@siemens.com> <20210122084241.10573-2-henning.schild@siemens.com> From: Jan Kiszka Message-ID: <2a620d4e-3b5d-65fa-5af5-cd656c448e6b@siemens.com> Date: Fri, 22 Jan 2021 11:53:58 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.1 MIME-Version: 1.0 In-Reply-To: <20210122084241.10573-2-henning.schild@siemens.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: xuqfmMZM3RVd 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? 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 ?= "" > > -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux