From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6995453036489342976 X-Received: by 2002:a19:4901:: with SMTP id w1mr1735196lfa.323.1628755842445; Thu, 12 Aug 2021 01:10:42 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:691e:: with SMTP id e30ls1955642lfc.0.gmail; Thu, 12 Aug 2021 01:10:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyVZPMmK0Vfx36vTfvT/3ISaMM4/ywzkRvSzWS2Vkk0RE/gb69E23qh5aiyyl+29l8laWCR X-Received: by 2002:ac2:46e1:: with SMTP id q1mr1770136lfo.250.1628755841425; Thu, 12 Aug 2021 01:10:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628755841; cv=none; d=google.com; s=arc-20160816; b=nwMT9Jrek0lZy4EUIRI3b6e5jDuVBYQQXmYeSZm+kvsqGs3rcytsDFYCUwohXs4G2i oq74cUETfJUawxw6ZRNKaSibDYpozLen0P8VbDSZ+1z5byt9j0P9ni5QYoZVh8B2cTzY lgoQWH6npiJ/DH1g05k4AHgDzc0stD4zUejyChN5U4F56zQMFmpcJDATWj+/OKmHxep3 WUcs2Pn6T+HGKv2M94xaMhTzJMva2AczuNqsrJWkJmp5nyPe4dFGuyz8X6RjPvTDFE2L eoSmGiMiRasAaALiJY9tpwaMpLxRiwFIxVEcbZDQahOEUHpEPp6IufxgpBYR3Wgkmeyj bLyQ== 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:to:from; bh=9Qr6WzCJt3xHTpilYTs/CuKRHgH1Yxe4osYuaylbl20=; b=VBLWPWc9TQu0kWE2c/S1M3gUsrehAFlIgQCHXnYkosyMM+Qfv60y9lH5OCnet1yxsm GpOpkBuzS1OgTCsEQmFYNsSmTnsZVgOP5D9KmrrdQT7dz9Tdx8ZWyvmVH7q5fgieWEvV tZMh1kmfvSMv+Dt+yHm4/HafkqiXEDPjMAp4iJrDFmVRVP7GVUl2RkSwL6PPhNTVY0DZ KdoAyM7LjoYKSDO/LSyhZl97Aso/pyoqlGDJ0uw251h/RDZiOMGqyyOevcDbXfDWYuU9 zvWOBdHY2qvk975LenHYNZ7LWcbXaAFH2jLVC8jdwumaH5p0Z46D8lPrR1bMh/iHPTxr 6Vug== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id x17si97878ljp.0.2021.08.12.01.10.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 Aug 2021 01:10:41 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 17C8AUwQ016794 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 12 Aug 2021 10:10:36 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [RFC 2/2] dpkg-gdb: Reset git to SRCREV revision before patching Date: Thu, 12 Aug 2021 10:10:30 +0200 Message-Id: <20210812081030.4505-3-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210812081030.4505-1-ubely@ilbers.de> References: <20210812081030.4505-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: ItSKhuJ+jDLI Rebuilding some packages like cowsay after ISAR configuration changes causes error during do_patch because the patches were already applied at previous build and git HEAD was changed. The change resets package's git HEAD to the appropriate revision. Signed-off-by: Uladzimir Bely --- meta/classes/dpkg-gbp.bbclass | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/meta/classes/dpkg-gbp.bbclass b/meta/classes/dpkg-gbp.bbclass index 20d2d4c..d37b07e 100644 --- a/meta/classes/dpkg-gbp.bbclass +++ b/meta/classes/dpkg-gbp.bbclass @@ -26,3 +26,13 @@ builddeps_install_append() { dpkg_runbuild_prepend() { export GBP_PREFIX="gbp buildpackage --git-ignore-new ${GBP_EXTRA_OPTIONS} --git-builder=" } + +do_patch[prefuncs] = "set_src_rev" + +python set_src_rev() { + srcsubdir = d.getVar('S') + srcrev = d.getVar('SRCREV') + + if srcrev: + bb.process.run('git reset --hard ' + srcrev, cwd=srcsubdir) +} -- 2.20.1