From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 1CCF23858C20 for ; Thu, 10 Mar 2022 14:34:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1CCF23858C20 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-264-ZTO9UqdCPOWzHWU4EzntYw-1; Thu, 10 Mar 2022 09:34:54 -0500 X-MC-Unique: ZTO9UqdCPOWzHWU4EzntYw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A79F08066F3 for ; Thu, 10 Mar 2022 14:34:53 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.192.88]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 262D07DE31 for ; Thu, 10 Mar 2022 14:34:52 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH 1/2] nss: Do not mention NSS test modules in X-From-Line: 7ce5ab8833fc46897b05be07f243e10893571c2d Mon Sep 17 00:00:00 2001 Message-Id: <7ce5ab8833fc46897b05be07f243e10893571c2d.1646922805.git.fweimer@redhat.com> Date: Thu, 10 Mar 2022 15:34:51 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Mar 2022 14:34:57 -0000 They are not actually installed. Use the nss_files version instead in nss/Makefile, similar to how __nss_shlib_revision is derived from LIBNSS_FILES_SO. --- v2: Use $(libnss_files.so-version). nss/Makefile | 13 +++++-------- shlib-versions | 5 ----- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/nss/Makefile b/nss/Makefile index 552e5d03e1..74e2c2426c 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -171,17 +171,14 @@ $(objpfx)/libnss_test1.so: $(objpfx)nss_test1.os $(link-libc-deps) $(objpfx)/libnss_test2.so: $(objpfx)nss_test2.os $(link-libc-deps) $(build-module) $(objpfx)nss_test2.os : nss_test1.c -ifdef libnss_test1.so-version -$(objpfx)/libnss_test1.so$(libnss_test1.so-version): $(objpfx)/libnss_test1.so +# Use the nss_files suffix for these objects as well. +$(objpfx)/libnss_test1.so$(libnss_files.so-version): $(objpfx)/libnss_test1.so $(make-link) -endif -ifdef libnss_test2.so-version -$(objpfx)/libnss_test2.so$(libnss_test2.so-version): $(objpfx)/libnss_test2.so +$(objpfx)/libnss_test2.so$(libnss_files.so-version): $(objpfx)/libnss_test2.so $(make-link) -endif $(patsubst %,$(objpfx)%.out,$(tests) $(tests-container)) : \ - $(objpfx)/libnss_test1.so$(libnss_test1.so-version) \ - $(objpfx)/libnss_test2.so$(libnss_test2.so-version) + $(objpfx)/libnss_test1.so$(libnss_files.so-version) \ + $(objpfx)/libnss_test2.so$(libnss_files.so-version) ifeq (yes,$(have-thread-library)) $(objpfx)tst-cancel-getpwuid_r: $(shared-thread-library) diff --git a/shlib-versions b/shlib-versions index df6603e699..b87ab50c59 100644 --- a/shlib-versions +++ b/shlib-versions @@ -47,11 +47,6 @@ libnss_ldap=2 libnss_hesiod=2 libnss_db=2 -# Tests for NSS. They must have the same NSS_SHLIB_REVISION number as -# the rest. -libnss_test1=2 -libnss_test2=2 - # Version for libnsl with YP and NIS+ functions. libnsl=1 base-commit: d653fd2d9ebe23c2b16b76edf717c5dbd5ce9b77 -- 2.35.1