d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make config(8) understand ORed dependecies in "files*" and

Browse Source 
improve tracking of known devices.  Bump config(8) version.
This commit is contained in:
Ruslan Ermilov 2005-11-27 21:41:58 +00:00
parent 554d7f674c
commit a8e06f2a52
18 changed files with 139 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/conf/Makefile.alpha
View File

@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
%VERSREQ= 600003
%VERSREQ= 700000
.if !defined(S)
.if exists(./@/.)

2
sys/conf/Makefile.amd64
View File

@ -18,7 +18,7 @@
#
# Which version of config(8) is required.
%VERSREQ= 600003
%VERSREQ= 700000
STD8X16FONT?= iso

2
sys/conf/Makefile.arm
View File

@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
%VERSREQ= 600003
%VERSREQ= 700000
# Temporary stuff while we're still embryonic
NO_MODULES=

2
sys/conf/Makefile.i386
View File

@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
%VERSREQ= 600003
%VERSREQ= 700000
STD8X16FONT?= iso

2
sys/conf/Makefile.ia64
View File

@ -19,7 +19,7 @@
GCC3= you bet
# Which version of config(8) is required.
%VERSREQ= 600003
%VERSREQ= 700000
STD8X16FONT?= iso

2
sys/conf/Makefile.pc98
View File

@ -19,7 +19,7 @@
#
# Which version of config(8) is required.
%VERSREQ= 600003
%VERSREQ= 700000
.if !defined(S)
.if exists(./@/.)

2
sys/conf/Makefile.powerpc
View File

@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
%VERSREQ= 600003
%VERSREQ= 700000
STD8X16FONT?= iso

2
sys/conf/Makefile.sparc64
View File

@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
%VERSREQ= 600003
%VERSREQ= 700000
STD8X16FONT?= iso

121
sys/conf/files
View File

