commit dfa60db199009906e3e24b3fd9c8747c2a3ecb0f · pyrox.dev/nixpkgs

+5 -5

pkgs/applications/virtualization/virtualbox/default.nix

···

       18
       18
        
       let

     

       19
       19
        
         python = python2;

     

       20
       20
        
         buildType = "release";

     

       21
       21
       -
         extpack = "244e6f450cba64e0b025711050db3c43e6ce77e12cd80bcd08796315a90c8aaf";

     

       22
       22
       -
         extpackRev = "115126";

     

       23
       23
       -
         main = "fcc918000b8c5ece553541ec10a9182410a742b7266257c76dda895dcd389899";

     

       24
       24
       -
         version = "5.1.22";

     

       21
       21
       +
         extpack = "1952ikz4xsjgdd0pzdx1riwaingyhkxp0ind31yzqc4d0hp8l6b5";

     

       22
       22
       +
         extpackRev = "117012";

     

       23
       23
       +
         main = "0q5vjsih4ndn1b0s9l1ppxng6dljld5bin5nqfrhvgr2ldlv2bgf";

     

       24
       24
       +
         version = "5.1.24";

     

       25
       25
        
       

     

       26
       26
        
         # See https://github.com/NixOS/nixpkgs/issues/672 for details

     

       27
       27
        
         extensionPack = requireFile rec {

     
···

       88
       88
        
         '';

     

       89
       89
        
       

     

       90
       90
        
         patches = optional enableHardening ./hardened.patch

     

       91
       91
       -
           ++ [ ./qtx11extras.patch ./linux-4.12.patch ];

     

       91
       91
       +
           ++ [ ./qtx11extras.patch ];

     

       92
       92
        
       

     

       93
       93
        
         postPatch = ''

     

       94
       94
        
           sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \

+1 -4

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
       22
       -
           sha256 = "54df14f234b6aa484b94939ab0f435b5dd859417612b65a399ecc34a62060380";

     

       22
       22
       +
           sha256 = "0hxxv2707fb6x34m5cmjhj73sxwgmy2dgir7mbbdh9wivw07b9q1";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         KERN_DIR = "${kernel.dev}/lib/modules/*/build";

     
···

       62
       62
        
           for i in *

     

       63
       63
        
           do

     

       64
       64
        
               cd $i

     

       65
       65
       -
               # Files within the guest additions ISO are using DOS line endings

     

       66
       66
       -
               sed -re '/^(@@|---|\+\+\+)/!s/$/\r/' ${../linux-4.12.patch} \

     

       67
       67
       -
                 | patch -d vboxguest -p4

     

       68
       65
        
               find . -type f | xargs sed 's/depmod -a/true/' -i

     

       69
       66
        
               make

     

       70
       67
        
               cd ..

-80

pkgs/applications/virtualization/virtualbox/linux-4.12.patch

···

       1
       1
       -
       commit 47fee9325e3b5feed0dbc4ba9e2de77c6d55e3bb

     

       2
       2
       -
       Author: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>

     

       3
       3
       -
       Date:   Wed May 17 09:42:23 2017 +0000

     

       4
       4
       -
       

     

       5
       5
       -
           Runtime/r0drv: Linux 4.12 5-level page table adaptions

     

       6
       6
       -
           

     

       7
       7
       -
           

     

       8
       8
       -
           git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@66927 cfe28804-0f27-0410-a406-dd0f0b0b656f

     

       9
       9
       -
       

     

       10
       10
       -
       diff --git a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c

     

       11
       11
       -
       index 28dc33f963..41ed058860 100644

     

       12
       12
       -
       --- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c

     

       13
       13
       -
       +++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c

     

       14
       14
       -
       @@ -902,6 +902,9 @@ static struct page *rtR0MemObjLinuxVirtToPage(void *pv)

     

       15
       15
       -
            union

     

       16
       16
       -
            {

     

       17
       17
       -
                pgd_t       Global;

     

       18
       18
       -
       +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)

     

       19
       19
       -
       +        p4d_t       Four;

     

       20
       20
       -
       +#endif

     

       21
       21
       -
        #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)

     

       22
       22
       -
                pud_t       Upper;

     

       23
       23
       -
        #endif

     

       24
       24
       -
       @@ -917,12 +920,26 @@ static struct page *rtR0MemObjLinuxVirtToPage(void *pv)

     

       25
       25
       -
            u.Global = *pgd_offset(current->active_mm, ulAddr);

     

       26
       26
       -
            if (RT_UNLIKELY(pgd_none(u.Global)))

     

       27
       27
       -
                return NULL;

     

       28
       28
       -
       -

     

       29
       29
       -
       -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)

     

       30
       30
       -
       +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)

     

       31
       31
       -
       +    u.Four  = *p4d_offset(&u.Global, ulAddr);

     

       32
       32
       -
       +    if (RT_UNLIKELY(p4d_none(u.Four)))

     

       33
       33
       -
       +        return NULL;

     

       34
       34
       -
       +    if (p4d_large(u.Four))

     

       35
       35
       -
       +    {

     

       36
       36
       -
       +        pPage = p4d_page(u.Four);

     

       37
       37
       -
       +        AssertReturn(pPage, NULL);

     

       38
       38
       -
       +        pfn   = page_to_pfn(pPage);      /* doing the safe way... */

     

       39
       39
       -
       +        AssertCompile(P4D_SHIFT - PAGE_SHIFT < 31);

     

       40
       40
       -
       +        pfn  += (ulAddr >> PAGE_SHIFT) & ((UINT32_C(1) << (P4D_SHIFT - PAGE_SHIFT)) - 1);

     

       41
       41
       -
       +        return pfn_to_page(pfn);

     

       42
       42
       -
       +    }

     

       43
       43
       -
       +    u.Upper = *pud_offset(&u.Four, ulAddr);

     

       44
       44
       -
       +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)

     

       45
       45
       -
            u.Upper = *pud_offset(&u.Global, ulAddr);

     

       46
       46
       -
       +#endif

     

       47
       47
       -
            if (RT_UNLIKELY(pud_none(u.Upper)))

     

       48
       48
       -
                return NULL;

     

       49
       49
       -
       -# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)

     

       50
       50
       -
       +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)

     

       51
       51
       -
            if (pud_large(u.Upper))

     

       52
       52
       -
            {

     

       53
       53
       -
                pPage = pud_page(u.Upper);

     

       54
       54
       -
       @@ -931,8 +948,8 @@ static struct page *rtR0MemObjLinuxVirtToPage(void *pv)

     

       55
       55
       -
                pfn += (ulAddr >> PAGE_SHIFT) & ((UINT32_C(1) << (PUD_SHIFT - PAGE_SHIFT)) - 1);

     

       56
       56
       -
                return pfn_to_page(pfn);

     

       57
       57
       -
            }

     

       58
       58
       -
       -# endif

     

       59
       59
       -
       -

     

       60
       60
       -
       +#endif

     

       61
       61
       -
       +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)

     

       62
       62
       -
            u.Middle = *pmd_offset(&u.Upper, ulAddr);

     

       63
       63
       -
        #else  /* < 2.6.11 */

     

       64
       64
       -
            u.Middle = *pmd_offset(&u.Global, ulAddr);

     

       65
       65
       -
       diff --git a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h

     

       66
       66
       -
       index 5afdee9e71..20aab0817f 100644

     

       67
       67
       -
       --- a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h

     

       68
       68
       -
       +++ b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h

     

       69
       69
       -
       @@ -159,6 +159,11 @@

     

       70
       70
       -
        # include <asm/tlbflush.h>

     

       71
       71
       -
        #endif

     

       72
       72
       -
        

     

       73
       73
       -
       +/* for set_pages_x() */

     

       74
       74
       -
       +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)

     

       75
       75
       -
       +# include <asm/set_memory.h>

     

       76
       76
       -
       +#endif

     

       77
       77
       -
       +

     

       78
       78
       -
        #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0)

     

       79
       79
       -
        # include <asm/smap.h>

     

       80
       80
       -
        #else