From owner-freebsd-current@freebsd.org Sun Sep 29 01:02:56 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 DF1701345ED for ; Sun, 29 Sep 2019 01:02:56 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: from mail-qt1-x829.google.com (mail-qt1-x829.google.com [IPv6:2607:f8b0:4864:20::829]) (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 46gnMM5f9mz3Khy for ; Sun, 29 Sep 2019 01:02:55 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: by mail-qt1-x829.google.com with SMTP id j31so12254335qta.5 for ; Sat, 28 Sep 2019 18:02:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=7OCpdC65TzSercse0+dlB4EE2GglRcNnkb9EsCS/1/c=; b=DIop2vmWj68/kDRXp74UwYzKjpWuXg6cGjppJCw10kT/lIX0DLTWkImvjU7fW4EpU/ VVhfCqwDMVQDyOBR1NOCjuSGyguj8JvZDnkxriV173BNlT4+wFb3rcSt/2Xj4lhe62Qk PjWb1f8C2g6sJshZGrcykhzpxezstVxnfMZ9JMAoQDVjHiFnxEB831bL59YG7TUi2irP V4AFBNTp2/+MNm18/k8UkffhJYvsPIL90LzW8uRiLR01cma7cfimTw+LOyp6CbtkhrQ6 oMh7yo7ghXsiRjHBzBXYLoR6JwIggYFe89jmcfL5mDXXy/Wqqex0dtFLsBDwOPUIbR8/ +EXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=7OCpdC65TzSercse0+dlB4EE2GglRcNnkb9EsCS/1/c=; b=hiMI/AcdpmcZz/cGZ7wnZokBYZAQUAud5mY6gbDhKHpdlgwRF96OpYIZk8fgojLEQf I7TwkNnxLfwfg5QiDQqYSxd7+A/2ADOAI0YZKXpSMvfVza2We4sxb/XeKWkvDVRc5EbH OtEW/LgtXkzn1uY8L7FTlWR88kBobFeZQzScSV5MwdsN0wDas0Hdbx175JuGvDuV1H9S AopBxcbZdUfsL0nSW+vKjo9gxBGW7zuaHVu+ooU81g1oUc3sY/QBqCmLEDAAy1prAILe yn0rXfUN2OwFZQQKF8yvzKwjBqBHeJ5I2bk2kZtgvoDuuz1Hj86CEki/kQa96yLiuQJC 4nhQ== X-Gm-Message-State: APjAAAVH1e1wmiX27PRWf/FCsho/x5Hnzf718BBauFLwNHVrmhcZ0hcz UxqcXlUWmnbI1QPznCXrCzbTh1wjoPAcFq4A5HavYfDI X-Google-Smtp-Source: APXvYqwAXoKARF2WWzawtoyGMRSndw0EjZBFprpPu49Hkad8khJkb19vwugC6H/HgtHsQ1KrLJJJUjcBb0RPDRgNXXs= X-Received: by 2002:ac8:34d8:: with SMTP id x24mr18499213qtb.353.1569718974288; Sat, 28 Sep 2019 18:02:54 -0700 (PDT) MIME-Version: 1.0 From: Ryan Stone Date: Sat, 28 Sep 2019 21:02:43 -0400 Message-ID: Subject: Files with multiple entries in sys/conf/files To: FreeBSD Current Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 46gnMM5f9mz3Khy X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=DIop2vmW; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of rysto32@gmail.com designates 2607:f8b0:4864:20::829 as permitted sender) smtp.mailfrom=rysto32@gmail.com X-Spamd-Result: default: False [-3.00 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; FREEMAIL_FROM(0.00)[gmail.com]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; IP_SCORE_FREEMAIL(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; IP_SCORE(0.00)[ip: (-9.36), ipnet: 2607:f8b0::/32(-2.59), asn: 15169(-2.17), country: US(-0.05)]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; RCVD_IN_DNSWL_NONE(0.00)[9.2.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]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com.dwl.dnswl.org : 127.0.5.0] 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 01:02:56 -0000 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 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 @@ -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 @@ -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