@ -9,12 +9,7 @@ acpi_quirks.h optional acpi \
compile-with "${AWK} -f $S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \
no-obj no-implicit-rule before-depend \
clean "acpi_quirks.h"
aicasm optional ahc \
dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \
compile-with "CC=${CC} ${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \
no-obj no-implicit-rule \
clean "aicasm* y.tab.h"
aicasm optional ahd \
aicasm optional ahc | ahd \
dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \
compile-with "CC=${CC} ${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \
no-obj no-implicit-rule \
@ -89,14 +84,8 @@ cam/scsi/scsi_all.c optional scbus
cam/scsi/scsi_cd.c optional cd
cam/scsi/scsi_ch.c optional ch
cam/scsi/scsi_da.c optional da
cam/scsi/scsi_low.c optional ct
cam/scsi/scsi_low.c optional ncv
cam/scsi/scsi_low.c optional nsp
cam/scsi/scsi_low.c optional stg
cam/scsi/scsi_low_pisa.c optional ct
cam/scsi/scsi_low_pisa.c optional ncv
cam/scsi/scsi_low_pisa.c optional nsp
cam/scsi/scsi_low_pisa.c optional stg
cam/scsi/scsi_low.c optional ct | ncv | nsp | stg
cam/scsi/scsi_low_pisa.c optional ct | ncv | nsp | stg
cam/scsi/scsi_pass.c optional pass
cam/scsi/scsi_pt.c optional pt
cam/scsi/scsi_sa.c optional sa
@ -344,33 +333,17 @@ contrib/pf/net/pf_osfp.c optional pf \
compile-with "${NORMAL_C} -I$S/contrib/pf"
contrib/pf/netinet/in4_cksum.c optional pf inet
crypto/blowfish/bf_ecb.c optional ipsec ipsec_esp
crypto/blowfish/bf_skey.c optional crypto
crypto/blowfish/bf_skey.c optional ipsec ipsec_esp
crypto/des/des_ecb.c optional crypto
crypto/des/des_ecb.c optional ipsec ipsec_esp
crypto/des/des_ecb.c optional netsmbcrypto
crypto/des/des_setkey.c optional crypto
crypto/des/des_setkey.c optional ipsec ipsec_esp
crypto/des/des_setkey.c optional netsmbcrypto
crypto/blowfish/bf_skey.c optional crypto | ipsec ipsec_esp
crypto/des/des_ecb.c optional crypto | ipsec ipsec_esp | netsmbcrypto
crypto/des/des_setkey.c optional crypto | ipsec ipsec_esp | netsmbcrypto
crypto/rc4/rc4.c optional netgraph_mppc_encryption
crypto/rijndael/rijndael-alg-fst.c optional crypto
crypto/rijndael/rijndael-alg-fst.c optional geom_bde
crypto/rijndael/rijndael-alg-fst.c optional ipsec
crypto/rijndael/rijndael-alg-fst.c optional random
crypto/rijndael/rijndael-alg-fst.c optional wlan_ccmp
crypto/rijndael/rijndael-api-fst.c optional geom_bde
crypto/rijndael/rijndael-api-fst.c optional random
crypto/rijndael/rijndael-api.c optional crypto
crypto/rijndael/rijndael-api.c optional ipsec
crypto/rijndael/rijndael-api.c optional wlan_ccmp
crypto/sha1.c optional carp
crypto/sha1.c optional netgraph_mppc_encryption
crypto/sha1.c optional crypto
crypto/sha1.c optional ipsec
crypto/sha2/sha2.c optional crypto
crypto/sha2/sha2.c optional geom_bde
crypto/sha2/sha2.c optional ipsec
crypto/sha2/sha2.c optional random
crypto/rijndael/rijndael-alg-fst.c optional crypto | geom_bde | \
ipsec | random | wlan_ccmp
crypto/rijndael/rijndael-api-fst.c optional geom_bde | random
crypto/rijndael/rijndael-api.c optional crypto | ipsec | wlan_ccmp
crypto/sha1.c optional carp | crypto | ipsec | \
netgraph_mppc_encryption
crypto/sha2/sha2.c optional crypto | geom_bde | ipsec | random
ddb/db_access.c optional ddb
ddb/db_break.c optional ddb
ddb/db_command.c optional ddb
@ -661,12 +634,10 @@ dev/ida/ida_eisa.c optional ida eisa
dev/ida/ida_pci.c optional ida pci
dev/ie/if_ie.c optional ie isa nowerror
dev/ie/if_ie_isa.c optional ie isa
dev/ieee488/ibfoo.c optional pcii
dev/ieee488/ibfoo.c optional tnt4882
dev/ieee488/pcii.c optional pcii
dev/ieee488/ibfoo.c optional pcii | tnt4882
dev/ieee488/pcii.c optional pcii
dev/ieee488/tnt4882.c optional tnt4882
dev/ieee488/upd7210.c optional pcii
dev/ieee488/upd7210.c optional tnt4882
dev/ieee488/upd7210.c optional pcii | tnt4882
dev/iicbus/if_ic.c optional ic
dev/iicbus/iic.c optional iic
dev/iicbus/iicbb.c optional iicbb
@ -782,10 +753,8 @@ dev/pci/pci_user.c optional pci
dev/pci/pcib_if.m standard
dev/pdq/if_fea.c optional fea eisa
dev/pdq/if_fpa.c optional fpa pci
dev/pdq/pdq.c optional fea eisa nowerror
dev/pdq/pdq.c optional fpa pci nowerror
dev/pdq/pdq_ifsubr.c optional fea eisa nowerror
dev/pdq/pdq_ifsubr.c optional fpa pci nowerror
dev/pdq/pdq.c optional nowerror fea eisa | fpa pci
dev/pdq/pdq_ifsubr.c optional nowerror fea eisa | fpa pci
dev/ppbus/if_plip.c optional plip
dev/ppbus/immio.c optional vpo
dev/ppbus/lpbb.c optional lpbb
@ -807,8 +776,7 @@ dev/puc/puc.c optional puc
dev/puc/puc_ebus.c optional puc ebus
dev/puc/puc_pccard.c optional puc pccard
dev/puc/puc_pci.c optional puc pci
dev/puc/puc_sbus.c optional puc fhc
dev/puc/puc_sbus.c optional puc sbus
dev/puc/puc_sbus.c optional puc fhc | puc sbus
dev/puc/pucdata.c optional puc pci
dev/ral/if_ral.c optional ral
dev/ral/if_ralrate.c optional ral
@ -1113,8 +1081,7 @@ geom/geom_aes.c optional geom_aes
geom/geom_apple.c optional geom_apple
geom/geom_bsd.c optional geom_bsd
geom/geom_bsd_enc.c optional geom_bsd
geom/geom_ccd.c optional ccd
geom/geom_ccd.c optional geom_ccd
geom/geom_ccd.c optional ccd | geom_ccd
geom/geom_ctl.c standard
geom/geom_dev.c standard
geom/geom_disk.c standard
@ -1178,11 +1145,10 @@ i4b/driver/i4b_trace.c optional i4btrc
i4b/driver/i4b_rbch.c optional i4brbch
i4b/driver/i4b_tel.c optional i4btel
i4b/driver/i4b_ipr.c optional i4bipr
net/slcompress.c optional i4bipr
net/slcompress.c optional i4bipr | i4bisppp
i4b/driver/i4b_ctl.c optional i4bctl
i4b/driver/i4b_ing.c optional i4bing
i4b/driver/i4b_isppp.c optional i4bisppp
net/slcompress.c optional i4bisppp
#
# isdn4bsd CAPI driver
#
@ -1428,8 +1394,7 @@ libkern/strtoul.c standard
libkern/strtouq.c standard
libkern/strvalid.c standard
net/bpf.c standard
net/bpf_filter.c optional bpf
net/bpf_filter.c optional netgraph_bpf
net/bpf_filter.c optional bpf | netgraph_bpf
net/bridgestp.c optional if_bridge
net/bsd_comp.c optional ppp_bsdcomp
net/if.c standard
@ -1451,10 +1416,8 @@ net/if_media.c standard
net/if_mib.c standard
net/if_ppp.c optional ppp
net/if_sl.c optional sl
net/if_spppfr.c optional sppp
net/if_spppfr.c optional i4bisppp
net/if_spppsubr.c optional sppp
net/if_spppsubr.c optional i4bisppp
net/if_spppfr.c optional i4bisppp | sppp
net/if_spppsubr.c optional i4bisppp | sppp
net/if_stf.c optional stf
net/if_tun.c optional tun
net/if_tap.c optional tap
@ -1462,21 +1425,15 @@ net/if_vlan.c optional vlan
net/netisr.c standard
net/ppp_deflate.c optional ppp_deflate
net/ppp_tty.c optional ppp
net/pfil.c optional ether
net/pfil.c optional inet
net/pfil.c optional ether | inet
net/radix.c standard
net/raw_cb.c standard
net/raw_usrreq.c standard
net/route.c standard
net/rtsock.c standard
net/slcompress.c optional netgraph_vjc
net/slcompress.c optional ppp
net/slcompress.c optional sl
net/slcompress.c optional sppp
net/zlib.c optional ppp_deflate
net/zlib.c optional ipsec
net/zlib.c optional crypto
net/zlib.c optional geom_uzip
net/slcompress.c optional netgraph_vjc | ppp | sl | sppp
net/zlib.c optional crypto | geom_uzip | ipsec | \
ppp_deflate
net80211/ieee80211.c optional wlan
net80211/ieee80211_acl.c optional wlan_acl
net80211/ieee80211_crypto.c optional wlan
@ -1637,8 +1594,8 @@ netgraph/ng_ipfw.c optional netgraph_ipfw
netgraph/ng_ksocket.c optional netgraph_ksocket
netgraph/ng_l2tp.c optional netgraph_l2tp
netgraph/ng_lmi.c optional netgraph_lmi
netgraph/ng_mppc.c optional netgraph_mppc_compression
netgraph/ng_mppc.c optional netgraph_mppc_encryption
netgraph/ng_mppc.c optional netgraph_mppc_compression | \
netgraph_mppc_encryption
netgraph/ng_nat.c optional netgraph_nat
netgraph/ng_one2many.c optional netgraph_one2many
netgraph/ng_parse.c optional netgraph
@ -1669,10 +1626,8 @@ netinet/in_proto.c optional inet \
netinet/in_rmx.c optional inet
netinet/ip_divert.c optional ipdivert
netinet/ip_dummynet.c optional dummynet
netinet/ip_ecn.c optional inet
netinet/ip_ecn.c optional inet6
netinet/ip_encap.c optional inet
netinet/ip_encap.c optional inet6
netinet/ip_ecn.c optional inet | inet6
netinet/ip_encap.c optional inet | inet6
netinet/ip_fastfwd.c optional inet
netinet/ip_fw2.c optional ipfirewall
netinet/ip_fw_pfil.c optional ipfirewall
@ -1789,8 +1744,7 @@ netsmb/smb_smb.c optional netsmb
netsmb/smb_subr.c optional netsmb
netsmb/smb_trantcp.c optional netsmb
netsmb/smb_usr.c optional netsmb
nfs/nfs_common.c optional nfsclient
nfs/nfs_common.c optional nfsserver
nfs/nfs_common.c optional nfsclient | nfsserver
nfs4client/nfs4_dev.c optional nfsclient
nfs4client/nfs4_idmap.c optional nfsclient
nfs4client/nfs4_socket.c optional nfsclient
@ -1816,22 +1770,19 @@ nfsserver/nfs_srvcache.c optional nfsserver
nfsserver/nfs_srvsubs.c optional nfsserver
nfsserver/nfs_syscalls.c optional nfsserver
# crypto support
opencrypto/cast.c optional crypto
opencrypto/cast.c optional ipsec ipsec_esp
opencrypto/cast.c optional crypto | ipsec ipsec_esp
opencrypto/criov.c optional crypto
opencrypto/crypto.c optional crypto
opencrypto/cryptodev.c optional cryptodev
opencrypto/cryptosoft.c optional crypto
opencrypto/deflate.c optional crypto
opencrypto/rmd160.c optional crypto
opencrypto/rmd160.c optional ipsec
opencrypto/rmd160.c optional crypto | ipsec
opencrypto/skipjack.c optional crypto
opencrypto/xform.c optional crypto
pci/agp.c optional agp pci
pci/agp_if.m optional agp pci
pci/alpm.c optional alpm pci
pci/amdpm.c optional amdpm pci
pci/amdpm.c optional nfpm pci
pci/amdpm.c optional amdpm pci | nfpm pci
pci/if_de.c optional de pci
pci/if_mn.c optional mn pci
pci/if_pcn.c optional pcn pci

