]>
Commit | Line | Data |
---|---|---|
c35d6ad1 AM |
1 | Index: Config.kmk |
2 | =================================================================== | |
3 | --- Config.kmk (wersja 33269) | |
4 | +++ Config.kmk (wersja 33316) | |
5 | @@ -567,6 +567,8 @@ | |
6 | ifdef VBOX_WITH_HARDENING | |
7 | if1of ($(KBUILD_TARGET), solaris) | |
8 | VBOX_PATH_APP_PRIVATE = /opt/VirtualBox/$(if-expr $(KBUILD_TARGET_ARCH) == "amd64",amd64,i386) | |
9 | + else ifeq ($(KBUILD_TARGET),linux) | |
10 | + VBOX_PATH_APP_PRIVATE = /opt/VirtualBox | |
11 | else ifeq ($(KBUILD_TARGET),darwin) | |
12 | VBOX_PATH_APP_PRIVATE = /Applications/VirtualBox.app/Contents/MacOS | |
13 | else ifeq ($(KBUILD_TARGET),freebsd) | |
14 | @@ -599,7 +601,7 @@ | |
15 | # depending on the location of the object.) | |
16 | #VBOX_WITH_RUNPATH = /usr/lib/virtualbox | |
17 | ifdef VBOX_WITH_HARDENING | |
18 | - if1of ($(KBUILD_TARGET), freebsd solaris) | |
19 | + if1of ($(KBUILD_TARGET), freebsd linux solaris) | |
20 | VBOX_WITH_RUNPATH = $(VBOX_PATH_APP_PRIVATE) | |
21 | endif | |
22 | endif | |
23 | @@ -607,12 +609,10 @@ | |
24 | # Because of the setuid usage on all ELF platforms when hardening the build | |
25 | # things gets a bit complicated since the $ORIGIN+setuid policy differs. | |
26 | #VBOX_WITH_ORIGIN=1 | |
27 | -ifdef VBOX_WITH_HARDENING | |
28 | - if1of ($(KBUILD_TARGET), linux) | |
29 | +ifndef VBOX_WITH_HARDENING | |
30 | + if1of ($(KBUILD_TARGET), linux solaris) | |
31 | VBOX_WITH_ORIGIN = 1 | |
32 | endif | |
33 | -else if1of ($(KBUILD_TARGET), linux solaris) | |
34 | - VBOX_WITH_ORIGIN = 1 | |
35 | endif | |
36 | # Enable the system wide support service/daemon. | |
37 | # Work in progress, but required for hardening on Windows. |