diff options
| author | lilac | 2021-11-15 22:28:43 +0800 |
|---|---|---|
| committer | lilac | 2021-11-15 22:28:43 +0800 |
| commit | 343e1af4d606933369c91189bf83f34495747eae (patch) | |
| tree | dea015bcfd41392c7c3212b39b6beb268f9e3d04 /013-Makefile.patch | |
| parent | c434967956a0e7e6157e2a36bc8655040158f911 (diff) | |
| download | aur-343e1af4d606933369c91189bf83f34495747eae.tar.gz | |
update to version 92314
Diffstat (limited to '013-Makefile.patch')
| -rw-r--r-- | 013-Makefile.patch | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/013-Makefile.patch b/013-Makefile.patch index 95e247fd9ca8..02ae6715d7cd 100644 --- a/013-Makefile.patch +++ b/013-Makefile.patch @@ -9,8 +9,10 @@ index 18466b48..7c7de4e5 100644 -ifneq ($(KERNELRELEASE),) +ifneq ($(KBUILD_EXTMOD),) - # Building from kBuild (make -C <kernel_directory> M=`pwd`), - # or inside a kernel source tree. +-# Building from kBuild (make -C <kernel_directory> M=`pwd`), +-# or inside a kernel source tree. ++# Building from kBuild (make -C <kernel_directory> M=`pwd`). ++# KBUILD_EXTMOD is set to $(M) in this case. obj-m = vboxdrv/ - ifneq ($(wildcard $(CURDIR)/vboxnetflt/Makefile),) @@ -34,27 +36,9 @@ index 18466b48..7c7de4e5 100644 ifndef SUDO ifneq ($(shell id -u),0) -@@ -123,7 +123,7 @@ install-vboxpci: - install: install-vboxdrv install-vboxnetflt install-vboxnetadp install-vboxpci - - # Look for wrapper modules, sorting them so vmmr0 is first. --VBOX_WRAPPER_DIRS := $(notdir $(wildcard $(CURDIR)/vbox_*)) -+VBOX_WRAPPER_DIRS := $(notdir $(wildcard $(KBUILD_EXTMOD)/vbox_*)) - ifneq ($(VBOX_WRAPPER_DIRS),) - VBOX_WRAPPER_DIRS := $(filter vbox_vmmr0,$(VBOX_WRAPPER_DIRS)) $(sort $(filter-out vbox_vmmr0,$(VBOX_WRAPPER_DIRS))) - endif -@@ -166,7 +166,7 @@ buildid: - buildid=`readelf -n $${module} | sed -ne 's/^.*Build ID: *\([[:xdigit:]][[:xdigit:]]\)\(.*\)$$/\1\/\2/p' `; \ - if [ -n "$${buildid}" ]; then \ - mkdir -p ~/.debug/.build-id/`dirname $${buildid}`; \ -- ln -sfn -- "$(CURDIR)/$${module}" ~/.debug/.build-id/$${buildid}; \ -+ ln -sfn -- "$(KERNEL_EXTMOD)/$${module}" ~/.debug/.build-id/$${buildid}; \ - else \ - echo "warning: No build ID for $${module}"; \ - fi \ -@@ -234,5 +234,5 @@ load: unload +@@ -234,5 +234,5 @@ fi; \ done -endif # ! KERNELRELEASE -+endif # ! KERNEL_EXTMOD ++endif # ! KBUILD_EXTMOD |