From patchwork Thu Aug 12 00:10:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 669 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:47 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f185.google.com (mail-lj1-f185.google.com [209.85.208.185]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 17C8AgUT016808 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 12 Aug 2021 10:10:43 +0200 Received: by mail-lj1-f185.google.com with SMTP id 7-20020a05651c12c7b029019545e8e9c2sf1732570lje.4 for ; Thu, 12 Aug 2021 01:10:43 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1628755837; cv=pass; d=google.com; s=arc-20160816; b=mD3ORJ7CD1npE4X7NPwI9GDhG4g/1KbZJj3ohFCrgICwzE9eF+PXd3P6GR/cP2hw9f rQzopbScNZ6k2n1qVryYzDuzVcXq+pW5ulfwcqVR5+ee3+Q6RGkTRJoGR45ovlSjKeNG 62no8VR06qmvZ4enTglQJn+ZIWMQ/fFEBvC3cWd7L2BP0XQ9wiKaacJ5AWFQ0doSdBti qpQ4gqZ5VkvA7OuXYA4mcBxd/hRUAxdVA2rem/FFv9pV+2Q6n7YLOnjdStPwOaLBTGYM demTUIwr7FaTdS+OGRrtMKemD1cOuEJF8fMHkeWWXqhNhzeiIZcZlVaWLrGT/qxA+NtJ scBw== 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=MzCBAfFUlsDRWTE3UTUWhX/dBtIxGE1blG4iODCP03w=; b=fMRATdTpEI/NAAz6bPlMQ3DdP19s7u5gB4yfksiAxxq3oSIG5YU7veZoxpZAaF5Tqo 2gnQb3GGIzCLYOaR4XXLL79h8sPZeZRCh06RlzUzkcuxSIw7rKas0Qn9oZHk8qvUCBvj MuBVRFuvpi22v/VQuJGKZH50qTFbIEUWzGz0YhfgFsacUEEoXOm80EoaIabttLeq9OWu P9XJEER8g7CaG+VBfuopI7Q2pXYuofE1eaK3KAgxzP7G5g17REDPxmpEZCdmQD59+QyU kWIcclaeOfifBPEwqR8/5vJbRntQQuGkAnsaPz534YGuP959Uj98t51SOmzrCAp0dcMJ qXCg== 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=MzCBAfFUlsDRWTE3UTUWhX/dBtIxGE1blG4iODCP03w=; b=eo+Ge/NNdv9zHfLv0hJBjjG+fFD4wutlNlcB+N4VXK/NlwHCq+xdg5MWyXGjHEHfUh 1eU4RsarUR82cH1lsc8Z8g0Oc+ebXG4qccT8WJ/BIYx+t3sfCKwiPrEtLya8edf5Lk/W 7xMgezIVEGkUGO88g1++DuyRIo16pll0dBm5oc2CQXhOHWMPatZGF2ENNxgRk7Uqv6YO w11F+WG3gJ4K2CjLiD8gPhfby9oKtidCj5q9uUce7Cn4Gd8/lLOfOV/RNfxn1ZXv8FFL +GYjkbR4vFmpkIZwDWLDx+7zi9O2dch83EIl4r2ej8qcqIX3f88MuWfLSlyGTOJvMAsq f+Ew== 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=MzCBAfFUlsDRWTE3UTUWhX/dBtIxGE1blG4iODCP03w=; b=FOk8ggQefIqHJr01G9QZr1/V9X0++OErxKoxrnRrUDcGHPJr2U3TRtKy6jXxcvh7Q9 xNgKK2XCWtZO6dd9bR+VGmnrpmG++HT//9wcqUjxDajHaWXZPjPutzbLBX9xrQGIZ5Wo jjJggrlzlpwm8qqbcxYvLuBkYxS+2RtGO3l4DJ51Ow/Qe5XbZ88oTJ1O9gRx8rIQNNqR z+cowoASsaeDErmCIO+I0FRYjFxQf0Bu7ezhFMEFHbf8ycPlC7ig29Pfh7MaHpvmIdWH YWZYNNJb/EqVVrQ1Wn2Oto6/L9Q+LHHhKlXjh1TL1jEJb7Nu3n1SeYwttmRUD1P7Oe5D eyYA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530zKGT4ghJfLKJdSqOI8uOScVsBgrFBZE0/eIrmqyFz7gNRAiA+ 6rg5ra+43vddzRV69AGOoig= X-Google-Smtp-Source: ABdhPJx2a+u/4CTxOfwVzmoMDk6g6N3gTs6rz+Kagh3pUO44wuImZWARdFtDHonRquOKWOvVOHK43w== X-Received: by 2002:a2e:97c5:: with SMTP id m5mr2135343ljj.436.1628755837712; Thu, 12 Aug 2021 01:10:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3f02:: with SMTP id y2ls1954613lfa.3.gmail; Thu, 12 Aug 2021 01:10:36 -0700 (PDT) X-Received: by 2002:ac2:52b3:: with SMTP id r19mr1702055lfm.551.1628755836585; Thu, 12 Aug 2021 01:10:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628755836; cv=none; d=google.com; s=arc-20160816; b=QSciQaA7nOFhlnzpKA6p797jCpKmPd/Yp+Ec/T5UEAazvbvK1Ym76p3bjmajzk+6V8 zNjlyBSNcr6zV1Mqc3+cfzinV3d3IUmbX+xyZvaRK0EamscTUmdYmkFotAB9Zupy8lrB nKPg4ZjLJvbfVE+Yv5riONPpClYWoQP8BE/K0wpKubF/SdsqwJEVCTV5v30DjpFyCrE0 qNQwWeBsEi7rIhczfgVMMcFXIl+/PRUTiHdCFV29UBlZIljDv4IyKMB6o2rRltieYoSO zK/HyKT98VkYYBraB+CSjH8ZBWsZ15uA08qxEg6p8tt6pGPbyF3Z6EONLmIj5w+YfPZ8 ka3A== 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=Y99KfQ9+KlqgYw7+EZ/MHqn/P+eJx2G1R6+qDAxAFlA=; b=bc3NtZ0WpFM1Rep41va73xv5bWN5jEQ8CM11fCBY7pmYjYJfMjJPO+wnkNwjrv44oE or0uyZwE0mpHR0XxAgy9ccOhnA8Dt0yXK6BKpEmhME5PIyIvk7oV4TgocKp3oNc7TIsd RtzlU1B2+IJOKYJfAOk/hTn81sTnxbBd8WSIcseW3UMFHCle5F7caBFZtEWBfe3vNqDZ ZjK9yyHZl/J6FDpbVSMifQvCfxzIf/buP5YvvTIZFTSmD45d6km+fXnHGFsDXW26+/wg Bhv+7ZxLGzCFkqUeEhXICGtcSRv066x2srVWjGZ9+twqH8qGlqOz9j1m7dTAvx3XXaNi Mk3A== 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 k40si84693lfv.0.2021.08.12.01.10.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 Aug 2021 01:10:36 -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 17C8AUwP016794 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 12 Aug 2021 10:10:31 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [RFC 1/2] dpkg-base: Add new git alternates record instead of replace old one Date: Thu, 12 Aug 2021 10:10:29 +0200 Message-Id: <20210812081030.4505-2-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 Task adjust_git modifies git alternates by replacing DL_DIR to /downloads. New path is used inside buildchroot, so that working git repo becomes broken outside buildchroot. This causes problems with rebuilding such packages as cowsay if something has changed in bitbake environment since previous build: ERROR: mc:qemuarm64-buster:cowsay-git-r0 do_patch: Command Error: 'sh -c 'git --work-tree=/path/build/tmp/work/debian-buster-arm64/cowsay/git-r0/git reset --hard HEAD'' exited with 0 The solution is to add new path to git alternates so that original path will work outside buildchroot, and new one will work in buildchroot. Signed-off-by: Uladzimir Bely --- meta/classes/dpkg-base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index ec8fbc1..4b9b782 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -46,7 +46,7 @@ python do_adjust_git() { if os.path.exists(alternates): cmd = ["sed", "-i", alternates, "-e", - "s|{}|/downloads|".format(d.getVar("DL_DIR"))] + "s|\({}\(.*\)\)|\\1\\n/downloads\\2|".format(d.getVar("DL_DIR"))] bb.note(' '.join(cmd)) if subprocess.call(cmd) != 0: bb.fatal("git alternates adjustment failed") 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) +}