From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on sa.local.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, SPF_FAIL, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.1 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=altlinux.org; s=dkim; h=Subject:In-Reply-To:Content-Type:MIME-Version: References:Message-ID:To:From:Date:Sender:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=o+/yVz1f+dpE7QNBH/mGudQW/vcaTHVg8x0e5X1q9sQ=; b=Dwl58+nK+zy4PS5NwDbl3thnUh VfyMaW9arywSb3me7yLra0ifI1lnNIHIm2JcyrMi1NVy3JItTifLHSbaBMjeT0knr1gcQteUDeqb8 F+AymAhWIY78+37asXWahNlUtdpX3+Osxc1ks9yvJ2pbnLxk98FimhLxybLnmgZ/pzKu26SorwDiD iY7QUVr/H8VAzaiYOymnR63Q6+H15wr9YXsBbcn47BujMUYWcd29xU40Tpq2PyOyYkuhwc90czSAH DJBtA/LDqZSzUrxdKK7KPHddnh+eK83mNfOh/3NabRybZglbmAdeTzQjrtL0ud6TD9g70oGDE40VV UqK9QECQ==; Date: Tue, 14 May 2024 14:48:53 +0300 From: Arseny Maslennikov To: ALT Linux Team development discussions Message-ID: References: <202405141530.29200.asy@altlinux.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="A/5WikgveaImtEyA" Content-Disposition: inline In-Reply-To: OpenPGP: url=http://grep.cs.msu.ru/~ar/pgp-key.asc X-SA-Exim-Connect-IP: 37.110.126.107 X-SA-Exim-Mail-From: arseny@altlinux.org X-SA-Exim-Version: 4.2.1 X-SA-Exim-Scanned: No (on mail.cs.msu.ru); Unknown failure Subject: Re: [devel] =?utf-8?b?0JLQvdC10LfQsNC/0L3Ri9C1ICBwb3N0LWluc3RhbGwg?= =?utf-8?q?unowned_files?= X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 May 2024 11:48:58 -0000 Archived-At: List-Archive: List-Post: --A/5WikgveaImtEyA Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, May 14, 2024 at 02:45:14PM +0300, Arseny Maslennikov wrote: > On Tue, May 14, 2024 at 03:30:29PM +0400, Sergey Afonin wrote: > > =D0=9F=D1=80=D0=B8=D0=B2=D0=B5=D1=82=D1=81=D1=82=D0=B2=D1=83=D1=8E. > >=20 > > =D0=AD=D1=82=D0=BE =D0=BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4=D1=81=D1=82=D0= =B2=D0=B8=D1=8F usrmerge? > >=20 > > https://git.altlinux.org/tasks/archive/done/_339/347639/logs/events.1.2= =2Elog > >=20 > > x86_64: bird=3D2.15.1-alt1 post-install unowned files: > > /usr/lib/systemd/system/bird.service > > /usr/lib/tmpfiles.d/bird.conf > >=20 > > =D0=92 =D1=81=D0=BF=D0=B5=D0=BA=D0=B5 =D1=8D=D1=82=D0=B8 =D1=84=D0=B0= =D0=B9=D0=BB=D1=8B =D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D1=8B, =D0=B2=20 > > https://git.altlinux.org/tasks/archive/done/_316/324357/logs/events.3.1= =2Elog > > =D0=B2=D1=81=D1=91 =D1=85=D0=BE=D1=80=D0=BE=D1=88=D0=BE =D0=B1=D1=8B=D0= =BB=D0=BE. >=20 > =D0=AD=D1=82=D0=B8 =D1=84=D0=B0=D0=B9=D0=BB=D1=8B =D0=B2 post-install uno= wned files =D1=83=D0=BA=D0=B0=D0=B7=D0=B0=D0=BD=D1=8B =D0=BF=D0=BE =D0=BE= =D1=88=D0=B8=D0=B1=D0=BA=D0=B5, =D1=83 =D0=BC=D0=B5=D0=BD=D1=8F =D0=B4=D0= =B0=D0=B6=D0=B5 > =D0=B5=D1=81=D1=82=D1=8C =D0=B2=D0=B0=D1=80=D0=B8=D0=B0=D0=BD=D1=82 =D0= =BF=D0=B0=D1=82=D1=87=D0=B0 =D0=BD=D0=B0 gb-remote-install-check. =46rom: Arseny Maslennikov Date: Wed, 1 May 2024 23:45:47 +0300 Message-ID: <20240501204548.25091-1-arseny@altlinux.org> X-Mailer: git-send-email 2.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [RFC PATCH girar.git] remote-check-install: temporarily fix unowne= d files reports On merged-usr systems for each file path accessible under both /lib and /usr/lib, etc. `find /*` automatically optimizes away the /lib one. Many rpm packages contain files under /lib, though, and are reported by rpmquery as such, so the real file under /usr/lib is considered "unprovided". For each path in the output of `(rpmquery -al; rpmquery -a --provides)` under a legacy directory alias, add a matching path under the prefix. The transformation will look like this: % sed 's!^/\(bin\|lib\|lib32\|lib64\|libx32\|sbin\).\+!/usr&\n&!' <<____ /sbin/chroot /bin/bash ____ /usr/sbin/chroot /sbin/chroot /usr/bin/bash /bin/bash This way the new files under the prefix can never show up. --- gb/remote/gb-remote-check-install | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gb/remote/gb-remote-check-install b/gb/remote/gb-remote-check-= install index 5cac126..ac09c4f 100755 --- a/gb/remote/gb-remote-check-install +++ b/gb/remote/gb-remote-check-install @@ -189,6 +189,9 @@ sort -u -o instprov{,} hsh-run --rooter -- \ rpmquery -al >instfiles 2>>warnings sed '/^(contains no files)$/d' -i warnings +# Temporary hack: for each entry in legacy aliased dirs, +# add its real location. +sed -i 's!^/\(bin\|lib\|lib32\|lib64\|libx32\|sbin\).\+!/usr&\n&!' instfil= es sort -u -o instfiles{,} =20 sort -u instprov instfiles >instlist --=20 2.42.1 --A/5WikgveaImtEyA Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEE56JD3UKTLEu/ddrm9dQjyAYL01AFAmZDT6QACgkQ9dQjyAYL 01AZnxAAjBN/U8JgWIqHY5PD+Q7GzcbCtG8jtBe1QMV2SA0D2prR8vVCHe2XWPHt dV5wIkyNHxCYio5gNVgqocjO8eR30+yvEimnElvGAAFxFBqkH/Iv+3aI1+/Mn3MS 4sHfbljFG8fCciqPsb5VeIkCxNRyr89usMEpyKZ31GSA00T2zJgpLqxNznKkue1I QOFqNg5uMiFjWwFlFisyhZQdVV2BBj+0bpetpPngwOxth8jEIJEs1GqX7SoOmvbw iLI/1HarprBApPE2N5PKhRyYN0A3oGM1DnObCKgOA2SM8nq7akf1ksNJ7ts8Unwd vTyrZdwJZhUuEG4ytHlsQY4w5HjAVWOkx9eQj0qvgbw26xAqair2pMcXVn9tqZsR yV809ywSLJHGyEFnZhz7phz3lsccT1VeAFYbYejpO12RV0BwmPNbO2RSdLlle95y mQcry+g3UeyXNMx91Ao8u9nvu3tzuq5VDUigN68dcRb6CqZFBvV/TAlEvay98Qa/ 4k6IaqFCR2662q24vVPn1mllv/oCP9eNDbGLmHvLj7ToqqxIXM3qwnZR3kriv65F 5O9moJT01xGr/1WNTKDJduKvX/kGOOdQ1ShihNMnMsiHpG4jKFg+f3KgnlYy9fMG ioj2gWiuGpicDYMoyQdksRkmGs8q8+TuzdK7QIyFXi2D0iRsSfs= =Rbr3 -----END PGP SIGNATURE----- --A/5WikgveaImtEyA--