[PATCH 1/2] nss: Do not mention NSS test modules in <gnu/lib-names.h>

[Florian Weimer]

They are not actually installed.  Hard-code the current soname
for nss_files instead.
---
 nss/Makefile   | 17 +++++++----------
 shlib-versions |  5 -----
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/nss/Makefile b/nss/Makefile
index 552e5d03e1..4125d13f87 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -171,24 +171,21 @@ $(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
+# The .2 suffix comes from the nss_files version in shlib-versions.
+$(objpfx)/libnss_test1.so.2: $(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.2: $(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.2 \
+	$(objpfx)/libnss_test2.so.2
 
 ifeq (yes,$(have-thread-library))
 $(objpfx)tst-cancel-getpwuid_r: $(shared-thread-library)
 endif
 
-$(objpfx)tst-nss-files-alias-leak.out: $(objpfx)/libnss_files.so
-$(objpfx)tst-nss-files-alias-truncated.out: $(objpfx)/libnss_files.so
+$(objpfx)tst-nss-files-alias-leak.out: $(objpfx)/libnss_files.so.2
+$(objpfx)tst-nss-files-alias-truncated.out: $(objpfx)/libnss_files.so.2
 
 # Disable DT_RUNPATH on NSS tests so that the glibc internal NSS
 # functions can load testing NSS modules via DT_RPATH.
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