67
sys/conf/files.alpha
View File

@ -95,45 +95,30 @@ alpha/linux/linux_sysvec.c optional compat_linux
alpha/mcbus/mcbus.c optional dec_kn300
alpha/mcbus/mcmem.c optional dec_kn300
alpha/mcbus/mcpcia.c optional dec_kn300
alpha/osf1/imgact_osf1.c optional compat_linux
alpha/osf1/imgact_osf1.c optional compat_osf1
alpha/osf1/osf1_ioctl.c optional compat_linux
alpha/osf1/osf1_ioctl.c optional compat_osf1
alpha/osf1/osf1_misc.c optional compat_linux
alpha/osf1/osf1_misc.c optional compat_osf1
alpha/osf1/osf1_mount.c optional compat_linux
alpha/osf1/osf1_mount.c optional compat_osf1
alpha/osf1/osf1_signal.c optional compat_linux
alpha/osf1/osf1_signal.c optional compat_osf1
alpha/osf1/osf1_sysent.c optional compat_linux
alpha/osf1/osf1_sysent.c optional compat_osf1
alpha/osf1/osf1_sysvec.c optional compat_linux
alpha/osf1/osf1_sysvec.c optional compat_osf1
alpha/osf1/imgact_osf1.c optional compat_linux | compat_osf1
alpha/osf1/osf1_ioctl.c optional compat_linux | compat_osf1
alpha/osf1/osf1_misc.c optional compat_linux | compat_osf1
alpha/osf1/osf1_mount.c optional compat_linux | compat_osf1
alpha/osf1/osf1_signal.c optional compat_linux | compat_osf1
alpha/osf1/osf1_sysent.c optional compat_linux | compat_osf1
alpha/osf1/osf1_sysvec.c optional compat_linux | compat_osf1
alpha/pci/alphapci_if.m optional pci
alpha/pci/apecs.c optional dec_2100_a50
alpha/pci/apecs.c optional dec_eb64plus
alpha/pci/apecs.c optional dec_1000a
alpha/pci/apecs_pci.c optional dec_2100_a50
alpha/pci/apecs_pci.c optional dec_eb64plus
alpha/pci/apecs_pci.c optional dec_1000a
alpha/pci/apecs.c optional dec_1000a | dec_2100_a50 | \
dec_eb64plus
alpha/pci/apecs_pci.c optional dec_1000a | dec_2100_a50 | \
dec_eb64plus
alpha/pci/bwx.c optional pci
alpha/pci/cia.c optional dec_eb164
alpha/pci/cia.c optional dec_kn20aa
alpha/pci/cia.c optional dec_st550
alpha/pci/cia.c optional dec_1000a
alpha/pci/cia_pci.c optional dec_eb164
alpha/pci/cia_pci.c optional dec_kn20aa
alpha/pci/cia_pci.c optional dec_st550
alpha/pci/cia_pci.c optional dec_1000a
alpha/pci/cia.c optional dec_1000a | dec_eb164 | \
dec_kn20aa | dec_st550
alpha/pci/cia_pci.c optional dec_1000a | dec_eb164 | \
dec_kn20aa | dec_st550
alpha/pci/irongate.c optional api_up1000
alpha/pci/irongate_pci.c optional api_up1000
alpha/pci/lca.c optional dec_axppci_33
alpha/pci/lca_pci.c optional dec_axppci_33
alpha/pci/pci_eb164_intr.s optional dec_eb164
alpha/pci/pci_eb164_intr.s optional dec_kn20aa
alpha/pci/pci_eb164_intr.s optional dec_st550
alpha/pci/pci_eb64plus_intr.s optional dec_2100_a50
alpha/pci/pci_eb64plus_intr.s optional dec_eb64plus
alpha/pci/pci_eb164_intr.s optional dec_eb164 | dec_kn20aa | \
dec_st550
alpha/pci/pci_eb64plus_intr.s optional dec_2100_a50 | dec_eb64plus
alpha/pci/pcibus.c optional pci
alpha/pci/swiz.c optional pci
alpha/pci/t2.c optional dec_2100_a500
@ -159,11 +144,9 @@ compat/linux/linux_socket.c optional compat_linux
compat/linux/linux_sysctl.c optional compat_linux
compat/linux/linux_stats.c optional compat_linux
compat/linux/linux_util.c optional compat_linux
crypto/blowfish/bf_enc.c optional crypto
crypto/blowfish/bf_enc.c optional ipsec ipsec_esp
crypto/des/des_enc.c optional crypto
crypto/des/des_enc.c optional ipsec ipsec_esp
crypto/des/des_enc.c optional netsmbcrypto
crypto/blowfish/bf_enc.c optional crypto | ipsec ipsec_esp
crypto/des/des_enc.c optional crypto | ipsec ipsec_esp | \
netsmbcrypto
dev/advansys/adv_isa.c optional adv isa
dev/aic/aic_isa.c optional aic isa
dev/atkbdc/atkbd.c optional atkbd atkbdc
@ -179,16 +162,13 @@ dev/ed/if_ed_isa.c optional ed isa
dev/ed/if_ed_wd80x3.c optional ed isa
dev/ed/if_ed_hpp.c optional ed isa ed_hpp
dev/ed/if_ed_sic.c optional ed isa ed_sic
dev/fb/fb.c optional fb
dev/fb/fb.c optional vga
dev/fb/fb.c optional fb | tga | vga
dev/fb/splash.c optional splash
dev/fb/vga.c optional vga
dev/fdc/fdc.c optional fdc
dev/fdc/fdc_isa.c optional fdc isa
dev/hwpmc/hwpmc_alpha.c optional hwpmc
dev/kbd/kbd.c optional atkbd
dev/kbd/kbd.c optional sc
dev/kbd/kbd.c optional ukbd
dev/kbd/kbd.c optional atkbd | sc | ukbd
dev/ppc/ppc.c optional ppc
dev/ppc/ppc_puc.c optional ppc puc
dev/sio/sio.c optional sio
@ -219,7 +199,6 @@ libkern/flsl.c standard
dev/fb/tga.c optional tga
dev/fb/boot_font.c optional tga
dev/tga/tga_pci.c optional tga
dev/fb/fb.c optional tga
dev/fb/gfb.c optional tga
dev/gfb/gfb_pci.c optional tga
pci/agp_amd.c optional agp

