From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6920502129401528320 X-Received: by 2002:a19:2247:: with SMTP id i68mr120350lfi.613.1611304966735; Fri, 22 Jan 2021 00:42:46 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:6145:: with SMTP id m5ls1766504lfk.2.gmail; Fri, 22 Jan 2021 00:42:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJxtFywXGyctitFChWrggFDB/xHjnDdYSkaFKymLaich7up6HWEONPD/VccG7uv31LfjVsce X-Received: by 2002:a19:8584:: with SMTP id h126mr1439749lfd.152.1611304965696; Fri, 22 Jan 2021 00:42:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611304965; cv=none; d=google.com; s=arc-20160816; b=VwPXzLMVMb7cQaZEVfpfXshXjMzbirIPYyX3RV7yayzKwKfkh11tcv/qTzpWIyAfVH BURggrj0/HbjxU77dzGNN4sDg/GZlGDXrzqrttnLfdOeo1KypdD7Lzqxsb6v6/hWdldP ah51ShI0GmMsZ+JhEHMLc/zpTYup7Yqh0puN4ZC0J1JLTJd8gTjpYbsXd9WsHQwvfoPq 0wTLM+CO6dPrUnvlVfuh3sUJ402H5mBuDH60mzztpe1TSoBrbZSBtjmLsPWaJSlh0B9O x7GTXnCrgtNsRwiQkqSqnYc3G8/Ug4VZoEfVnFhpO4V48eiyotaUp+0Tgj1RCl2/007s JBTQ== 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:cc:to:from; bh=jsD69zm9jvZY2Zj0/QoGdnSA8jHtslLTLOcg0Pq19jI=; b=C86Cd+fg8LHh89fMQEsgUs2EsCZUEbPLz4t48gXQeViqe/Dv4CZIn6LX3OikOPZtox soRJQTv6vLLQdyKal1lP5+vcLVS1K99Na0b9jzyOZd6Rnqvoy99RJiBcpEsTiqZABsn9 pZ/xGyXJTsieusX2eMS5tJgtoj4jr3c0FuxAxYerOY3k0OmdThOMEmA3kePklnr/1tLn L8C7/qbNjoJMkE6CPsGQB8E1KSp5w1xH9TURIEj0La3PM1yMTZA/Cwz8aep3r6dZIXSB LKK4mVKzJKMWB3rOVviB8cxH1lkwm6rTz0ARX+IuZ6P7XbA81hFuDffG9VMLNoiKy9oN 9gKQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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 david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id c15si429569ljn.0.2021.01.22.00.42.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jan 2021 00:42:45 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 10M8giLF005901 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 22 Jan 2021 09:42:44 +0100 Received: from localhost.localdomain ([167.87.28.222]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 10M8ghKp004484; Fri, 22 Jan 2021 09:42:44 +0100 From: Henning Schild To: isar-users Cc: Henning Schild Subject: [PATCH 1/3] dpkg: adjust task order to allow using "git" for patching Date: Fri, 22 Jan 2021 09:42:39 +0100 Message-Id: <20210122084241.10573-2-henning.schild@siemens.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210122084241.10573-1-henning.schild@siemens.com> References: <20210122084241.10573-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 2G3cyYToWoAz 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. 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 ?= "" -- 2.26.2