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")