18
sys/conf/files.amd64
View File

@ -128,11 +128,9 @@ amd64/isa/isa_dma.c standard
amd64/isa/nmi.c standard
amd64/pci/pci_bus.c optional pci
amd64/pci/pci_cfgreg.c optional pci
crypto/blowfish/bf_enc.c optional crypto
crypto/blowfish/bf_enc.c optional ipsec ipsec_esp
crypto/des/des_enc.c optional crypto
crypto/des/des_enc.c optional ipsec ipsec_esp
crypto/des/des_enc.c optional netsmbcrypto
crypto/blowfish/bf_enc.c optional crypto | ipsec ipsec_esp
crypto/des/des_enc.c optional crypto | ipsec ipsec_esp | \
netsmbcrypto
dev/acpica/acpi_if.m standard
dev/arcmsr/arcmsr.c optional arcmsr pci
dev/atkbdc/atkbd.c optional atkbd atkbdc
@ -147,15 +145,13 @@ dev/ed/if_ed_isa.c optional ed isa
dev/ed/if_ed_wd80x3.c optional ed isa
dev/ed/if_ed_hpp.c optional ed isa ed_hpp
dev/ed/if_ed_sic.c optional ed isa ed_sic
dev/fb/fb.c optional fb
dev/fb/fb.c optional vga
dev/fb/fb.c optional fb | vga
dev/fb/splash.c optional splash
dev/fb/vga.c optional vga
dev/ichwd/ichwd.c optional ichwd
dev/if_ndis/if_ndis.c optional ndis
dev/if_ndis/if_ndis_pccard.c optional ndis pccard
dev/if_ndis/if_ndis_pci.c optional ndis cardbus
dev/if_ndis/if_ndis_pci.c optional ndis pci
dev/if_ndis/if_ndis_pci.c optional ndis cardbus | ndis pci
dev/if_ndis/if_ndis_usb.c optional ndis usb
dev/io/iodev.c optional io
dev/fdc/fdc.c optional fdc
@ -170,9 +166,7 @@ dev/hptmv/ioctl.c optional hptmv
dev/hwpmc/hwpmc_amd.c optional hwpmc
dev/hwpmc/hwpmc_piv.c optional hwpmc
dev/hwpmc/hwpmc_x86.c optional hwpmc
dev/kbd/kbd.c optional atkbd
dev/kbd/kbd.c optional sc
dev/kbd/kbd.c optional ukbd
dev/kbd/kbd.c optional atkbd | sc | ukbd
dev/mem/memutil.c optional mem
dev/nve/if_nve.c optional nve pci
dev/ppc/ppc.c optional ppc

