From patchwork Thu Jan 21 22:42:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 285 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:94eb:0:0:0:0:0 with SMTP id l40csp1123790ooi; Fri, 22 Jan 2021 00:42:47 -0800 (PST) X-Received: by 2002:a2e:884b:: with SMTP id z11mr1934581ljj.25.1611304967114; Fri, 22 Jan 2021 00:42:47 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1611304967; cv=pass; d=google.com; s=arc-20160816; b=wqqt2n0SN6rk6WZwAH+x6vgVL/frauEBKXZDakPvPjovj0WwV1HteJK2sHL/1Q/dAQ EczHlPQeMC99ABQqE/Lhy8tny2JG+KVl4/VzsQw4qr4CoefR0lHnplhcdqX5uKI1Trer V3DYV4r2gtMGvFAZ79O6ERRCZckrKbl4EvyGxvWMTGn+5KevcavrBmzyatfsDwGMKiHv kTOPWClBGZTgyfwP0SOlxcQWiQustHmejb9eP5zH28CkD7rvcCFIAThgw/XPnX6a+WlG JUKPupwWpp06Gd0S9jWR8smIeTlPLm+5E4WjolPn5YIk6ea4eleic3SbU/MAQ3U8zMSo P0fg== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=iPhMwb/gPAVWr0UNolRYdC/WN6ywtItszk9hvBOUMaM=; b=G+bMt67lE1RYDjopFBsmHnqu8zzPerIq1bR/ezU+gXa5XJzbeoB53vmV8A5ZIEXEnv IAECkvLbsRARZhZcZdEf9k4rRnI7KSQ6D8sdw3pBiKee9TjW4OWqVSTBXsAUfbpKC5Jt vzcrNB2BGhVw/g/zHrLgvKLhciGMCvDiR+9Z98WdTMAG5bv27GRnu0pKgT11AdUiTA4t s0na313gKgLJmNrx7MeHl6+H6HHtE2pJLBsceD8qfo+tCfmk3kLzlypoGNCGQXOyWCYO NMlih36qJd4BJzdDoSI+zLjr6BrVxz0UKxYvk9PerpYfmM2oeEa/F1wmhsSBbzk87Dt+ GYBQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=PWfBocma; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbdjmjpgy2mgrbbvavkaamgqedjmjp6a@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBDJMJPGY2MGRBBVAVKAAMGQEDJMJP6A@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id w15sor1876822lfk.77.2021.01.22.00.42.46 (Google Transport Security); Fri, 22 Jan 2021 00:42:47 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbdjmjpgy2mgrbbvavkaamgqedjmjp6a@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=PWfBocma; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbdjmjpgy2mgrbbvavkaamgqedjmjp6a@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBDJMJPGY2MGRBBVAVKAAMGQEDJMJP6A@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1611304966; cv=pass; d=google.com; s=arc-20160816; b=hcKUkMszrEKQgl2XZdgFAUitxcXb/R4AoOMBiXTtRUHf30M7hscI8P2JGLdGWsl8Bm bgQh66Qx5vlhhTYX8g4A270DLHyKGx7VCkMjSiJ68WW/xWlF/3BtNYmun6+vv/J+y45O 89HVv9qZfQqZWFRMRBXh7ruOY+zGccfXibrXmRF2AjBON2IapxFL1+4bxyIVISQwoBrB Z+HhWZYW0Md7VCNNA7DcDBCLYIGNJaYJS0ViptxSLUhUqiW+pr4MsiAI6+1dhuXvzsn6 pLNROpKj2GAN2EYoMzUnIwUDlL0pUiRm88JG30CGgQvlD5g/oCknCq9qVUzHHrtGHTsq 8Clg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=iPhMwb/gPAVWr0UNolRYdC/WN6ywtItszk9hvBOUMaM=; b=bxNAe/mo4wbWD8T3H92m0xX/GJ/jeVPrQBM+NecQsY0esfwnWpt+kqJ8kfPFQD2Jmw EQZrJ25IUch3YmhqeLdureHFu95wZ0CeJlGeCzfTOBBtgb+v+eyA48rXAOpAmngka4/n 2zxRftspboYfleNtxgi8IyEqlYzNg/YqHAceCDKzfxQG08K/Xr7mWsdAAFKon9YSPdNE ukSKt0x4cyMir4iOPKKAjX2OhTXOI+SKE0RPk+HqLY8hV13i8B2Gro2y3Sd1fImLAQJh wCgAXd3fV9b//nnQRTTdMJNbKjegIdA5L3wMmMw4SVXX/3WuBX5E83NNcl31uOvyNehJ 6tqw== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=iPhMwb/gPAVWr0UNolRYdC/WN6ywtItszk9hvBOUMaM=; b=PWfBocmaF7tLRa0Ogljgmcg3ubIB3W+Kxp2EfSv5/nRjoSIgxwZoWNtTFEH+AQhH1F amXIdbbVQJShv06Qz4HKjnp0Q8C2LQYBL3rvld1I7/OFAQ6w9adXBR3LzxJd4YOJoIoi piS320u5RK1fI4tpLfMt6wmKxrSzpdSTMd+e+Vk2StI7/wm9vl6QRXRHgZ2Vy3YH35dV NvFFLPvoRtZZA+uRdB37CBZwx7Z2+L45tpIYhSLpn6aXtvSNZdNOxATlQm9VUGSUB8my W4brA7yEq3F+P+rH8qPGpNPgk6WRs2mCRgK01mDFisY2Tf65bAhmPrIeXVQJfFSRYKWf jJtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=iPhMwb/gPAVWr0UNolRYdC/WN6ywtItszk9hvBOUMaM=; b=GQCvnuWSPCiZNq/l9BNFLkRpsyj6xaUv6WEgcABZ9s/Puol+fHXYU9kyvOwomJxIJs yrCfy00neeCe1tbPR62kzfdLTcMokzpNpjVT27phYXXZRdxWA7gYmwV919ok/r6MtsvW bq/ZiDyBwW5VZ9YFBzDIwggogeRdhHKt0Tytuv3X/ULHCf3xBDR4jy66Av8vGX8Bji6/ cUKabiVKfuUctwsMzMG1Ya7peINjp4A55f1z/kbkSXTtTYCBmKPKWJ89WbrOlvx5TgUV 7w2+FyM5uNbaN91Z4z4zKa5PFdvCXxWuyr8SDfIrtddLYyN1z1ODtOarLtfcG2sDgDX3 3SlA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531HPUw25NEERiPTAt6qetV2sQg/PUwQ0D/yCG+v9YMtK7kwk7ql j+OF67guOxGD1Rk8QXUxm7o= X-Google-Smtp-Source: ABdhPJxdFzCVElzeSo4vOhM8B7XOzTLVEEWm38S6Jw+ctN2yrSheO9/9wNbIpVVSeJkXk3PImKXVog== X-Received: by 2002:a19:d611:: with SMTP id n17mr1766587lfg.494.1611304966662; 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-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 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; 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 X-Original-Sender: henning.schild@siemens.com X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1689575716734260390?= X-GMAIL-MSGID: =?utf-8?q?1689575716734260390?= 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 ?= ""