From owner-freebsd-current@freebsd.org Sun Sep 29 21:43:34 2019 Return-Path: Delivered-To: freebsd-current@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F3BE912BA96 for ; Sun, 29 Sep 2019 21:43:34 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x832.google.com (mail-qt1-x832.google.com [IPv6:2607:f8b0:4864:20::832]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46hJtt1LZ7z41p5 for ; Sun, 29 Sep 2019 21:43:33 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x832.google.com with SMTP id f7so14437168qtq.7 for ; Sun, 29 Sep 2019 14:43:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=busgE6MDfhBDZxGACeRCToQfMueAspMdrkaeNwVmLHk=; b=Xa2biH5TbyofWtas0kV0GRFt2ZsV1I58uwrF4PLhjYsi36npb7ndag4XIkbTmiHmT7 08Z5Q+CQ27ejp63w+SYCb1kdHap113r0JdztMylAn+piCLmdfOSdMPq/YFU0wQq710JL 4d6pPsN/fQUccoPFav+O+Uf+RgXSnm4H7CDdfbA4e7I/ZrOCv2LOLKB4bw7IaMZ78Dqh +MKpNuzmb7Ae1Y2BEV6/R9eicmZn2LFW8FLB3MGBmIOrVtox3Oj0IkDmTcU24eBnfftL jEEaRWO0id8QryRaEnnGhPchDtXHlwjxC3BReXNN8vxng/o96xF6hCzZwNEReYFohi7p W90Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=busgE6MDfhBDZxGACeRCToQfMueAspMdrkaeNwVmLHk=; b=icxZPU1pXgZwHBHOCE0jV5HLqMcbJG8N958M7SxE44tHR49xbsnHJRoBefS6DVvH21 r9X6mbDlWzjnOWKIFIooc6H4Y5SiORl9fOa8uCaFotyrA76VhXoFrZLVNfX6XlH5QKdN n1QNygcRvLPOuP9CPBS9iACqg2kwofsApQQCTT4TPAFsELenKEqySztXtjnOx40j2n/f deAS6cEBy61ggdQdej942ItQaw74Hts1WZhWRSKFm7eGZL23BbI7Ccx+NnKmAb1VDLO3 OZaY2jzJfjFC/AO1Kk/AvFz4fmJ4KeldmbHx6lUvvtcKgSaBSTD6wMNKfktYZii4xmUm 7F+A== X-Gm-Message-State: APjAAAXZPOA5CWfJpfPSLjXDUUQqStvTqtcFrdQnA09N0GP7vT8HXmZn kvSoZDGHjIQJe32AifNcEmPLp77tUso65aFuAEDCLg== X-Google-Smtp-Source: APXvYqxPZs2qeHKLy4zBy0iO4CUXAMCY/upCMwmMhamjwkIZG6Rk8LKpInUgjcCmOKiYJNQ85yf5TCDl7eZAwLS1GoU= X-Received: by 2002:ac8:2bca:: with SMTP id n10mr22169213qtn.242.1569793412601; Sun, 29 Sep 2019 14:43:32 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Sun, 29 Sep 2019 15:43:21 -0600 Message-ID: Subject: Re: Files with multiple entries in sys/conf/files To: Ryan Stone Cc: FreeBSD Current X-Rspamd-Queue-Id: 46hJtt1LZ7z41p5 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=Xa2biH5T; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::832) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-4.84 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2.3.8.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; FREEMAIL_TO(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; IP_SCORE(-2.84)[ip: (-9.39), ipnet: 2607:f8b0::/32(-2.58), asn: 15169(-2.17), country: US(-0.05)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Sep 2019 21:43:35 -0000 On Sat, Sep 28, 2019 at 7:03 PM Ryan Stone wrote: > I notice that the following files have multiple entries in sys/conf/files: > > $ cut -f 1 -w files | sort | uniq -c | egrep -v '^[[:space:]]+1[[:space:]]' > 1373 > 100 # > 2 crypto/chacha20/chacha.c > 2 dev/iicbus/rtc8583.c > 2 dev/uart/uart_dev_sab82532.c > 2 dev/uart/uart_dev_z8530.c > > The following patch should correct this. Should I just commit it? > > diff --git a/sys/conf/files b/sys/conf/files > index 44c23e8cc01d..39304264f606 100644 > --- a/sys/conf/files > +++ b/sys/conf/files > @@ -679,7 +679,8 @@ crypto/blowfish/bf_ecb.c optional ipsec | > ipsec_support > crypto/blowfish/bf_skey.c optional crypto | ipsec | ipsec_support > crypto/camellia/camellia.c optional crypto | ipsec | ipsec_support > crypto/camellia/camellia-api.c optional crypto | ipsec | ipsec_support > -crypto/chacha20/chacha.c optional crypto | ipsec | ipsec_support > +# Required by libkern > +crypto/chacha20/chacha.c standard > This is good, though we don't need the libkern comment... > crypto/chacha20/chacha-sw.c optional crypto | ipsec | ipsec_support > crypto/des/des_ecb.c optional crypto | ipsec | ipsec_support | > netsmb > crypto/des/des_setkey.c optional crypto | ipsec | > ipsec_support | netsmb > @@ -1777,7 +1778,6 @@ dev/iicbus/ds1307.c optional ds1307 > dev/iicbus/ds13rtc.c optional ds13rtc | ds133x | ds1374 > dev/iicbus/ds1672.c optional ds1672 > dev/iicbus/ds3231.c optional ds3231 > -dev/iicbus/rtc8583.c optional rtc8583 > dev/iicbus/syr827.c optional syr827 ext_resources fdt > dev/iicbus/icee.c optional icee > dev/iicbus/if_ic.c optional ic > This looks fine, though we have some disorder here. > @@ -3173,11 +3173,9 @@ dev/uart/uart_dev_mvebu.c optional uart > uart_mvebu > dev/uart/uart_dev_ns8250.c optional uart uart_ns8250 | uart uart_snps > dev/uart/uart_dev_pl011.c optional uart pl011 > dev/uart/uart_dev_quicc.c optional uart quicc > -dev/uart/uart_dev_sab82532.c optional uart uart_sab82532 > -dev/uart/uart_dev_sab82532.c optional uart scc > +dev/uart/uart_dev_sab82532.c optional uart uart_sab82532 | uart scc > dev/uart/uart_dev_snps.c optional uart uart_snps fdt > -dev/uart/uart_dev_z8530.c optional uart uart_z8530 > -dev/uart/uart_dev_z8530.c optional uart scc > +dev/uart/uart_dev_z8530.c optional uart uart_z8530 | uart scc > dev/uart/uart_if.m optional uart > dev/uart/uart_subr.c optional uart > dev/uart/uart_tty.c optional uart > These are both fine. > @@ -3950,7 +3948,6 @@ kgssapi/gsstest.c optional kgssapi_debug > # the file should be moved to conf/files. from here. > # > libkern/arc4random.c standard > -crypto/chacha20/chacha.c standard > libkern/asprintf.c standard > libkern/bcd.c standard > libkern/bsearch.c standard > this is also good. tl;dr: go for it. Warner