diff options
| author | Guido Falsi <madpilot@FreeBSD.org> | 2021-03-09 18:27:36 +0000 |
|---|---|---|
| committer | Guido Falsi <madpilot@FreeBSD.org> | 2021-03-09 18:27:36 +0000 |
| commit | 42d8425b62bb66d04dd01c96d516c11451fd86dd (patch) | |
| tree | e2c43c73c1351cea5743d20d5dc2626d9bcb2c04 /emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-Makefile.kmk | |
| parent | shells/starship: Change FONTS option to OFF by default (diff) | |
- Update VirtualBox OSE to 6.1.18
- Old VirtualBox OSE 5.2.44 preserved as "-legacy" versions of the
ports (repocopied)
- Add back extra patch removed in r528258, actually required to
build DEBUG kmod
- Correctly define WITH_DEBUG when enabling the DEBUG option, so
binaries are not stripped
Please note that this new version supports only amd64 CPUs. If you need
to use older hardware please install the legacy ports.
Note that moving VM snapshots across major updates is unsupported, it's
strongly suggested to properly shutdown VMs before upgrading, please
check UPDATING for further details.
This update is the result of work from many people, and thanks to all
who gave feedback and tested things.
Patch based on work from: Mario Lobo <lobo@bsd.com.br> and jkim.
PR: 234878
Submitted by: kunda <chitty_cloud@me.com>
Approved by: vbox (implicit)
Reviewed by: decke
Tested by: jwb,
martin ilavsky <ilavsky.martin@gmail.com>,
Mario Lobo <lobo@bsd.com.br>
Relnotes: https://www.virtualbox.org/wiki/Changelog-6.1
Differential Revision: https://reviews.freebsd.org/D28871
Diffstat (limited to 'emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-Makefile.kmk')
| -rw-r--r-- | emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-Makefile.kmk | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-Makefile.kmk b/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-Makefile.kmk index c141ba29fb6c..5b96ab56a61b 100644 --- a/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-Makefile.kmk +++ b/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-Makefile.kmk @@ -1,25 +1,20 @@ -Fix kmod panic when VIMAGE is disabled in the kernel and port - -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.orig 2019-05-13 13:33:07 UTC +++ 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) \ | $$(dir $$@) $(QUIET)$(RM) -f -- $@ - ifndef VBOX_WITH_HARDENING -- $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $< +- $(QUIET)$(SED) -e "s;VBOX_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 -- ++ $(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 ++ $(QUIET)$(MV) -f $@.tmp $@ + endif - include $(FILE_KBUILD_SUB_FOOTER) + endif # freebsd |