From nobody Wed Oct 13 16:22:29 2021 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B033E1806452; Wed, 13 Oct 2021 16:22:38 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4HTyVk34vBz4tsm; Wed, 13 Oct 2021 16:22:38 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.16.1/8.16.1) with ESMTPS id 19DGMTeb016549 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 13 Oct 2021 19:22:32 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 19DGMTeb016549 Received: (from kostik@localhost) by tom.home (8.16.1/8.16.1/Submit) id 19DGMTR3016548; Wed, 13 Oct 2021 19:22:29 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 13 Oct 2021 19:22:29 +0300 From: Konstantin Belousov To: Emmanuel Vadot Cc: Emmanuel Vadot , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: d0f0e0bd741a - main - rtld: Do not install libmap.conf when installing the COMPAT32 version Message-ID: References: <202110131242.19DCghdV036911@gitrepo.freebsd.org> <20211013181828.36426fe37f41cebbd3a381d5@bidouilliste.com> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211013181828.36426fe37f41cebbd3a381d5@bidouilliste.com> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.5 X-Spam-Checker-Version: SpamAssassin 3.4.5 (2021-03-20) on tom.home X-Rspamd-Queue-Id: 4HTyVk34vBz4tsm X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N On Wed, Oct 13, 2021 at 06:18:28PM +0200, Emmanuel Vadot wrote: > On Wed, 13 Oct 2021 19:07:00 +0300 > Konstantin Belousov wrote: > > > On Wed, Oct 13, 2021 at 12:42:43PM +0000, Emmanuel Vadot wrote: > > > The branch main has been updated by manu: > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=d0f0e0bd741af867582ceede8ac1b0aec90eae2d > > > > > > commit d0f0e0bd741af867582ceede8ac1b0aec90eae2d > > > Author: Emmanuel Vadot > > > AuthorDate: 2021-10-13 12:40:26 +0000 > > > Commit: Emmanuel Vadot > > > CommitDate: 2021-10-13 12:42:08 +0000 > > > > > > rtld: Do not install libmap.conf when installing the COMPAT32 version > > > > > > This has the effect of installing the same file twice at the same location > > > and confuse pkgbase as we add this file twice in the package config part. > > > > > > MFC after: 1 week > > > Sponsored by: Beckhoff Automation GmbH & Co. KG > > > --- > > > libexec/rtld-elf/Makefile | 2 ++ > > > 1 file changed, 2 insertions(+) > > > > > > diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile > > > index db1bf70ca59e..1f3df176992a 100644 > > > --- a/libexec/rtld-elf/Makefile > > > +++ b/libexec/rtld-elf/Makefile > > > @@ -14,7 +14,9 @@ MK_ASAN= no > > > MK_SSP= no > > > MK_UBSAN= no > > > > > > +.if !defined(NEED_COMPAT) > > > CONFS= libmap.conf > > > +.endif > > > PROG?= ld-elf.so.1 > > > .if (${PROG:M*ld-elf32*} != "") > > > TAGS+= lib32 > > > > ld-elf32.so.1 tries to read /etc/libmap32.conf AFAIR. > > I think the Makefile should install the file under that name, for compat. > > Indeed it does, but since this file just include the ones > in /usr/local/etc/libmap.d regardless of the arch that could cause > problems to have the same content no ? Perhaps arrange libmap32.conf to include libmap32.d? It is fine to have libmap32.conf in rtld-elf if needed.