From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6995453036489342976 X-Received: by 2002:a05:651c:1143:: with SMTP id h3mr2053229ljo.155.1628755837791; 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-Google-Smtp-Source: ABdhPJyNZ+N04ZA9iLUyeslhRZcGKELwcKgB77Gw7glbeYMIJax36TzyynDOs2nHDTnbcGS2dEhb 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 Return-Path: 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; 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 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 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: UZbaOvH/9BuT 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") -- 2.20.1