From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7319406651323187200 X-Received: by 2002:a05:6512:2209:b0:50e:dfb7:607d with SMTP id h9-20020a056512220900b0050edfb7607dmr4013731lfu.55.1706525324044; Mon, 29 Jan 2024 02:48:44 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3253:b0:510:4ae:3b9e with SMTP id c19-20020a056512325300b0051004ae3b9els11779lfr.2.-pod-prod-05-eu; Mon, 29 Jan 2024 02:48:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IGqSdTlTjjHVO9FuZXWxrCMSyY4AsxqFSbRO/PCU8g9/KLCsTQkFtmXr0AxPXiVyyZg+GQR X-Received: by 2002:a05:651c:cb:b0:2cc:df53:530d with SMTP id 11-20020a05651c00cb00b002ccdf53530dmr3799905ljr.46.1706525321549; Mon, 29 Jan 2024 02:48:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706525321; cv=none; d=google.com; s=arc-20160816; b=AOi0zBAuI7gQLGQ7HHbX2yLEkWOXu1xJVlC7vkucUK0y+hUcGqu2kIr874NV5WAvU2 5KJ7sGVXAx/JOCvAOiiRgdYsAwTeKW45wOfubhN8ld9Qbe63bYNBinFU2Rg0DWoJzTvE kXBOLXxHNhNLa3Kz9A/Vzy2kZIDJCHWOQ5iPyN+JGzH4uHCs3x5zyai9cyE9uwWnkJTM l5n6jQdHO9ztIrJrBzxJyhkReD9oYw0z4IPg3bbjEEicXU7QycnFyxs960AI3AbZPrsG Ss6ulOtPTt9r3KJikyOH74a24G43iFfnuNQjCACudFinkaHMmj+ig1Eni5vWAe+WytwQ cIHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id; bh=wUBtWVQbW2xwsDPRKOvXgiIw5XbSXCbnlahB4OfwwX8=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=l/tfAAlmRzmO6xVxHtlxGqMTasbH5ndm0xmmomR0+LJIq68ST+gAoUcBVIpiqA4TqT FY8p0Beeh01+AD1wl8w+kFmtzR47WRRdvI7gB+khXWU37ah9QOqqYOoxQY1w7XSq8T7J 6dZSF4fqOyxb25ZPNhUhwRboxyozskco+7Ql0dZoIiWNQSKniG7x2R8WNWXniCxjnfte f8JFRACqVZOWbKS7506vy33/2/x7sixnaz2HaE7Mv/f6MWe8zIfw5DMqs48SF7XAsOju 3X8896eTmqjiQDOQ0UdFqLRNBxPYqV5biraTBc1P6CvgXSfSo1/XzUX2X14y7D4ocwKL HjTg== 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 w19-20020a05640234d300b0055c5a3c4040si150858edc.0.2024.01.29.02.48.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Jan 2024 02:48:41 -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 [127.0.0.1] (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+deb9u1) with ESMTPSA id 40TAmds2001053 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 29 Jan 2024 11:48:40 +0100 Message-ID: Subject: Re: [PATCH v7] dpkg: Restore support for replacing pre-installed packages in sbuild-chroot From: Uladzimir Bely To: isar-users@googlegroups.com Date: Mon, 29 Jan 2024 13:48:44 +0300 In-Reply-To: <20240127074253.24570-1-ubely@ilbers.de> References: <20240127074253.24570-1-ubely@ilbers.de> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.50.3 (by Flathub.org) MIME-Version: 1.0 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: jJ5ebLm490S4 On Sat, 2024-01-27 at 08:42 +0100, Uladzimir Bely wrote: > From: Jan Kiszka >=20 > During the migration to sbuild, support for using self-built packages > in > the build environment was lost if those were already part of the > sbuild-chroot. This restores it by adding --apt-distupgrade to the > sbuild call. But that is not enough because sbuild will only upgrade > packages from already configured sources, not those specified via > --extra-repository. We therefore have to switch back to configuring > isar-apt during sbuild-chroot creation. >=20 > As rootfs_configure_isar_apt configures the isar repo under > /isar-apt, we bind-mount the one in /home/builder/${PN} to that > folder. > Another difference is that we now need to run apt-get update > explicitly, > but only for isar-apt. >=20 > For apt fetching, we neither need nor want isar-apt to be available. > Rebuilding self-generated apt packages is generally pointless as the > needs are better addressed in the generating recipe itself. Exposing > isar-apt to the fetch may furthermore lead to fetching a previously > built source package of the same recipe, rather than pulling the > external version. >=20 > And because the sbuild-chroots are now left behind with isar-apt > configured, the configuration in imager_run can be removed (credits > to > Srinuvasan Arjunan). >=20 > Signed-off-by: Jan Kiszka > Reviewed-by: Uladzimir Bely > --- >=20 > Changes in v7: Merged v6 with fix disabling isar-apt for do_apt_fetch >=20 > =C2=A0meta/classes/dpkg-base.bbclass=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | 37 ++++++++++++---= -- > -- > =C2=A0meta/classes/dpkg.bbclass=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 |=C2=A0 5 ++- > =C2=A0meta/classes/image-tools-extension.bbclass=C2=A0=C2=A0=C2=A0 | 13 -= ------ > =C2=A0.../sbuild-chroot/sbuild-chroot.inc=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 2 - > =C2=A04 files changed, 27 insertions(+), 30 deletions(-) >=20 Applied to next, thanks.