From patchwork Thu Aug 12 00:10:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 670 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Thu, 12 Aug 2021 10:10:51 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f191.google.com (mail-lj1-f191.google.com [209.85.208.191]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 17C8AlAs016826 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 12 Aug 2021 10:10:47 +0200 Received: by mail-lj1-f191.google.com with SMTP id v17-20020a2e48110000b02901b787efe665sf1718171lja.7 for ; Thu, 12 Aug 2021 01:10:47 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1628755842; cv=pass; d=google.com; s=arc-20160816; b=vNfy8oKW4sJJW9uPcxHHJD9gjywOdo7TfdEt7Yh7xNVVdoj3q9p4qlhGPlDqIhzVOq up5PCQpbgYHpAHUW5RWQP/GIrHrs+4KfUwcQiAloJv5G2q2DH6Uq58HwfSg/smaKkvBs ghRWEoH0Ci+O0WbgCZVmltipnmlIYpWMCejKRPfd9nreJzhgeUykK/CDylLVEtivg0ws 3cENZZhDuiAHsmtdZ1I8SWXU3fQkGgE8z/3SWKwAqpPJ7CKq34cgaqnb4aM6FndfX2aG yx/Qy7ObATKg9HVBUhUygMdF1dHORF/TlzEvLbERvt9HEVGowewlLzDhIjCXujmDw2OJ +zfg== 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:to:from:sender:dkim-signature; bh=f+BCIhzvM2GHR3Sx8X1g25iOh2ujy27yZ3GsGJnX5j8=; b=D5Q96NGp0miCdGaxhU6LDpkSElyFR39GzOhUazIRZ+kw4SSafA9vKuwfFkZAg//DFE 8/ZPmejZrWFTgw9gp+7nzdVqEjKBBeKiu6xeTJxlPNR86F/gDTeJfBWrLZExHptHUBhR +vhavSsBfl++Rh8baFq6ZFlr23/rHVYw+jndvbTAEgtIpBbIriP0TX8RJgNl5PDxfNpA n+9CVYuqNH9j6RpAeviBgmQ9bBIXuwngJtlz0ikobZ4vcLZ0a/bJMX2Ti3lxCDLtxgBj MIGrDzDimR8ywvYwkuNgCOw+VD5mBJjmY6qRJYZQ84Nnq1BlxFUFFI050ZtKCba4j6H0 6f1A== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to: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=f+BCIhzvM2GHR3Sx8X1g25iOh2ujy27yZ3GsGJnX5j8=; b=dIZ06TpSPhPGaY4cM1HpBIj7DqXuREa0NR+8DHVLnItBwj8RY6gT7OB7oC23WWE1Eb PPTfk/6vu1/Ap7NiVyYmySTFYF3BTydSmH0ld9bcps5HcyJiJKU8oWb97p4zDZPu5az4 +/tycd5qm7xNA5VlaHQiOd9NZ80NgUPXnaoWxgRnT0hzJ71+aNK7aNnSpTwN7mFfLQQ5 QbLvaiW3cBmqUCuWlZX/ij+jI9iqqPIA/kRUkC7ywh/yA/iTrXagmLZbbFoirQ5sYTeV oXwW4I3fUOVkKbx/qjTt47fittqckdCr+d10eEWv2/+/qS1+Lywt61WKmp3BROQRWqUZ kMlQ== 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: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=f+BCIhzvM2GHR3Sx8X1g25iOh2ujy27yZ3GsGJnX5j8=; b=aPtlUS47cDRSDJKaOlSHZpW66J8s84fy/8vVMIijq8Hnk7Fr3euqyh8X5dPa7L1cB9 VVDsu1kTwF4jcTrPe09XboxfVEJA4QVkulP3hl1FB19eySeHrVsQUoAh4aG1rtOLOhyw hjWIXw01vE9X6KIXiZE2iKfct+2vD5x0494NeimV61bV4iRvIDVls+qIy4vymMO6xRzc RUDcZ2165TLYJj5GJY5s9YvCajJabl7R9uY6FtS47htVviRXv4vcuvdMvfaLmMOCAg8O 0ZzzYqF7ni8qzoBGo8TykLUMF9evznnE7J3K6SkLylDJLXjg63MhlYsueti9aG2ODlhZ 5fwA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533BWqHqpXdm8Sp7KWWoN0vUsQtaQDNUwYGq+1eWmomV+THvMM6s YYgQEemLH/mJPGNL6drVFK0= X-Google-Smtp-Source: ABdhPJxh5L0KeU2ESPTpsz0G1L6KL+MZ9M1iu9E2RI2GEdlxhXmrikrbtn+VNmwiw3ka9TrvUJPHbw== X-Received: by 2002:a05:6512:e9a:: with SMTP id bi26mr1711470lfb.282.1628755842375; 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-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 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; 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 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS 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-Original-Sender: ubely@ilbers.de X-Original-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 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 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) +}