From patchwork Thu Mar 10 16:17:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 51861 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E0F7C3858429 for ; Thu, 10 Mar 2022 16:18:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E0F7C3858429 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1646929103; bh=Fbt57Jg+Rht7QL3xpmQp2LEF0kkzIkKaf83nvmAQ1ZY=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=OUC+huNFbSHy/GAROe2wFggK/RcxUpElgQTL/W2Zxn+S+3WFWvYV3jC+ZMeqhHCvN qeinLqETwTBrax8Pk7VoLQqA6+9D0VVhsToHRlsAfCPvgWf5dpSxg8Muhcu8xey0UA K1JmL+RqIRRZCx504XnrfRZjkAfrhzgUww52R/6A= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org 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 B25BB3858C20 for ; Thu, 10 Mar 2022 16:18:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B25BB3858C20 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-184-uc7eKRkjMUyI0tuM129TNQ-1; Thu, 10 Mar 2022 11:18:00 -0500 X-MC-Unique: uc7eKRkjMUyI0tuM129TNQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 080C451DC for ; Thu, 10 Mar 2022 16:17:59 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.192.88]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7E371106F975 for ; Thu, 10 Mar 2022 16:17:58 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH v3 1/2] nss: Do not mention NSS test modules in X-From-Line: 7ce5ab8833fc46897b05be07f243e10893571c2d Mon Sep 17 00:00:00 2001 Message-Id: <7ce5ab8833fc46897b05be07f243e10893571c2d.1646928950.git.fweimer@redhat.com> Date: Thu, 10 Mar 2022 17:17:56 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" 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. Reviewed-by: Carlos O'Donell --- v3: Unchanged from v2. nss/Makefile | 13 +++++-------- shlib-versions | 5 ----- 2 files changed, 5 insertions(+), 13 deletions(-) base-commit: d653fd2d9ebe23c2b16b76edf717c5dbd5ce9b77 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