From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7180000193640660992 X-Received: by 2002:a05:6122:b66:b0:3d5:d67e:e5a8 with SMTP id h6-20020a0561220b6600b003d5d67ee5a8mr791280vkf.33.1672815374651; Tue, 03 Jan 2023 22:56:14 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6102:ac6:b0:3cb:9ab3:81b0 with SMTP id m6-20020a0561020ac600b003cb9ab381b0ls3549748vsh.7.-pod-prod-gmail; Tue, 03 Jan 2023 22:56:13 -0800 (PST) X-Google-Smtp-Source: AMrXdXvpJPu1FUagxlKQ3UkbGHzhnI2d+Z5bnSHx658AJegk6ZoSgspnPkla6wv5+YHLR5QY6DSD X-Received: by 2002:a05:6102:3647:b0:3c8:332e:bf3a with SMTP id s7-20020a056102364700b003c8332ebf3amr10931882vsu.6.1672815373739; Tue, 03 Jan 2023 22:56:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672815373; cv=none; d=google.com; s=arc-20160816; b=0431H8l31BiSd96x+8zv+KjUDu/ZLMjRgBRpUWLO3aKyiEM+bfebkRlEhxxO5fFgXt K/R7dSJvYTRR2g/gh0hfUvU4FGsCQ+cjQ3i8PbThtqavipQ8z+qhuC1PZJzlpKZzU+LU lQP6Jegqw0kfvad378vSIyHaZ9fUZ06MgOsfj24EO2JghlUM0mxCOCFdvROtyOTvijr2 1Ety6aIMVAsgeGeeDMQLkzhKM4+QAHXWXYDdMa5JeD6fxOwO65wU/DJq21rbiKkufO1J efSnKAh9ZfQo6jLmMKhY66w/+WCVhmtpsNQs6KKvJX+1V5CEkrNmkHKi38LikU5ezAJC pyFw== 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:cc:to:from; bh=MDpniCgaJxxOeC+NRsZ5o8SgIh5wTbJeqeMMg2TFJRQ=; b=Lwy71+koH852jh14wKxU/FDy8UbEJMavvR6BRMEjj84M8CWiiwc4+jvfAf5K4OmQnS SWGkVAX9ljHrbvU8sGTcY1LUeunVeP88U+htWfwZSO/UdopaB3cRbmLW7+JxZMM1xA6r Yl3CG34LTA2/nrgLfRHsuALFhheW39xtuM5VYQN72RGiPEHXvBR55iJ07dcrH3EMBqKE m5YkXVf6/3/odD/OeTRBlOw/+QfRtzvLFfGDJHfuF7UbkTgoU+7J1D+7nHL7uo9wE+Wz XNC0cJucjCXlmlwZJHVPo5AUOouwaqMikldI+DBMs5mbJvoN9mkb5pPznh+TkpjOjFtb UsVg== 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 ay22-20020a056130031600b00495a8105fc7si7871810uab.2.2023.01.03.22.56.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jan 2023 22:56:13 -0800 (PST) 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 home.localnet (44-208-124-178-static.mgts.by [178.124.208.44] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 3046uASR001376 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 4 Jan 2023 07:56:11 +0100 From: Uladzimir Bely To: "isar-users@googlegroups.com" Cc: Jan Kiszka Subject: Re: [PATCH v3] meta: drop debian stretch support Date: Wed, 04 Jan 2023 09:56:12 +0300 Message-ID: <2629197.vuYhMxLoTh@home> In-Reply-To: <1950d13b-9d37-6058-4b3b-0620f7fe2817@siemens.com> References: <20221227063555.22836-1-amikan@ilbers.de> <1950d13b-9d37-6058-4b3b-0620f7fe2817@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" 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: K2SnNFhIIQyb In the email from Monday, 2 January 2023 16:06:08 +03 user Jan Kiszka wrote: > On 02.01.23 13:54, Moessbauer, Felix (T CED INW-CN) wrote: > > On Mon, 2023-01-02 at 12:51 +0000, Moessbauer, Felix wrote: > >> On Mon, 2023-01-02 at 12:01 +0100, Jan Kiszka wrote: > >>> On 27.12.22 07:35, Anton Mikanovich wrote: > >>>> Debian Stretch state was moved to EOL since July 2020, so drop > >>>> it. > >>>> This will allow us to get rid of many hacks inside Isar core and > >>>> single > >>>> example packages. > >>>> Also drop raspbian-stretch distro and rpi machine used it. > >>>> Drop wic_fakeroot fsck hack because it is no more needed. > >>>> > >>>> Update documentation to remove Debian Stretch there also. > >>>> > >>>> Signed-off-by: Anton Mikanovich > >>> > >>> ... > >>> > >>>> diff --git a/meta/classes/dpkg-gbp.bbclass b/meta/classes/dpkg- > >>>> gbp.bbclass > >>>> index 68172b3f..f765eb9a 100644 > >>>> --- a/meta/classes/dpkg-gbp.bbclass > >>>> +++ b/meta/classes/dpkg-gbp.bbclass > >>>> @@ -9,16 +9,13 @@ S = "${WORKDIR}/git" > >>>> > >>>> PATCHTOOL ?= "git" > >>>> > >>>> -GBP_EXTRA_OPTIONS ?= "--git-pristine-tar" > >>>> +GBP_EXTRA_OPTIONS ?= "--pristine-tar" > >>>> > >>>> SCHROOT_MOUNTS = "${WORKDIR}:${PP} ${GITDIR}:/home/.git- > >>>> > >>>> downloads" > >>>> > >>>> dpkg_runbuild_prepend() { > >>>> > >>>> sh -c " > >>>> > >>>> cd ${WORKDIR}/${PPS} > >>>> > >>>> - gbp buildpackage --git-ignore-new --git- > >>>> builder=/bin/true > >>>> ${GBP_EXTRA_OPTIONS} > >>>> + gbp export-orig ${GBP_EXTRA_OPTIONS} > >>>> > >>>> " > >>>> > >>>> - # NOTE: `buildpackage --git-builder=/bin/true --git- > >>>> pristine- > >>>> tar` is used > >>>> - # for compatibility with gbp version froms debian-stretch. > >>>> In > >>>> newer distros > >>>> - # it's possible to use a subcommand `export-orig --pristine- > >>>> tar` > >>>> > >>>> } > >>> > >>> This cleanup is requiring an entry in RECIPE-API-CHANGELOG.md, see > >>> https://github.com/siemens/meta-coral/blob/66a85fc4958524526d4a5e2eda058 > >>> 8de2a5f46f9/recipes-devtools/bazel-bootstrap/bazel-bootstrap_4.1.0%2Bds- > >>> 1.bb#L14 and https://github.com/siemens/meta-iot2050/pull/396. > >> > >> Yes, we definitely need that API changelog entry. We have the > >> following > >> pattern in many recipes: > >> > >> GBP_EXTRA_OPTIONS = "--git-no-pristine-tar --git-upstream- > >> branch=master" > >> > >> This now has to become: > >> GBP_EXTRA_OPTIONS = "--no-pristine-tar --upstream-branch=master" > > > > ... and changing this breaks backwards compatibility. This is > > especially problematic for layers that also have to support older > > versions of ISAR. At least, there is no release in-between v0.9 and > > next, so we could argue that breaking things is OK. > > > > An alternative would be to simply replace the --git- with -- > > on the fly using bitbake magic. > > We could do that for existing GBP_EXTRA_OPTIONS and introduce a new > variable that targets the actually used GBP sub-command: > GBP_EXPORT_ORIG_EXTRA_OPTIONS. > > Jan Hello. I've just sent a patch that makes GBP_EXPORT_ORIG_OPTIONS variable used with newer Isar. If downstream wants to use newer Isar, it should consider this in the recipe. If not, it still can use old variable. To support both cases (e.g. same layer is used in different projects with different Isar versions), both variables should be used in the layer. -- Uladzimir Bely