From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6995471841453146112 X-Received: by 2002:ac2:4c56:: with SMTP id o22mr1980357lfk.240.1629969782640; Thu, 26 Aug 2021 02:23:02 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:503:: with SMTP id o3ls973021ljp.0.gmail; Thu, 26 Aug 2021 02:23:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxoYW7jsHbXYq14YqaqhfcQMHJWL81Fc2XQUq4pVzN3AJEu9VQp2YMmZRcxO6hKVfQibF86 X-Received: by 2002:a2e:bb8f:: with SMTP id y15mr2195255lje.148.1629969781624; Thu, 26 Aug 2021 02:23:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629969781; cv=none; d=google.com; s=arc-20160816; b=la3F8rRkTV2ksQxg5oj5FWDsUOZkGbH1Mo1HPoV8uVtqilQfSoshyfxWcUjZ9GCT9+ Qu49TMWpDaLXEmwe5sVSHPGq0AoWEsPlXsqoR1YNb3H/LgBvr3KnSAtiBiugAUeIf988 uVwbqmn0gAh9QCzNDlvX9m9CGbfTQcR4FTrXQ68IhxzsaC0pwyJG1hpu53PtjsICHADG uhSVRxhGvO2hz8WP5RUaB3m/fEbRCox7Uwd/zxpRQotp+fOx96F/e8OQ/sm4LbtyA9u/ t/3fCYbxVCP9OhhzaxHQnzmQ7+CgkZSpv5a4/FH/TIhhlmLYFF/hr3JVKdkPoqufF0+c BYTQ== 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=let7n/jtGJoeUH4WhH2ktwTVDqyJL96W5xGpZJXV50E=; b=A46uboZC/aNLXgnFZXUq7en2iAh143NjNjZ2/le5h4mbxTaRugYrbGclMHq7kY0FZN N3nQmur90bIW6MS0ac154IP7OnqqwEQeidNZHKlP668bpCZGGkg2Tief4Pcz/ZJuHut9 JOaAtiNoJG4fcGipRiowCEgIjvjj5VA6rDgNb++U9FxrGuReqjoHDHvy63al9YAS18E6 CyKKPiedxpvpnAwAdZeQlHRFf/8cMoL9xCUwt1uGVhgu32mjlt6ofMo4uycgbBP5eZ1R brg/LcgvrPZOBi6R9jKBYegvY2Ezmh2ZiUbT+ftFiCiChsZ+zGCQfhz/8EB29E6SZzYd Z7bQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id o20si81952lfu.6.2021.08.26.02.23.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Aug 2021 02:23:01 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@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 jan.kiszka@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 17Q9N0Sx020721 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Aug 2021 11:23:00 +0200 Received: from md1f2u6c.ad001.siemens.net ([167.87.32.3]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 17Q9MxuM029140; Thu, 26 Aug 2021 11:23:00 +0200 From: Jan Kiszka To: isar-users Cc: Uladzimir Bely , Henning Schild Subject: [PATCH v3 4/4] Revert "dpkg: adjust task order to allow using "git" for patching" Date: Thu, 26 Aug 2021 11:22:59 +0200 Message-Id: <899be095f37402e5429a0b552d7ed1f308d0b8bc.1629969779.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: SnMkaH1TxcmF From: Jan Kiszka This reverts commit b4c33ba69ed89849ecf32d8731aa97ecf88226f5. No longer needed now that adjust_git stopped breaking the outer environment. Moreover, this was broken /wrt devshell anyway. Signed-off-by: Jan Kiszka --- 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 9a18acb..8286168 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -65,11 +65,11 @@ python do_adjust_git() { bb.fatal(str(e)) } -addtask adjust_git before do_dpkg_build +addtask adjust_git after do_unpack before do_patch do_adjust_git[lockfiles] += "${DL_DIR}/git/isar.lock" inherit patch -addtask patch before do_adjust_git +addtask patch after do_adjust_git before do_dpkg_build SRC_APT ?= "" -- 2.31.1