Date: Sat, 28 Sep 2019 21:02:43 -0400 From: Ryan Stone <rysto32@gmail.com> To: FreeBSD Current <freebsd-current@freebsd.org> Subject: Files with multiple entries in sys/conf/files Message-ID: <CAFMmRNwPtwTB=GLefcj814cUeVwYm4pjjngWiiKPnjT2JoL2bg@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
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.<arch> from here. # libkern/arc4random.c standard -crypto/chacha20/chacha.c standard libkern/asprintf.c standard libkern/bcd.c standard libkern/bsearch.c standard
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFMmRNwPtwTB=GLefcj814cUeVwYm4pjjngWiiKPnjT2JoL2bg>