On Aug 5, 2014, at 4:52 AM, Bjoern A. Zeeb <b...@freebsd.org> wrote:
> > On 05 Aug 2014, at 10:31 , Bjoern A. Zeeb <b...@freebsd.org> wrote: > >> >> On 04 Aug 2014, at 22:37 , Warner Losh <i...@freebsd.org> wrote: >> >>> Author: imp >>> Date: Mon Aug 4 22:37:02 2014 >>> New Revision: 269540 >>> URL: http://svnweb.freebsd.org/changeset/base/269540 >>> >>> Log: >>> Move most of the 15 variations on generating opt_inet.h and >>> opt_inet6.h into kmod.mk by forcing almost everybody to eat the same >>> dogfood. While at it, consolidate the opt_bpf.h and opt_mroute.h >>> targets here too. >>> >>> Modified: >>> head/sys/conf/kern.opts.mk >>> head/sys/conf/kmod.mk >>> head/sys/modules/an/Makefile >>> head/sys/modules/arcnet/Makefile >>> head/sys/modules/cam/Makefile >>> head/sys/modules/carp/Makefile >>> head/sys/modules/cxgb/cxgb/Makefile >>> head/sys/modules/cxgb/iw_cxgb/Makefile >>> head/sys/modules/cxgb/tom/Makefile >>> head/sys/modules/cxgbe/if_cxgbe/Makefile >>> head/sys/modules/cxgbe/iw_cxgbe/Makefile >>> head/sys/modules/cxgbe/tom/Makefile >>> head/sys/modules/dummynet/Makefile >>> head/sys/modules/em/Makefile >>> head/sys/modules/en/Makefile >>> head/sys/modules/fatm/Makefile >>> head/sys/modules/firewire/fwip/Makefile >>> head/sys/modules/hatm/Makefile >>> head/sys/modules/i40e/Makefile (contents, props changed) >>> head/sys/modules/if_bridge/Makefile >>> head/sys/modules/if_disc/Makefile >>> head/sys/modules/if_faith/Makefile >>> head/sys/modules/if_gif/Makefile >>> head/sys/modules/if_gre/Makefile >>> head/sys/modules/if_lagg/Makefile >>> head/sys/modules/if_stf/Makefile >>> head/sys/modules/if_tap/Makefile >>> head/sys/modules/if_tun/Makefile >>> head/sys/modules/igb/Makefile >>> head/sys/modules/ip6_mroute_mod/Makefile >>> head/sys/modules/ip_mroute_mod/Makefile >>> head/sys/modules/ipdivert/Makefile >>> head/sys/modules/ipfilter/Makefile >>> head/sys/modules/ipfw/Makefile >>> head/sys/modules/ipoib/Makefile >>> head/sys/modules/ixgbe/Makefile >>> head/sys/modules/krpc/Makefile >>> head/sys/modules/linux/Makefile >>> head/sys/modules/lmc/Makefile >>> head/sys/modules/mlx4/Makefile >>> head/sys/modules/mlx4ib/Makefile >>> head/sys/modules/mlxen/Makefile >>> head/sys/modules/mthca/Makefile >>> head/sys/modules/netgraph/gif/Makefile >>> head/sys/modules/netgraph/iface/Makefile >>> head/sys/modules/netgraph/ipfw/Makefile >>> head/sys/modules/netgraph/netflow/Makefile >>> head/sys/modules/nfscl/Makefile >>> head/sys/modules/nfsclient/Makefile >>> head/sys/modules/nfslockd/Makefile >>> head/sys/modules/nfsserver/Makefile >>> head/sys/modules/patm/Makefile >>> head/sys/modules/pf/Makefile >>> head/sys/modules/pflog/Makefile >>> head/sys/modules/pfsync/Makefile >>> head/sys/modules/smbfs/Makefile >>> head/sys/modules/snc/Makefile >>> head/sys/modules/sppp/Makefile >>> head/sys/modules/trm/Makefile >>> head/sys/modules/virtio/network/Makefile >>> head/sys/modules/vmware/vmxnet3/Makefile >>> head/sys/modules/wlan/Makefile >>> head/sys/modules/wlan_acl/Makefile >>> head/sys/modules/wlan_amrr/Makefile >>> head/sys/modules/wlan_ccmp/Makefile >>> head/sys/modules/wlan_rssadapt/Makefile >>> head/sys/modules/wlan_tkip/Makefile >>> head/sys/modules/wlan_wep/Makefile >>> head/sys/modules/wlan_xauth/Makefile >> >> This broke a couple of kernel builds during universe: >> >> mips AP91 kernel failed, check _.mips.AP91 for details >> mips AP93 kernel failed, check _.mips.AP93 for details >> mips AR724X_BASE kernel failed, check _.mips.AR724X_BASE for details >> mips ENH200 kernel failed, check _.mips.ENH200 for details >> mips DIR-825B1 kernel failed, check _.mips.DIR-825B1 for details >> mips PB92 kernel failed, check _.mips.PB92 for details >> mips PICOSTATION_M2HP kernel failed, check _.mips.PICOSTATION_M2HP for >> details >> mips WZR-300HP kernel failed, check _.mips.WZR-300HP for details >> arm EFIKA_MX kernel failed, check _.arm.EFIKA_MX for details >> >> >> They all seem to not define INET6 and AP91 errors look like this; all seem >> to barf in the if_gif module built. Please investigate and unbreak. >> Would be really nice if these commits were tested to build and still give >> the same results upfront. I am mostly worried about the latter actually. > > I should have fixed the build in r269581. The other concern remains. Thanks Bjoern… I had a different, working change that I ran through Universe earlier in my development process. I reworked it though as part of teasing different changes apart of a larger change set, though, and the error crept in there. That’s my bad. Thanks for fixing it. Warner
signature.asc
Description: Message signed with OpenPGP using GPGMail