52
sys/conf/files.i386
View File

@ -122,17 +122,11 @@ contrib/dev/oltr/if_oltr_pci.c optional oltr pci
contrib/dev/oltr/trlldbm.c optional oltr
contrib/dev/oltr/trlldhm.c optional oltr
contrib/dev/oltr/trlldmac.c optional oltr
bf_enc.o optional ipsec ipsec_esp \
dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \
compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \
bf_enc.o optional crypto | ipsec ipsec_esp \
dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \
compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \
no-implicit-rule
crypto/des/arch/i386/des_enc.S optional ipsec ipsec_esp
crypto/des/arch/i386/des_enc.S optional netsmbcrypto
bf_enc.o optional crypto \
dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \
compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \
no-implicit-rule
crypto/des/arch/i386/des_enc.S optional crypto
crypto/des/arch/i386/des_enc.S optional crypto | ipsec ipsec_esp | netsmbcrypto
crypto/via/padlock.c optional padlock
dev/advansys/adv_isa.c optional adv isa
dev/aic/aic_isa.c optional aic isa
@ -162,8 +156,7 @@ dev/ed/if_ed_isa.c optional ed isa
dev/ed/if_ed_wd80x3.c optional ed isa
dev/ed/if_ed_hpp.c optional ed isa ed_hpp
dev/ed/if_ed_sic.c optional ed isa ed_sic
dev/fb/fb.c optional fb
dev/fb/fb.c optional vga
dev/fb/fb.c optional fb | vga
dev/fb/splash.c optional splash
dev/fb/vga.c optional vga
dev/fdc/fdc.c optional fdc
@ -184,14 +177,10 @@ dev/hwpmc/hwpmc_x86.c optional hwpmc
dev/ichwd/ichwd.c optional ichwd
dev/if_ndis/if_ndis.c optional ndis
dev/if_ndis/if_ndis_pccard.c optional ndis pccard
dev/if_ndis/if_ndis_pci.c optional ndis cardbus
dev/if_ndis/if_ndis_pci.c optional ndis pci
dev/if_ndis/if_ndis_pci.c optional ndis cardbus | ndis pci
dev/if_ndis/if_ndis_usb.c optional ndis usb
dev/io/iodev.c optional io
dev/kbd/kbd.c optional atkbd
dev/kbd/kbd.c optional sc
dev/kbd/kbd.c optional ukbd
dev/kbd/kbd.c optional vt
dev/kbd/kbd.c optional atkbd | sc | ukbd | vt
dev/lnc/if_lnc_isa.c optional lnc isa
dev/mem/memutil.c optional mem
dev/mse/mse.c optional mse
@ -257,8 +246,7 @@ i386/i386/db_disasm.c optional ddb
i386/i386/db_interface.c optional ddb
i386/i386/db_trace.c optional ddb
i386/i386/dump_machdep.c standard
i386/i386/elan-mmcr.c optional cpu_elan
i386/i386/elan-mmcr.c optional cpu_soekris
i386/i386/elan-mmcr.c optional cpu_elan | cpu_soekris
i386/i386/elf_machdep.c standard
i386/i386/exception.s standard
i386/i386/gdb_machdep.c optional gdb
@ -319,8 +307,7 @@ i386/isa/atpic.c standard
#i386/isa/atpic_vector.s standard
i386/isa/clock.c standard
i386/isa/elcr.c standard
i386/isa/elink.c optional ep
i386/isa/elink.c optional ie
i386/isa/elink.c optional ep | ie
i386/isa/isa.c optional isa
i386/isa/isa_dma.c optional isa
i386/isa/nmi.c standard
@ -353,22 +340,11 @@ i386/svr4/svr4_machdep.c optional compat_svr4
#
# isdn4bsd, needed for isic | iwic | ifpi | ifpi2 | ihfc | ifpnp | itjc
#
i4b/layer1/i4b_hdlc.c optional itjc
i4b/layer1/i4b_hdlc.c optional ihfc
i4b/layer1/i4b_l1dmux.c optional isic
i4b/layer1/i4b_l1lib.c optional isic
i4b/layer1/i4b_l1dmux.c optional iwic
i4b/layer1/i4b_l1lib.c optional iwic
i4b/layer1/i4b_l1dmux.c optional ifpi
i4b/layer1/i4b_l1lib.c optional ifpi
i4b/layer1/i4b_l1dmux.c optional ifpi2
i4b/layer1/i4b_l1lib.c optional ifpi2
i4b/layer1/i4b_l1dmux.c optional ihfc
i4b/layer1/i4b_l1lib.c optional ihfc
i4b/layer1/i4b_l1dmux.c optional ifpnp
i4b/layer1/i4b_l1lib.c optional ifpnp
i4b/layer1/i4b_l1dmux.c optional itjc
i4b/layer1/i4b_l1lib.c optional itjc
i4b/layer1/i4b_hdlc.c optional ihfc | itjc
i4b/layer1/i4b_l1dmux.c optional ifpi | ifpi2 | ifpnp | \
ihfc | isic | itjc | iwic
i4b/layer1/i4b_l1lib.c optional ifpi | ifpi2 | ifpnp | \
ihfc | isic | itjc | iwic
#
# isdn4bsd, isic
#

