tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

Merge pull request #31037 from NeQuissimus/virtualbox_5_2_0

virtualbox: 5.1.26 -> 5.2.0

authored by Orivej Desh and committed by GitHub b8f70273 9be7a886

+246 -56
unified split
+4 -12
pkgs/applications/virtualization/virtualbox/default.nix
··· 19 19 python = python2; 20 20 buildType = "release"; 21 21 # Manually sha256sum the extensionPack file, must be hex! 22 - extpack = "14f152228495a715f526eb74134d43c960919cc534d2bc67cfe34a63e6cf7721"; 23 - extpackRev = "117224"; 24 - main = "1af8h3d3sdpcxcp5g75qfq10z81l7m8gk0sz8zqix8c1wqsm0wdm"; 25 - version = "5.1.26"; 22 + extpack = "005ba9211862643e2516d549e98b80942918047f1f6c55fcfe08c490dd1947bc"; 23 + extpackRev = "118431"; 24 + main = "0m6y98pvkngprw5iaswvkbbfxmzvfl8yvgi984p1866zwap77z16"; 25 + version = "5.2.0"; 26 26 27 27 # See https://github.com/NixOS/nixpkgs/issues/672 for details 28 28 extensionPack = requireFile rec { ··· 94 94 postPatch = '' 95 95 sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ 96 96 src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp 97 - patch -p0 < ${ 98 - fetchurl { # for glibc-2.26 99 - name = "conflicting-types-for-greg_t.patch"; 100 - url = "http://www.linuxquestions.org/questions/" 101 - + "attachment.php?attachmentid=25801&d=1504099531"; 102 - sha256 = "1bcyf9qrqxizyjp1s662k6n1cfyfjbl7256r4n20kbr65yxcydps"; 103 - } 104 - } 105 97 ''; 106 98 107 99 # first line: ugly hack, and it isn't yet clear why it's a problem
+25 -18
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
··· 19 19 20 20 src = fetchurl { 21 21 url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; 22 - sha256 = "0vxhavlh55fdlm4zhvi21fyxzdydbn56y499bq5aghvsdsmwiy3d"; 22 + sha256 = "1r6dybr3pfclffk7gppf7n8gwj3ziw7pmfvbwwkdw00q9ah7h5l4"; 23 23 }; 24 24 25 - KERN_DIR = "${kernel.dev}/lib/modules/*/build"; 25 + KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; 26 + KERN_INCL = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/source/include"; 27 + 28 + patches = [ 29 + ./fix_kerndir.patch 30 + ./fix_kernincl.patch 31 + ]; 26 32 27 33 hardeningDisable = [ "pic" ]; 28 34 29 - NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; 35 + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; 30 36 31 37 buildInputs = [ patchelf cdrkit makeWrapper dbus ]; 32 38 ··· 55 61 else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions") 56 62 } 57 63 64 + cd ../ 65 + patchPhase 66 + cd install/src 58 67 59 68 # Build kernel modules 60 - cd src 69 + export INSTALL_MOD_PATH=$out 61 70 62 - for i in * 63 - do 64 - cd $i 65 - find . -type f | xargs sed 's/depmod -a/true/' -i 66 - make 67 - cd .. 68 - done 71 + find . -type f | xargs sed 's/depmod -a/true/' -i 72 + 73 + cd vboxguest-${version} 74 + 75 + make 69 76 70 - cd .. 77 + cd ../.. 71 78 72 79 # Change the interpreter for various binaries 73 - for i in sbin/VBoxService bin/{VBoxClient,VBoxControl} lib/VBoxGuestAdditions/mount.vboxsf 80 + for i in sbin/VBoxService bin/{VBoxClient,VBoxControl} other/mount.vboxsf 74 81 do 75 82 ${if stdenv.system == "i686-linux" then '' 76 83 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $i ··· 90 97 91 98 # FIXME: Virtualbox 4.3.22 moved VBoxClient-all (required by Guest Additions 92 99 # NixOS module) to 98vboxadd-xclient. For now, just work around it: 93 - mv lib/VBoxGuestAdditions/98vboxadd-xclient bin/VBoxClient-all 100 + mv other/98vboxadd-xclient bin/VBoxClient-all 94 101 95 102 # Remove references to /usr from various scripts and files 96 - sed -i -e "s|/usr/bin|$out/bin|" share/VBoxGuestAdditions/vboxclient.desktop 103 + sed -i -e "s|/usr/bin|$out/bin|" other/vboxclient.desktop 97 104 sed -i -e "s|/usr/bin|$out/bin|" bin/VBoxClient-all 98 105 99 106 # Install binaries 100 - install -D -m 755 lib/VBoxGuestAdditions/mount.vboxsf $out/bin/mount.vboxsf 107 + install -D -m 755 other/mount.vboxsf $out/bin/mount.vboxsf 101 108 install -D -m 755 sbin/VBoxService $out/bin/VBoxService 102 109 103 110 mkdir -p $out/bin ··· 116 123 117 124 # Install desktop file 118 125 mkdir -p $out/share/autostart 119 - cp -v share/VBoxGuestAdditions/vboxclient.desktop $out/share/autostart 126 + cp -v other/vboxclient.desktop $out/share/autostart 120 127 121 128 # Install Xorg drivers 122 129 mkdir -p $out/lib/xorg/modules/{drivers,input} 123 - install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_${xserverABI}.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so 130 + install -m 644 other/vboxvideo_drv_${xserverABI}.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so 124 131 125 132 # Install kernel modules 126 133 cd src
+38
pkgs/applications/virtualization/virtualbox/guest-additions/fix_kerndir.patch
··· 1 + diff --git a/install/src/vboxguest-5.2.0/vboxsf/Makefile.include.header b/install/src/vboxguest-5.2.0/vboxsf/Makefile.include.header 2 + index 8df1eb4d25..5a3e5604e7 100644 3 + --- a/install/src/vboxguest-5.2.0/vboxsf/Makefile.include.header 4 + +++ b/install/src/vboxguest-5.2.0/vboxsf/Makefile.include.header 5 + @@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),) 6 + endif # neq($(KERNELRELEASE),) 7 + 8 + # Kernel build folder 9 + -KERN_DIR := /lib/modules/$(KERN_VER)/build 10 + ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes) 11 + $(error Error: unable to find the headers of the Linux kernel to build against. \ 12 + Specify KERN_VER=<version> and run Make again) 13 + 14 + diff --git a/install/src/vboxguest-5.2.0/vboxguest/Makefile.include.header b/install/src/vboxguest-5.2.0/vboxguest/Makefile.include.header 15 + index 8df1eb4d25..5a3e5604e7 100644 16 + --- a/install/src/vboxguest-5.2.0/vboxguest/Makefile.include.header 17 + +++ b/install/src/vboxguest-5.2.0/vboxguest/Makefile.include.header 18 + @@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),) 19 + endif # neq($(KERNELRELEASE),) 20 + 21 + # Kernel build folder 22 + -KERN_DIR := /lib/modules/$(KERN_VER)/build 23 + ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes) 24 + $(error Error: unable to find the headers of the Linux kernel to build against. \ 25 + Specify KERN_VER=<version> and run Make again) 26 + 27 + diff --git a/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header b/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header 28 + index 8df1eb4d25..5a3e5604e7 100644 29 + --- a/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header 30 + +++ b/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header 31 + @@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),) 32 + endif # neq($(KERNELRELEASE),) 33 + 34 + # Kernel build folder 35 + -KERN_DIR := /lib/modules/$(KERN_VER)/build 36 + ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes) 37 + $(error Error: unable to find the headers of the Linux kernel to build against. \ 38 + Specify KERN_VER=<version> and run Make again)
+12
pkgs/applications/virtualization/virtualbox/guest-additions/fix_kernincl.patch
··· 1 + diff --git a/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header b/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header 2 + index 8df1eb4d25..5a3e5604e7 100644 3 + --- a/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header 4 + +++ b/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header 5 + @@ -122,7 +122,6 @@ ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes) 6 + Specify KERN_VER=<version> and run Make again) 7 + endif 8 + # Kernel include folder 9 + -KERN_INCL := $(KERN_DIR)/include 10 + # module install folder 11 + INSTALL_MOD_DIR ?= misc 12 + MODULE_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KERN_VER)/$(INSTALL_MOD_DIR)
+13 -13
pkgs/applications/virtualization/virtualbox/hardened.patch
··· 24 24 +++ b/include/iprt/path.h 25 25 @@ -1064,6 +1064,15 @@ RTDECL(int) RTPathCalcRelative(char *pszPathDst, size_t cbPathDst, 26 26 RTDECL(int) RTPathExecDir(char *pszPath, size_t cchPath); 27 - 27 + 28 28 /** 29 29 + * Gets the path to the NixOS setuid wrappers directory. 30 30 + * ··· 44 44 +++ b/include/iprt/process.h 45 45 @@ -327,6 +327,16 @@ RTR3DECL(const char *) RTProcShortName(void); 46 46 RTR3DECL(char *) RTProcGetExecutablePath(char *pszExecPath, size_t cbExecPath); 47 - 47 + 48 48 /** 49 49 + * Gets the path to the NixOS setuid wrappers directory. 50 50 + * ··· 63 63 index ce0f288..6193108 100644 64 64 --- a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp 65 65 +++ b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp 66 - @@ -1489,9 +1489,9 @@ static int supR3HardenedVerifyFsObject(PCSUPR3HARDENEDFSOBJSTATE pFsObjState, bo 66 + @@ -1502,9 +1502,9 @@ static int supR3HardenedVerifyFsObject(PCSUPR3HARDENEDFSOBJSTATE pFsObjState, bo 67 67 bool fBad = !fRelaxed || pFsObjState->Stat.st_gid != 2 /*bin*/ || suplibHardenedStrCmp(pszPath, "/usr/lib/iconv"); 68 - #else 68 + # else 69 69 NOREF(fRelaxed); 70 70 - bool fBad = true; 71 71 + bool fBad = !(fDir && pFsObjState->Stat.st_mode & S_ISVTX && !suplibHardenedStrCmp(pszPath, "/nix/store")); 72 - #endif 72 + # endif 73 73 - if (fBad) 74 74 + if (fBad && suplibHardenedStrCmp(pszPath, "/nix/store")) 75 75 return supR3HardenedSetError3(VERR_SUPLIB_WRITE_NON_SYS_GROUP, pErrInfo, ··· 80 80 --- a/src/VBox/Main/src-server/MachineImpl.cpp 81 81 +++ b/src/VBox/Main/src-server/MachineImpl.cpp 82 82 @@ -7543,7 +7543,7 @@ HRESULT Machine::i_launchVMProcess(IInternalSessionControl *aControl, 83 - 83 + 84 84 /* get the path to the executable */ 85 85 char szPath[RTPATH_MAX]; 86 86 - RTPathAppPrivateArch(szPath, sizeof(szPath) - 1); ··· 93 93 --- a/src/VBox/Main/src-server/NetworkServiceRunner.cpp 94 94 +++ b/src/VBox/Main/src-server/NetworkServiceRunner.cpp 95 95 @@ -85,7 +85,7 @@ int NetworkServiceRunner::start(bool aKillProcOnStop) 96 - 96 + 97 97 /* get the path to the executable */ 98 98 char exePathBuf[RTPATH_MAX]; 99 99 - const char *exePath = RTProcGetExecutablePath(exePathBuf, RTPATH_MAX); ··· 107 107 +++ b/src/VBox/Main/src-server/generic/NetIf-generic.cpp 108 108 @@ -47,7 +47,7 @@ static int NetIfAdpCtl(const char * pcszIfName, const char *pszAddr, const char 109 109 const char *args[] = { NULL, pcszIfName, pszAddr, pszOption, pszMask, NULL }; 110 - 110 + 111 111 char szAdpCtl[RTPATH_MAX]; 112 112 - int rc = RTPathExecDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME)); 113 113 + int rc = RTPathSuidDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME)); ··· 125 125 LogRel(("NetIfAdpCtlOut: Failed to get program path, rc=%Rrc\n", rc)); 126 126 @@ -201,7 +201,7 @@ int NetIfCreateHostOnlyNetworkInterface(VirtualBox *pVirtualBox, 127 127 progress.queryInterfaceTo(aProgress); 128 - 128 + 129 129 char szAdpCtl[RTPATH_MAX]; 130 130 - int rc = RTPathExecDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME " add")); 131 131 + int rc = RTPathSuidDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME " add")); ··· 138 138 +++ b/src/VBox/Runtime/r3/path.cpp 139 139 @@ -81,6 +81,12 @@ RTDECL(int) RTPathExecDir(char *pszPath, size_t cchPath) 140 140 } 141 - 142 - 141 + 142 + 143 143 +RTDECL(int) RTPathSuidDir(char *pszPath, size_t cchPath) 144 144 +{ 145 145 + return RTStrCopy(pszPath, cchPath, "/run/wrappers/bin"); ··· 156 156 @@ -111,6 +111,26 @@ RTR3DECL(char *) RTProcGetExecutablePath(char *pszExecPath, size_t cbExecPath) 157 157 return NULL; 158 158 } 159 - 159 + 160 160 +/* 161 161 + * Note the / at the end! This is important, because the functions using this 162 162 + * will cut off everything after the rightmost / as this function is analogous ··· 177 177 + return NULL; 178 178 +} 179 179 + 180 - 180 + 181 181 RTR3DECL(const char *) RTProcShortName(void) 182 182 {
+13 -13
pkgs/applications/virtualization/virtualbox/qtx11extras.patch
··· 2 2 index 71b96a3..73391f0 100644 3 3 --- a/kBuild/units/qt5.kmk 4 4 +++ b/kBuild/units/qt5.kmk 5 - @@ -994,9 +994,10 @@ else 5 + @@ -1019,9 +1019,10 @@ else 6 6 $(eval $(target)_LIBS += $(PATH_SDK_QT5_LIB)/$(qt_prefix)qtmain$(qt_infix)$(SUFF_LIB) ) 7 7 endif 8 8 else ··· 14 14 + $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) $(PATH_QT5_X11_EXTRAS_INC)/QtX11Extras ) 15 15 endif 16 16 $(eval $(target)_DEFS += $(foreach module,$(toupper $(qt_modules)), QT_$(module)_LIB) ) 17 - 17 + 18 18 diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk 19 - index 38db6b0..7dd446b 100644 19 + index 3295bfefe7..796370623c 100644 20 20 --- a/src/VBox/Frontends/VirtualBox/Makefile.kmk 21 21 +++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk 22 - @@ -912,9 +912,6 @@ VirtualBox_QT_MODULES = Core Gui 23 - ifdef VBOX_WITH_QTGUI_V5 24 - # Qt5 requires additional modules: 25 - VirtualBox_QT_MODULES += Widgets PrintSupport 26 - - VirtualBox_QT_MODULES.linux += X11Extras 27 - - VirtualBox_QT_MODULES.solaris += X11Extras 28 - - VirtualBox_QT_MODULES.freebsd += X11Extras 29 - VirtualBox_QT_MODULES.darwin += MacExtras 30 - VirtualBox_QT_MODULES.win += WinExtras 31 - endif # VBOX_WITH_QTGUI_V5 22 + @@ -916,9 +916,6 @@ endif 23 + # The Qt modules we're using. 24 + # (The include directory and lib/framework for each module will be added by the Qt unit.) 25 + VirtualBox_QT_MODULES = Core Gui Widgets PrintSupport 26 + -VirtualBox_QT_MODULES.linux += X11Extras 27 + -VirtualBox_QT_MODULES.solaris += X11Extras 28 + -VirtualBox_QT_MODULES.freebsd += X11Extras 29 + VirtualBox_QT_MODULES.darwin += MacExtras 30 + VirtualBox_QT_MODULES.win += WinExtras 31 + if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
+8
pkgs/os-specific/linux/virtualbox/default.nix
··· 7 7 "fortify" "pic" "stackprotector" 8 8 ]; 9 9 10 + patches = [ 11 + ./fix_kerndir.patch 12 + ./fix_kbuild.patch 13 + ]; 14 + 15 + KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; 16 + INCLUDE_BASE = "${virtualbox.modsrc}"; 17 + 10 18 makeFlags = [ 11 19 "-C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" 12 20 "INSTALL_MOD_PATH=$(out)"
+85
pkgs/os-specific/linux/virtualbox/fix_kbuild.patch
··· 1 + diff --git a/vboxdrv/Makefile b/vboxdrv/Makefile 2 + index e262c61..4af8dac 100644 3 + --- a/vboxdrv/Makefile 4 + +++ b/vboxdrv/Makefile 5 + @@ -131,7 +131,7 @@ ifdef VBOX_WITH_NATIVE_DTRACE 6 + MOD_OBJS += SUPDrvDTrace.o 7 + endif 8 + 9 + -MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux) 10 + +MOD_INCL = $(addprefix -I$(INCLUDE_BASE)/$(MOD_NAME),/ /include /r0drv/linux) 11 + ifdef VBOX_WITH_NATIVE_DTRACE 12 + MOD_INCL += -I/usr/include/linux -I/usr/include 13 + endif 14 + @@ -157,7 +157,7 @@ ifdef VBOX_WITH_TEXT_MODMEM_HACK 15 + endif 16 + 17 + # build defs 18 + -MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h \ 19 + +MOD_CFLAGS = -include include/VBox/SUPDrvMangling.h \ 20 + -fno-omit-frame-pointer -fno-pie 21 + 22 + include $(obj)/Makefile.include.footer 23 + diff --git a/vboxnetadp/Makefile b/vboxnetadp/Makefile 24 + index e262c61..4af8dac 100644 25 + --- a/vboxnetadp/Makefile 26 + +++ b/vboxnetadp/Makefile 27 + @@ -34,7 +34,7 @@ MOD_OBJS += math/gcc/divdi3.o \ 28 + math/gcc/umoddi3.o 29 + endif 30 + 31 + -MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux) 32 + +MOD_INCL = $(addprefix -I$(INCLUDE_BASE)/$(MOD_NAME),/ /include /r0drv/linux) 33 + MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX \ 34 + -DRT_WITH_VBOX -DVBOX_WITH_HARDENING \ 35 + -Wno-declaration-after-statement 36 + @@ -59,6 +59,6 @@ ifdef VBOX_USE_INSERT_PAGE 37 + endif 38 + 39 + # build defs 40 + -MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie 41 + +MOD_CFLAGS = -include include/VBox/SUPDrvMangling.h -fno-pie 42 + 43 + include $(obj)/Makefile.include.footer 44 + diff --git a/vboxnetflt/Makefile b/vboxnetflt/Makefile 45 + index e262c61..4af8dac 100644 46 + --- a/vboxnetflt/Makefile 47 + +++ b/vboxnetflt/Makefile 48 + @@ -38,7 +38,7 @@ MOD_OBJS += math/gcc/divdi3.o \ 49 + math/gcc/umoddi3.o 50 + endif 51 + 52 + -MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux) 53 + +MOD_INCL = $(addprefix -I$(INCLUDE_BASE)/$(MOD_NAME),/ /include /r0drv/linux) 54 + MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \ 55 + -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -DVBOX_WITH_HARDENING \ 56 + -Wno-declaration-after-statement 57 + @@ -63,6 +63,6 @@ ifdef VBOX_USE_INSERT_PAGE 58 + endif 59 + 60 + # build defs 61 + -MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie 62 + +MOD_CFLAGS = -include include/VBox/SUPDrvMangling.h -fno-pie 63 + 64 + include $(obj)/Makefile.include.footer 65 + diff --git a/vboxpci/Makefile b/vboxpci/Makefile 66 + index e262c61..4af8dac 100644 67 + --- a/vboxpci/Makefile 68 + +++ b/vboxpci/Makefile 69 + @@ -38,7 +38,7 @@ MOD_OBJS += math/gcc/divdi3.o \ 70 + math/gcc/umoddi3.o 71 + endif 72 + 73 + -MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux) 74 + +MOD_INCL = $(addprefix -I$(INCLUDE_BASE)/$(MOD_NAME),/ /include /r0drv/linux) 75 + MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX \ 76 + -DRT_WITH_VBOX -DVBOX_WITH_HARDENING 77 + ifeq ($(BUILD_TARGET_ARCH),amd64) 78 + @@ -60,6 +60,6 @@ ifdef VBOX_USE_INSERT_PAGE 79 + endif 80 + 81 + # build defs 82 + -MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie 83 + +MOD_CFLAGS = -include include/VBox/SUPDrvMangling.h -fno-pie 84 + 85 + include $(obj)/Makefile.include.footer
+48
pkgs/os-specific/linux/virtualbox/fix_kerndir.patch
··· 1 + diff --git a/vboxdrv/Makefile.include.header b/vboxdrv/Makefile.include.header 2 + index 8df1eb4d25..5a3e5604e7 100644 3 + --- a/vboxdrv/Makefile.include.header 4 + +++ b/vboxdrv/Makefile.include.header 5 + @@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),) 6 + endif # neq($(KERNELRELEASE),) 7 + 8 + # Kernel build folder 9 + -KERN_DIR := /lib/modules/$(KERN_VER)/build 10 + ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes) 11 + $(error Error: unable to find the headers of the Linux kernel to build against. \ 12 + Specify KERN_VER=<version> and run Make again) 13 + diff --git a/vboxnetadp/Makefile.include.header b/vboxnetadp/Makefile.include.header 14 + index 8df1eb4d25..5a3e5604e7 100644 15 + --- a/vboxnetadp/Makefile.include.header 16 + +++ b/vboxnetadp/Makefile.include.header 17 + @@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),) 18 + endif # neq($(KERNELRELEASE),) 19 + 20 + # Kernel build folder 21 + -KERN_DIR := /lib/modules/$(KERN_VER)/build 22 + ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes) 23 + $(error Error: unable to find the headers of the Linux kernel to build against. \ 24 + Specify KERN_VER=<version> and run Make again) 25 + diff --git a/vboxnetflt/Makefile.include.header b/vboxnetflt/Makefile.include.header 26 + index 8df1eb4d25..5a3e5604e7 100644 27 + --- a/vboxnetflt/Makefile.include.header 28 + +++ b/vboxnetflt/Makefile.include.header 29 + @@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),) 30 + endif # neq($(KERNELRELEASE),) 31 + 32 + # Kernel build folder 33 + -KERN_DIR := /lib/modules/$(KERN_VER)/build 34 + ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes) 35 + $(error Error: unable to find the headers of the Linux kernel to build against. \ 36 + Specify KERN_VER=<version> and run Make again) 37 + diff --git a/vboxpci/Makefile.include.header b/vboxpci/Makefile.include.header 38 + index 8df1eb4d25..5a3e5604e7 100644 39 + --- a/vboxpci/Makefile.include.header 40 + +++ b/vboxpci/Makefile.include.header 41 + @@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),) 42 + endif # neq($(KERNELRELEASE),) 43 + 44 + # Kernel build folder 45 + -KERN_DIR := /lib/modules/$(KERN_VER)/build 46 + ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes) 47 + $(error Error: unable to find the headers of the Linux kernel to build against. \ 48 + Specify KERN_VER=<version> and run Make again)