From 409bfdb608a2e137de244c39c992df60241187ce Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Fri, 13 Dec 2019 21:32:46 +0100 Subject: [PATCH] virtualbox-ose: update to 6.1.0. [skip ci] fixes #16925 --- .../files/virtualbox-ose-dkms.dkms | 3 - srcpkgs/virtualbox-ose/files/virtualbox.conf | 1 - srcpkgs/virtualbox-ose/patches/014-iasl.patch | 73 ------------------- srcpkgs/virtualbox-ose/template | 17 ++--- 4 files changed, 7 insertions(+), 87 deletions(-) delete mode 100644 srcpkgs/virtualbox-ose/patches/014-iasl.patch diff --git a/srcpkgs/virtualbox-ose/files/virtualbox-ose-dkms.dkms b/srcpkgs/virtualbox-ose/files/virtualbox-ose-dkms.dkms index c932fdc816a..6df12f77303 100644 --- a/srcpkgs/virtualbox-ose/files/virtualbox-ose-dkms.dkms +++ b/srcpkgs/virtualbox-ose/files/virtualbox-ose-dkms.dkms @@ -10,7 +10,4 @@ DEST_MODULE_LOCATION[1]="/updates" BUILT_MODULE_NAME[2]="vboxnetflt" BUILT_MODULE_LOCATION[2]="vboxnetflt" DEST_MODULE_LOCATION[2]="/updates" -BUILT_MODULE_NAME[3]="vboxpci" -BUILT_MODULE_LOCATION[3]="vboxpci" -DEST_MODULE_LOCATION[3]="/updates" AUTOINSTALL="yes" diff --git a/srcpkgs/virtualbox-ose/files/virtualbox.conf b/srcpkgs/virtualbox-ose/files/virtualbox.conf index 7362977d754..b2856e5ded6 100644 --- a/srcpkgs/virtualbox-ose/files/virtualbox.conf +++ b/srcpkgs/virtualbox-ose/files/virtualbox.conf @@ -1,4 +1,3 @@ vboxdrv vboxnetadp vboxnetflt -vboxpci diff --git a/srcpkgs/virtualbox-ose/patches/014-iasl.patch b/srcpkgs/virtualbox-ose/patches/014-iasl.patch deleted file mode 100644 index ec974e5a2c2..00000000000 --- a/srcpkgs/virtualbox-ose/patches/014-iasl.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- src/VBox/Devices/PC/vbox-cpuhotplug.dsl -+++ src/VBox/Devices/PC/vbox-cpuhotplug.dsl -@@ -95,38 +95,38 @@ DefinitionBlock ("SSDT-cpuhotplug.aml", - } \ - } \ - -- GENERATE_CPU_OBJECT(0x00, SCK0, "SCKCPU0", CPU0, "SCK0-CPU0") -- GENERATE_CPU_OBJECT(0x01, SCK1, "SCKCPU1", CPU1, "SCK1-CPU0") -- GENERATE_CPU_OBJECT(0x02, SCK2, "SCKCPU2", CPU2, "SCK2-CPU0") -- GENERATE_CPU_OBJECT(0x03, SCK3, "SCKCPU3", CPU3, "SCK3-CPU0") -- GENERATE_CPU_OBJECT(0x04, SCK4, "SCKCPU4", CPU4, "SCK4-CPU0") -- GENERATE_CPU_OBJECT(0x05, SCK5, "SCKCPU5", CPU5, "SCK5-CPU0") -- GENERATE_CPU_OBJECT(0x06, SCK6, "SCKCPU6", CPU6, "SCK6-CPU0") -- GENERATE_CPU_OBJECT(0x07, SCK7, "SCKCPU7", CPU7, "SCK7-CPU0") -- GENERATE_CPU_OBJECT(0x08, SCK8, "SCKCPU8", CPU8, "SCK8-CPU0") -- GENERATE_CPU_OBJECT(0x09, SCK9, "SCKCPU9", CPU9, "SCK9-CPU0") -- GENERATE_CPU_OBJECT(0x0a, SCKA, "SCKCPUA", CPUA, "SCKA-CPU0") -- GENERATE_CPU_OBJECT(0x0b, SCKB, "SCKCPUB", CPUB, "SCKB-CPU0") -- GENERATE_CPU_OBJECT(0x0c, SCKC, "SCKCPUC", CPUC, "SCKC-CPU0") -- GENERATE_CPU_OBJECT(0x0d, SCKD, "SCKCPUD", CPUD, "SCKD-CPU0") -- GENERATE_CPU_OBJECT(0x0e, SCKE, "SCKCPUE", CPUE, "SCKE-CPU0") -- GENERATE_CPU_OBJECT(0x0f, SCKF, "SCKCPUF", CPUF, "SCKF-CPU0") -- GENERATE_CPU_OBJECT(0x10, SCKG, "SCKCPUG", CPUG, "SCKG-CPU0") -- GENERATE_CPU_OBJECT(0x11, SCKH, "SCKCPUH", CPUH, "SCKH-CPU0") -- GENERATE_CPU_OBJECT(0x12, SCKI, "SCKCPUI", CPUI, "SCKI-CPU0") -- GENERATE_CPU_OBJECT(0x13, SCKJ, "SCKCPUJ", CPUJ, "SCKJ-CPU0") -- GENERATE_CPU_OBJECT(0x14, SCKK, "SCKCPUK", CPUK, "SCKK-CPU0") -- GENERATE_CPU_OBJECT(0x15, SCKL, "SCKCPUL", CPUL, "SCKL-CPU0") -- GENERATE_CPU_OBJECT(0x16, SCKM, "SCKCPUM", CPUM, "SCKM-CPU0") -- GENERATE_CPU_OBJECT(0x17, SCKN, "SCKCPUN", CPUN, "SCKN-CPU0") -- GENERATE_CPU_OBJECT(0x18, SCKO, "SCKCPUO", CPUO, "SCKO-CPU0") -- GENERATE_CPU_OBJECT(0x19, SCKP, "SCKCPUP", CPUP, "SCKP-CPU0") -- GENERATE_CPU_OBJECT(0x1a, SCKQ, "SCKCPUQ", CPUQ, "SCKQ-CPU0") -- GENERATE_CPU_OBJECT(0x1b, SCKR, "SCKCPUR", CPUR, "SCKR-CPU0") -- GENERATE_CPU_OBJECT(0x1c, SCKS, "SCKCPUS", CPUS, "SCKS-CPU0") -- GENERATE_CPU_OBJECT(0x1d, SCKT, "SCKCPUT", CPUT, "SCKT-CPU0") -- GENERATE_CPU_OBJECT(0x1e, SCKU, "SCKCPUU", CPUU, "SCKU-CPU0") -- GENERATE_CPU_OBJECT(0x1f, SCKV, "SCKCPUV", CPUV, "SCKV-CPU0") -+ GENERATE_CPU_OBJECT(0x00, SCK0, "SCKCPU0", CPU0, 0) -+ GENERATE_CPU_OBJECT(0x01, SCK1, "SCKCPU1", CPU1, 1) -+ GENERATE_CPU_OBJECT(0x02, SCK2, "SCKCPU2", CPU2, 2) -+ GENERATE_CPU_OBJECT(0x03, SCK3, "SCKCPU3", CPU3, 3) -+ GENERATE_CPU_OBJECT(0x04, SCK4, "SCKCPU4", CPU4, 4) -+ GENERATE_CPU_OBJECT(0x05, SCK5, "SCKCPU5", CPU5, 5) -+ GENERATE_CPU_OBJECT(0x06, SCK6, "SCKCPU6", CPU6, 6) -+ GENERATE_CPU_OBJECT(0x07, SCK7, "SCKCPU7", CPU7, 7) -+ GENERATE_CPU_OBJECT(0x08, SCK8, "SCKCPU8", CPU8, 8) -+ GENERATE_CPU_OBJECT(0x09, SCK9, "SCKCPU9", CPU9, 9) -+ GENERATE_CPU_OBJECT(0x0a, SCKA, "SCKCPUA", CPUA, 10) -+ GENERATE_CPU_OBJECT(0x0b, SCKB, "SCKCPUB", CPUB, 11) -+ GENERATE_CPU_OBJECT(0x0c, SCKC, "SCKCPUC", CPUC, 12) -+ GENERATE_CPU_OBJECT(0x0d, SCKD, "SCKCPUD", CPUD, 13) -+ GENERATE_CPU_OBJECT(0x0e, SCKE, "SCKCPUE", CPUE, 14) -+ GENERATE_CPU_OBJECT(0x0f, SCKF, "SCKCPUF", CPUF, 15) -+ GENERATE_CPU_OBJECT(0x10, SCKG, "SCKCPUG", CPUG, 16) -+ GENERATE_CPU_OBJECT(0x11, SCKH, "SCKCPUH", CPUH, 17) -+ GENERATE_CPU_OBJECT(0x12, SCKI, "SCKCPUI", CPUI, 18) -+ GENERATE_CPU_OBJECT(0x13, SCKJ, "SCKCPUJ", CPUJ, 19) -+ GENERATE_CPU_OBJECT(0x14, SCKK, "SCKCPUK", CPUK, 20) -+ GENERATE_CPU_OBJECT(0x15, SCKL, "SCKCPUL", CPUL, 21) -+ GENERATE_CPU_OBJECT(0x16, SCKM, "SCKCPUM", CPUM, 22) -+ GENERATE_CPU_OBJECT(0x17, SCKN, "SCKCPUN", CPUN, 23) -+ GENERATE_CPU_OBJECT(0x18, SCKO, "SCKCPUO", CPUO, 24) -+ GENERATE_CPU_OBJECT(0x19, SCKP, "SCKCPUP", CPUP, 25) -+ GENERATE_CPU_OBJECT(0x1a, SCKQ, "SCKCPUQ", CPUQ, 26) -+ GENERATE_CPU_OBJECT(0x1b, SCKR, "SCKCPUR", CPUR, 27) -+ GENERATE_CPU_OBJECT(0x1c, SCKS, "SCKCPUS", CPUS, 28) -+ GENERATE_CPU_OBJECT(0x1d, SCKT, "SCKCPUT", CPUT, 29) -+ GENERATE_CPU_OBJECT(0x1e, SCKU, "SCKCPUU", CPUU, 30) -+ GENERATE_CPU_OBJECT(0x1f, SCKV, "SCKCPUV", CPUV, 31) - - #undef GENERATE_CPU_OBJECT - } diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template index ab9def84721..718d70a6723 100644 --- a/srcpkgs/virtualbox-ose/template +++ b/srcpkgs/virtualbox-ose/template @@ -1,6 +1,6 @@ # Template file for 'virtualbox-ose' pkgname=virtualbox-ose -version=6.0.14 +version=6.1.0 revision=1 wrksrc="VirtualBox-${version%*a}" short_desc="General-purpose full virtualizer for x86 hardware" @@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0" homepage="https://www.virtualbox.org" changelog="https://www.virtualbox.org/wiki/Changelog" distfiles="http://download.virtualbox.org/virtualbox/${version%*a}/VirtualBox-$version.tar.bz2" -checksum=5e12b14f0c38bf195d9592d76a9e0a128df2d38cd77c26ce5b5488397715dd0c +checksum=49005ed94454f893fc3955e1e2b9607e85c300235cb983b39d1df2cfcf29f039 nopie=yes lib32disabled=yes @@ -29,20 +29,18 @@ depends="virtualbox-ose-dkms-${version}_${revision} hicolor-icon-theme desktop-f system_groups="vboxusers" pre_configure() { - # Use our path for dri drivers. - sed -e 's,/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri,/usr/lib/xorg/modules/drivers,g' \ - -i src/VBox/Additions/common/crOpenGL/fakedri_drv.c - cp ${FILESDIR}/LocalConfig.kmk . ln -s /bin/echo makeself echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk sed -i 's/^check_gcc$/#check_gcc/' configure } + do_configure() { ./configure --disable-docs --disable-java --enable-vde \ --disable-python --disable-kmods --nofatal --enable-webservice } + do_build() { export USERNAME="$(whoami)" sed -i -e "/webtest_LIBS/,/^webtest_/s/.*LIB_.*/\0 z/" \ @@ -50,6 +48,7 @@ do_build() { source ./env.sh kmk ${makejobs} KBUILD_VERBOSE=2 all } + do_install() { local f _osedir _guestdir @@ -66,11 +65,12 @@ do_install() { ln -sf VBox ${DESTDIR}/usr/bin/${f} done # components + rm components/VBoxREM.so install -m0755 components/* -t ${DESTDIR}/usr/lib/virtualbox/components # libs install -m0755 *.so ${DESTDIR}/usr/lib/virtualbox - install -m0644 *.rc *.r0 *.fd ${DESTDIR}/usr/lib/virtualbox + install -m0644 *.r0 *.fd ${DESTDIR}/usr/lib/virtualbox # setuid install -m4755 VBoxSDL VirtualBoxVM VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl \ @@ -159,9 +159,6 @@ virtualbox-ose-guest_package() { cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions install -d ${PKGDESTDIR}/usr/lib/xorg/modules/drivers - install -m755 VBoxOGL*.so ${PKGDESTDIR}/usr/lib - ln -sf /usr/lib/VBoxOGL.so \ - ${PKGDESTDIR}/usr/lib/xorg/modules/drivers/vboxvideo_dri.so cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions install -Dm755 pam_vbox.so ${PKGDESTDIR}/usr/lib/security/pam_vbox.so