--- src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk.orig 2020-07-10 02:57:01.000000000 +1000 +++ src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk 2020-08-22 01:47:37.465369000 +1000 @@ -27,7 +27,7 @@ SUB_DEPTH = ../../../.. include $(KBUILD_PATH)/subheader.kmk -if1of ($(KBUILD_TARGET), solaris darwin freebsd) +if1of ($(KBUILD_TARGET), solaris darwin bsdsunix freebsd) # # VBoxNetAdp - Virtual Network Adapter # Note! On Solaris the name has to be <= 8 chars long. @@ -38,6 +38,7 @@ VBoxNetAdp_INST = $(INST_VBOXNETADP)$(if $(eq $(KBUILD_TARGET),darwin),Contents/MacOS/) VBoxNetAdp_DEBUG_INST.darwin= $(patsubst %/,%,$(INST_VBOXNETADP)) VBoxNetAdp_NAME.solaris = vboxnet + VBoxNetAdp_NAME.bsdsunix = vboxnetadp VBoxNetAdp_NAME.freebsd = vboxnetadp VBoxNetAdp_DEPS.solaris += $(VBOX_SVN_REV_KMK) VBoxNetAdp_DEFS = IN_RT_R0 VBOX_SVN_REV=$(VBOX_SVN_REV) IN_SUP_STATIC @@ -50,6 +51,9 @@ VBoxNetAdp.c VBoxNetAdp_SOURCES.solaris = \ solaris/VBoxNetAdp-solaris.c + VBoxNetAdp_SOURCES.bsdsunix = \ + bsdsunix/VBoxNetAdp-bsdsunix.c \ + VBoxNetAdp.c VBoxNetAdp_SOURCES.freebsd = \ freebsd/VBoxNetAdp-freebsd.c \ VBoxNetAdp.c @@ -184,6 +188,36 @@ endif # linux +ifeq ($(KBUILD_TARGET),bsdsunix) + # + # Install source files for compilation on BSDSUniX. + # files_vboxnetadp defines VBOX_VBOXNETADP_SOURCES. + # + INSTALLS += VBoxNetAdp-src + include $(PATH_SUB_CURRENT)/bsdsunix/files_vboxnetadp + VBoxNetAdp-src_INST = bin/src/vboxnetadp/ + VBoxNetAdp-src_SOURCES = \ + $(subst $(DQUOTE),,$(VBOX_VBOXNETADP_SOURCES)) \ + $(VBoxNetAdp-src_0_OUTDIR)/Makefile + VBoxNetAdp-src_CLEAN = \ + $(VBoxNetAdp-src_0_OUTDIR)/Makefile \ + +$$(VBoxNetAdp-src_0_OUTDIR)/Makefile: \ + $(PATH_SUB_CURRENT)/bsdsunix/Makefile \ + $$(if $$(eq $$(VBoxNetAdp/bsdsunix/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \ + | $$(dir $$@) + $(QUIET)$(RM) -f -- $@ + $(QUIET)$(CP) -f $< $@ + ifndef VBOX_WITH_HARDENING + $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@.tmp $@ + ${QUIET}$(MV) -f $@.tmp $@ + endif + ifndef VBOX_WITH_NETFLT_VIMAGE + $(QUIET)$(SED) -e "s;-DVIMAGE;;g" --output $@.tmp $@ + ${QUIET}$(MV) -f $@.tmp $@ + endif +endif # bsdsunix + ifeq ($(KBUILD_TARGET),freebsd) # # Install source files for compilation on FreeBSD. @@ -203,12 +237,15 @@ $$(if $$(eq $$(VBoxNetAdp/freebsd/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \ | $$(dir $$@) $(QUIET)$(RM) -f -- $@ - ifndef VBOX_WITH_HARDENING - $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $< - else $(QUIET)$(CP) -f $< $@ + ifndef VBOX_WITH_HARDENING + $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@.tmp $@ + ${QUIET}$(MV) -f $@.tmp $@ + endif + ifndef VBOX_WITH_NETFLT_VIMAGE + $(QUIET)$(SED) -e "s;-DVIMAGE;;g" --output $@.tmp $@ + ${QUIET}$(MV) -f $@.tmp $@ endif - endif # freebsd include $(FILE_KBUILD_SUB_FOOTER)