15
sys/conf/files.ia64
View File

@ -42,11 +42,9 @@ contrib/ia64/libuwx/src/uwx_swap.c standard
contrib/ia64/libuwx/src/uwx_trace.c standard
contrib/ia64/libuwx/src/uwx_uinfo.c standard
contrib/ia64/libuwx/src/uwx_utable.c standard
crypto/blowfish/bf_enc.c optional crypto
crypto/blowfish/bf_enc.c optional ipsec ipsec_esp
crypto/des/des_enc.c optional crypto
crypto/des/des_enc.c optional ipsec ipsec_esp
crypto/des/des_enc.c optional netsmbcrypto
crypto/blowfish/bf_enc.c optional crypto | ipsec ipsec_esp
crypto/des/des_enc.c optional crypto | ipsec ipsec_esp | \
netsmbcrypto
dev/advansys/adv_isa.c optional adv isa
dev/aic/aic_isa.c optional aic isa
dev/atkbdc/atkbd.c optional atkbd atkbdc
@ -55,14 +53,11 @@ dev/atkbdc/atkbdc.c optional atkbdc
dev/atkbdc/atkbdc_isa.c optional atkbdc isa
dev/atkbdc/atkbdc_subr.c optional atkbdc
dev/atkbdc/psm.c optional psm atkbdc
dev/fb/fb.c optional fb
dev/fb/fb.c optional vga
dev/fb/fb.c optional fb | vga
dev/fb/splash.c optional splash
dev/fb/vga.c optional vga
dev/hwpmc/hwpmc_ia64.c optional hwpmc
dev/kbd/kbd.c optional atkbd
dev/kbd/kbd.c optional sc
dev/kbd/kbd.c optional ukbd
dev/kbd/kbd.c optional atkbd | sc | ukbd
dev/ppc/ppc.c optional ppc isa
dev/ppc/ppc_puc.c optional ppc puc
dev/syscons/schistory.c optional sc

45
sys/conf/files.pc98
View File

