From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6995471841453146112 X-Received: by 2002:a05:6512:3682:: with SMTP id d2mr2309718lfs.50.1628768935853; Thu, 12 Aug 2021 04:48:55 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4146:: with SMTP id c6ls298621lfi.2.gmail; Thu, 12 Aug 2021 04:48:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJleEFMGtvR9JYD6ux6ooyTB8KCQwbkUYnABtivHC8l1NjZquD4MytFrmZ5JvtyCTJPfUj X-Received: by 2002:a05:6512:4cc:: with SMTP id w12mr2288409lfq.78.1628768934730; Thu, 12 Aug 2021 04:48:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628768934; cv=none; d=google.com; s=arc-20160816; b=hdnOSCguQ9tCAHGOD7E1dNVg50+oUi4pSP0PzbBANH9V/FrdknPcYVqy5OrATx6myU zeSNQQflR3qQfNU4J2pwUVA/oWbVRfNTzmwySBOgtQmkHIBYPCimJ8IhmB34de+s0U9F zmqu/mCTKcys/lxDacN3y2CSimU5M5hg/nL2TWjhnNGbufMLh4GsyZRqyxDZuV5/NaUC 4eiouVX2DuSp9Tt/UVHvLdVOJWHF/m9bgYXOIIzf70dRZdFUWXRR1gqtAw24tsHfQs8Z jTfTcsPCSInUhqDd41MOPmIr/2PUiL7xflJFHJg6BP2OkMYjyCbxInqX/qYIT/JnkWaR UqNg== 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=bIxuFJXYJZZZntBCpuyYHJWBWpTWlYv9BfHSZm6b8Io=; b=D73UeIEWwUAGUhi11Dz9iotQSF1NbuVp09MM04lyey0jkuF29SQL5bwiEBcwNHEu5J dQ85n84rxCGDbcvFF3gKxDn8vNiulg/ENivRVaD0MUiQwbzObE3Wj7pnF70LKFCAcIh2 1rg5z/HCBs0ZpbY3jfQWoDkAi86gCMTnAul+UK8OiCkKydezkGVvvtGnEh3OxIjvAJH4 b5MPJc9I5ha9gYzgn+s/W0LBZM+0tGgJlosj8mpJFH6TvSpkJLU43ieNjOFTEPBPbqtg b8Ocn4JbijWpfneYr9+kX3lLiKxzGv1tF+SHEgHURPx/n2nYM6BpuV1MeCc/T1c6KlDv d43g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id 9si98826ljv.4.2021.08.12.04.48.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Aug 2021 04:48:54 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 17CBmseS012615 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 12 Aug 2021 13:48:54 +0200 Received: from md1f2u6c.ad001.siemens.net ([167.87.241.87]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 17CBmqxM030904; Thu, 12 Aug 2021 13:48:53 +0200 From: Jan Kiszka To: isar-users Cc: Uladzimir Bely , Henning Schild Subject: [PATCH v2 4/4] Revert "dpkg: adjust task order to allow using "git" for patching" Date: Thu, 12 Aug 2021 13:48:52 +0200 Message-Id: <0f474f0c03f726d5a8c5fa88570b278f7462bf8e.1628768932.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: RVTN68DQf76W 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 992f55a..ecc583c 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}/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