Page MenuHomeFreeBSD
Differential D28871 Diff 85283 emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-Makefile.kmk

Changeset View

Standalone View

View Options

emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-Makefile.kmk

Fix kmod panic when VIMAGE is disabled in the kernel and port --- src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk.orig 2019-05-13 13:33:07 UTC
Submitted by: Gleb Kurtsou <gleb@freebsd.org>
--- src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk.orig 2020-05-13 19:43:54 UTC
+++ src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk +++ src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk
@@ -203,12 +203,15 @@ $$(VBoxNetAdp-src_0_OUTDIR)/Makefile: \ @@ -206,10 +206,14 @@ $$(VBoxNetAdp-src_0_OUTDIR)/Makefile: \
$$(if $$(eq $$(VBoxNetAdp/freebsd/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \ $$(if $$(eq $$(VBoxNetAdp/freebsd/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
| $$(dir $$@) | $$(dir $$@)
$(QUIET)$(RM) -f -- $@ $(QUIET)$(RM) -f -- $@
- ifndef VBOX_WITH_HARDENING - ifndef VBOX_WITH_HARDENING
- $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $< - $(QUIET)$(SED) -e "s;VBOX_WITH_HARDENING;;g" --output $@ $<
- else - else
$(QUIET)$(CP) -f $< $@ $(QUIET)$(CP) -f $< $@
+ ifndef VBOX_WITH_HARDENING + ifndef VBOX_WITH_HARDENING
+ $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@.tmp $@ + $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@.tmp $@
+ ${QUIET}$(MV) -f $@.tmp $@ + $(QUIET)$(MV) -f $@.tmp $@
endif + endif
-
+ ifndef VBOX_WITH_NETFLT_VIMAGE + ifndef VBOX_WITH_NETFLT_VIMAGE
+ $(QUIET)$(SED) -e "s;-DVIMAGE;;g" --output $@.tmp $@ + $(QUIET)$(SED) -e "s;-DVIMAGE;;g" --output $@.tmp $@
+ ${QUIET}$(MV) -f $@.tmp $@ + $(QUIET)$(MV) -f $@.tmp $@
+ endif endif
endif # freebsd
include $(FILE_KBUILD_SUB_FOOTER) endif # freebsd