@ -78,17 +78,11 @@ contrib/dev/oltr/if_oltr_pci.c optional oltr pci
contrib/dev/oltr/trlldbm.c optional oltr
contrib/dev/oltr/trlldhm.c optional oltr
contrib/dev/oltr/trlldmac.c optional oltr
bf_enc.o optional ipsec ipsec_esp \
dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \
compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \
bf_enc.o optional crypto | ipsec ipsec_esp \
dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \
compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \
no-implicit-rule
crypto/des/arch/i386/des_enc.S optional ipsec ipsec_esp
crypto/des/arch/i386/des_enc.S optional netsmbcrypto
bf_enc.o optional crypto \
dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \
compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \
no-implicit-rule
crypto/des/arch/i386/des_enc.S optional crypto
crypto/des/arch/i386/des_enc.S optional crypto | ipsec ipsec_esp | netsmbcrypto
dev/aic/aic_cbus.c optional aic isa
dev/ar/if_ar.c optional ar
dev/ar/if_ar_pci.c optional ar pci
@ -99,8 +93,7 @@ dev/ct/ct.c optional ct
dev/ct/ct_isa.c optional ct isa
dev/ed/if_ed_cbus.c optional ed isa
dev/ed/if_ed_wd80x3.c optional ed isa
dev/fb/fb.c optional fb
dev/fb/fb.c optional gdc
dev/fb/fb.c optional fb | gdc
dev/fb/splash.c optional splash
dev/fe/if_fe_cbus.c optional fe isa
dev/hwpmc/hwpmc_amd.c optional hwpmc
@ -109,9 +102,7 @@ dev/hwpmc/hwpmc_piv.c optional hwpmc
dev/hwpmc/hwpmc_ppro.c optional hwpmc
dev/hwpmc/hwpmc_x86.c optional hwpmc
dev/io/iodev.c optional io
dev/kbd/kbd.c optional pckbd
dev/kbd/kbd.c optional sc
dev/kbd/kbd.c optional ukbd
dev/kbd/kbd.c optional pckbd | sc | ukbd
dev/lnc/if_lnc_cbus.c optional lnc isa
dev/mem/memutil.c optional mem
dev/mse/mse.c optional mse
@ -205,8 +196,7 @@ i386/ibcs2/ibcs2_xenix_sysent.c optional ibcs2
i386/ibcs2/imgact_coff.c optional ibcs2
i386/isa/atpic.c standard
#i386/isa/atpic_vector.s standard
i386/isa/elink.c optional ep
i386/isa/elink.c optional ie
i386/isa/elink.c optional ep | ie
i386/isa/isa.c optional isa
i386/isa/npx.c optional npx
i386/isa/pmtimer.c optional pmtimer
@ -229,22 +219,11 @@ i386/svr4/svr4_machdep.c optional compat_svr4
#
# isdn4bsd, needed for isic | iwic | ifpi | ifpi2 | ihfc | ifpnp | itjc
#
i4b/layer1/i4b_hdlc.c optional itjc
i4b/layer1/i4b_hdlc.c optional ihfc
i4b/layer1/i4b_l1dmux.c optional isic
i4b/layer1/i4b_l1lib.c optional isic
i4b/layer1/i4b_l1dmux.c optional iwic
i4b/layer1/i4b_l1lib.c optional iwic
i4b/layer1/i4b_l1dmux.c optional ifpi
i4b/layer1/i4b_l1lib.c optional ifpi
i4b/layer1/i4b_l1dmux.c optional ifpi2
i4b/layer1/i4b_l1lib.c optional ifpi2
i4b/layer1/i4b_l1dmux.c optional ihfc
i4b/layer1/i4b_l1lib.c optional ihfc
i4b/layer1/i4b_l1dmux.c optional ifpnp
i4b/layer1/i4b_l1lib.c optional ifpnp
i4b/layer1/i4b_l1dmux.c optional itjc
i4b/layer1/i4b_l1lib.c optional itjc
i4b/layer1/i4b_hdlc.c optional ihfc | itjc
i4b/layer1/i4b_l1dmux.c optional ifpi | ifpi2 | ifpnp | \
ihfc | isic | itjc | iwic
i4b/layer1/i4b_l1lib.c optional ifpi | ifpi2 | ifpnp | \
ihfc | isic | itjc | iwic
#
# isdn4bsd, isic
#

3
sys/conf/files.powerpc
View File

@ -71,8 +71,7 @@ powerpc/powerpc/db_hwwatch.c optional ddb
powerpc/powerpc/db_trace.c optional ddb
crypto/blowfish/bf_enc.c optional ipsec ipsec_esp
crypto/des/des_enc.c optional ipsec ipsec_esp
crypto/des/des_enc.c optional netsmbcrypto
crypto/des/des_enc.c optional ipsec ipsec_esp | netsmbcrypto
dev/ofw/openfirm.c standard
dev/ofw/ofw_bus_if.m standard

30
sys/conf/files.sparc64
View File

