From: Siddhesh Poyarekar <siddhesh@gotplt.org>
To: Arjun Shankar <arjun@redhat.com>, libc-alpha@sourceware.org
Subject: Re: [PATCH 02/16] nss: Rearrange and sort Makefile variables
Date: Mon, 2 Oct 2023 10:12:58 -0400 [thread overview]
Message-ID: <762f5c08-b341-0c0e-148f-59106b201b3d@gotplt.org> (raw)
In-Reply-To: <20231002130150.1497733-3-arjun@redhat.com>
On 2023-10-02 08:55, Arjun Shankar wrote:
> Rearrange lists of routines, tests, etc. into one-per-line in
> nss/Makefile and sort them using scripts/sort-makefile-lines.py.
> ---
This is a trivial, independent cleanup, please push. Oh, and apologies
for putting the hv2-canonname test in the wrong place :)
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
> nss/Makefile | 55 +++++++++++++++++++++++++++++++++++++++-------------
> 1 file changed, 41 insertions(+), 14 deletions(-)
>
> diff --git a/nss/Makefile b/nss/Makefile
> index 668ba34b18..32764b74c0 100644
> --- a/nss/Makefile
> +++ b/nss/Makefile
> @@ -22,23 +22,50 @@ subdir := nss
>
> include ../Makeconfig
>
> -headers := nss.h
> +headers := \
> + nss.h \
> + # headers
>
> # This is the trivial part which goes into libc itself.
> -routines = nsswitch getnssent getnssent_r digits_dots \
> - valid_field valid_list_field rewrite_field \
> - $(addsuffix -lookup,$(databases)) \
> - compat-lookup nss_hash nss_files_fopen \
> - nss_readline nss_parse_line_result \
> - nss_fgetent_r nss_module nss_action \
> - nss_action_parse nss_database nss_files_data \
> - nss_files_functions
> +routines = \
> + $(addsuffix -lookup,$(databases)) \
> + compat-lookup \
> + digits_dots \
> + getnssent \
> + getnssent_r \
> + nss_action \
> + nss_action_parse \
> + nss_database \
> + nss_fgetent_r \
> + nss_files_data \
> + nss_files_fopen \
> + nss_files_functions \
> + nss_hash \
> + nss_module \
> + nss_parse_line_result \
> + nss_readline \
> + nsswitch \
> + rewrite_field \
> + valid_field \
> + valid_list_field \
> + # routines
>
> # These are the databases that go through nss dispatch.
> # Caution: if you add a database here, you must add its real name
> # in databases.def, too.
> -databases = proto service hosts network grp pwd ethers \
> - spwd netgrp alias sgrp
> +databases = \
> + alias \
> + ethers \
> + grp \
> + hosts \
> + netgrp \
> + network \
> + proto \
> + pwd \
> + service \
> + sgrp \
> + spwd \
> + # databases
>
> ifneq (,$(filter sunrpc,$(subdirs)))
> databases += key rpc
> @@ -68,7 +95,7 @@ tests := \
> tst-nss-test4 \
> tst-nss-test5 \
> tst-nss-test_errno \
> -# tests
> + # tests
>
> xtests = bug-erange
>
> @@ -79,11 +106,11 @@ tests-container := \
> tst-nss-files-hosts-long \
> tst-nss-files-hosts-v4mapped \
> tst-nss-gai-actions \
> + tst-nss-gai-hv2-canonname \
> tst-nss-test3 \
> tst-reload1 \
> tst-reload2 \
> - tst-nss-gai-hv2-canonname \
> -# tests-container
> + # tests-container
>
> # Tests which need libdl
> ifeq (yes,$(build-shared))
next prev parent reply other threads:[~2023-10-02 14:13 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-02 12:55 [PATCH 00/16] Consolidate NSS functionality into nss subdir Arjun Shankar
2023-10-02 12:55 ` [PATCH 01/16] inet: Rearrange and sort Makefile variables Arjun Shankar
2023-10-02 14:11 ` Siddhesh Poyarekar
2023-10-02 12:55 ` [PATCH 02/16] nss: " Arjun Shankar
2023-10-02 14:12 ` Siddhesh Poyarekar [this message]
2023-10-02 12:55 ` [PATCH 03/16] Remove 'grp' and merge into 'nss' and 'posix' Arjun Shankar
2023-10-19 17:55 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 04/16] Remove 'gshadow' and merge into 'nss' Arjun Shankar
2023-10-19 18:15 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 05/16] Remove 'pwd' " Arjun Shankar
2023-10-19 18:29 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 06/16] Remove 'shadow' " Arjun Shankar
2023-10-19 18:44 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 07/16] Move 'aliases' routines from 'inet' " Arjun Shankar
2023-10-19 19:23 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 08/16] Move 'ethers' " Arjun Shankar
2023-10-19 19:39 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 09/16] Move 'hosts' " Arjun Shankar
2023-10-19 19:53 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 10/16] Move 'netgroup' " Arjun Shankar
2023-10-20 12:00 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 11/16] Move 'networks' " Arjun Shankar
2023-10-20 12:17 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 12/16] Move 'protocols' " Arjun Shankar
2023-10-20 12:32 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 13/16] Move 'rpc' " Arjun Shankar
2023-10-20 12:49 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 14/16] Move 'services' " Arjun Shankar
2023-10-20 13:19 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 15/16] Move getaddrinfo from 'posix' " Arjun Shankar
2023-10-20 13:51 ` Adhemerval Zanella Netto
2023-10-24 21:32 ` Joseph Myers
2023-10-26 10:58 ` Arjun Shankar
2023-10-02 12:55 ` [PATCH 16/16] Move getnameinfo from 'inet' to 'nss' Arjun Shankar
2023-10-20 15:08 ` Adhemerval Zanella Netto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=762f5c08-b341-0c0e-148f-59106b201b3d@gotplt.org \
--to=siddhesh@gotplt.org \
--cc=arjun@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).