@ -18,11 +18,9 @@ ukbdmap.h optional ukbd_dflt_keymap \
clean "ukbdmap.h"
#
#
crypto/blowfish/bf_enc.c optional crypto
crypto/blowfish/bf_enc.c optional ipsec ipsec_esp
crypto/des/des_enc.c optional crypto
crypto/des/des_enc.c optional ipsec ipsec_esp
crypto/des/des_enc.c optional netsmbcrypto
crypto/blowfish/bf_enc.c optional crypto | ipsec ipsec_esp
crypto/des/des_enc.c optional crypto | ipsec ipsec_esp | \
netsmbcrypto
dev/atkbdc/atkbd.c optional atkbd atkbdc
dev/atkbdc/atkbd_atkbdc.c optional atkbd atkbdc
dev/atkbdc/atkbdc.c optional atkbdc
@ -30,17 +28,14 @@ dev/atkbdc/atkbdc_ebus.c optional atkbdc ebus
dev/atkbdc/atkbdc_isa.c optional atkbdc isa
dev/atkbdc/atkbdc_subr.c optional atkbdc
dev/atkbdc/psm.c optional psm atkbdc
dev/auxio/auxio.c optional auxio sbus
dev/auxio/auxio.c optional auxio ebus
dev/auxio/auxio.c optional auxio sbus | auxio ebus
dev/esp/esp_sbus.c optional esp sbus
dev/fb/creator.c optional creator sc
dev/fb/fb.c optional sc
dev/fb/machfb.c optional machfb sc
dev/fb/splash.c optional splash
dev/hwpmc/hwpmc_sparc64.c optional hwpmc
dev/kbd/kbd.c optional atkbd
dev/kbd/kbd.c optional sc
dev/kbd/kbd.c optional ukbd
dev/kbd/kbd.c optional atkbd | sc | ukbd
dev/ofw/ofw_bus_if.m standard
dev/ofw/ofw_bus_subr.c standard
dev/ofw/ofw_console.c optional ofw_console
@ -49,8 +44,8 @@ dev/ofw/openfirmio.c standard
dev/ofw/openpromio.c standard
dev/pcf/envctrl.c optional pcf ebus
dev/pcf/pcf_ebus.c optional pcf ebus
dev/sound/sbus/cs4231.c optional snd_audiocs ebus
dev/sound/sbus/cs4231.c optional snd_audiocs sbus
dev/sound/sbus/cs4231.c optional snd_audiocs ebus | \
snd_audiocs sbus
dev/syscons/scgfbrndr.c optional sc
dev/syscons/schistory.c optional sc
dev/syscons/scmouse.c optional sc
@ -81,8 +76,7 @@ sparc64/fhc/fhc_central.c optional fhc central
sparc64/fhc/fhc_nexus.c optional fhc
sparc64/isa/isa.c optional isa
sparc64/isa/isa_dma.c optional isa
sparc64/isa/ofw_isa.c optional ebus
sparc64/isa/ofw_isa.c optional isa
sparc64/isa/ofw_isa.c optional ebus | isa
sparc64/pci/apb.c optional pci
sparc64/pci/ofw_pci.c optional pci
sparc64/pci/ofw_pcib.c optional pci
@ -106,9 +100,8 @@ sparc64/sparc64/db_hwwatch.c optional ddb
sparc64/sparc64/dump_machdep.c standard
sparc64/sparc64/elf_machdep.c standard
sparc64/sparc64/exception.S standard no-obj
sparc64/sparc64/eeprom.c optional eeprom ebus
sparc64/sparc64/eeprom.c optional eeprom fhc
sparc64/sparc64/eeprom.c optional eeprom sbus
sparc64/sparc64/eeprom.c optional eeprom ebus | eeprom fhc | \
eeprom sbus
sparc64/sparc64/gdb_machdep.c optional gdb
sparc64/sparc64/identcpu.c standard
sparc64/sparc64/in_cksum.c optional inet
@ -126,8 +119,7 @@ sparc64/sparc64/ofw_bus.c standard
sparc64/sparc64/ofw_machdep.c standard
sparc64/sparc64/pmap.c standard
sparc64/sparc64/prof_machdep.c optional profiling-routine
sparc64/sparc64/rtc.c optional rtc ebus
sparc64/sparc64/rtc.c optional rtc isa
sparc64/sparc64/rtc.c optional rtc ebus | rtc isa
sparc64/sparc64/rwindow.c standard
sparc64/sparc64/sc_machdep.c optional sc
sparc64/sparc64/spitfire.c standard

4
usr.sbin/config/configvers.h
View File

@ -1,6 +1,6 @@
/*
* 6 digits of version. The most significant are branch indicators
* (eg: RELENG_2_2 = 22, -current presently = 60 etc). The least
* (eg: RELENG_2_2 = 22, -current presently = 70 etc). The least
* significant digits are incremented as needed.
*
* DO NOT CASUALLY BUMP THIS NUMBER! The rules are not the same as shared
@ -27,7 +27,7 @@
*
* $FreeBSD$
*/
#define CONFIGVERS 600003
#define CONFIGVERS 700000
/*
* Examples of when there should NOT be a bump:

32
usr.sbin/config/mkmakefile.c
View File

@ -297,7 +297,7 @@ read_file(char *fname)
struct device *dp;
struct opt *op;
char *wd, *this, *compilewith, *depends, *clean, *warning;
int nreqs, devfound, std, filetype,
int compile, match, nreqs, devfound, std, filetype,
imp_rule, no_obj, before_depend, mandatory, nowerror;
fp = fopen(fname, "r");
@ -306,7 +306,7 @@ read_file(char *fname)
next:
/*
* filename [ standard | mandatory | optional ]
* [ dev* | profiling-routine ] [ no-obj ]
* [ dev* [ | dev* ... ] | profiling-routine ] [ no-obj ]
* [ compile-with "compile rule" [no-implicit-rule] ]
* [ dependency "dependency-list"] [ before-depend ]
* [ clean "file-list"] [ warning "text warning" ]
@ -332,6 +332,8 @@ next:
exit(1);
}
tp = fl_lookup(this);
compile = 0;
match = 1;
nreqs = 0;
compilewith = 0;
depends = 0;
@ -360,9 +362,21 @@ next:
nextparam:
next_word(fp, wd);
if (wd == 0) {
if (tp != NULL)
goto next;
goto doneparam;
compile += match;
if (compile && tp == NULL)
goto doneparam;
goto next;
}
if (eq(wd, "|")) {
if (nreqs == 0) {
printf("%s: syntax error describing %s\n",
fname, this);
exit(1);
}
compile += match;
match = 1;
nreqs = 0;
goto nextparam;
}
if (eq(wd, "no-obj")) {
no_obj++;
@ -446,8 +460,6 @@ nextparam:
}
if (devfound)
goto nextparam;
if (tp != NULL)
goto skip;
if (mandatory) {
printf("%s: mandatory device \"%s\" not found\n",
fname, wd);
@ -461,10 +473,8 @@ nextparam:
SLIST_FOREACH(op, &opt, op_next)
if (op->op_value == 0 && opteq(op->op_name, wd))
goto nextparam;
skip:
while ((wd = get_word(fp)) != 0)
;
goto next;
match = 0;
goto nextparam;
doneparam:
if (std == 0 && nreqs == 0) {