mirror of
https://github.com/pentoo/pentoo-overlay
synced 2025-12-06 08:25:01 +01:00
pentoo: clean up of outdated and absolute packages
This commit is contained in:
blshkv
parent
d84bd9efca
commit
66e75e291d
65 changed files with 0 additions and 4156 deletions
|
|
@ -1,701 +0,0 @@
|
|||
# ChangeLog for app-emulation/vmware-modules
|
||||
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.122 2014/06/09 15:24:07 dilfridge Exp $
|
||||
|
||||
09 Jun 2014; Andreas K. Huettel <dilfridge@gentoo.org>
|
||||
vmware-modules-271.3.ebuild, vmware-modules-279.1-r1.ebuild,
|
||||
vmware-modules-279.2.ebuild:
|
||||
Apply filldir patch really only from 3.11 on, bug 512830
|
||||
|
||||
07 Jun 2014; Andreas K. Huettel <dilfridge@gentoo.org>
|
||||
-files/264-3.2.0.patch, -files/264-d-make-root.patch,
|
||||
-files/264-makefile-include.patch, -files/264-3.8.0.patch,
|
||||
-files/264-jobserver.patch, -files/264-makefile-kernel-dir.patch,
|
||||
-files/264-3.10.0.patch, -files/264-apic.patch, -files/264-netdevice.patch,
|
||||
-files/264-newline.patch, -files/264-putname.patch:
|
||||
Clean up
|
||||
|
||||
07 Jun 2014; Andreas K. Huettel <dilfridge@gentoo.org>
|
||||
vmware-modules-271.3.ebuild, vmware-modules-279.1-r1.ebuild,
|
||||
vmware-modules-279.2.ebuild, +files/271-vfsfollowlink.patch,
|
||||
+files/279-vfsfollowlink.patch:
|
||||
Conditionally add patch for kernel 3.12, bug 488072
|
||||
|
||||
07 Jun 2014; Andreas K. Huettel <dilfridge@gentoo.org>
|
||||
vmware-modules-271.3.ebuild, vmware-modules-279.1-r1.ebuild,
|
||||
vmware-modules-279.2.ebuild:
|
||||
Apply patch already for 3.10.25, bug 483410
|
||||
|
||||
07 Jun 2014; Andreas K. Huettel <dilfridge@gentoo.org>
|
||||
vmware-modules-271.3.ebuild, vmware-modules-279.1-r1.ebuild,
|
||||
vmware-modules-279.2.ebuild, +files/271-filldir.patch,
|
||||
+files/279-filldir.patch:
|
||||
Conditionally add patch for kernel 3.11, bug 483410
|
||||
|
||||
*vmware-modules-279.2 (19 Apr 2014)
|
||||
|
||||
19 Apr 2014; Andreas K. Huettel <dilfridge@gentoo.org>
|
||||
-vmware-modules-279.0.ebuild, -vmware-modules-279.1.ebuild,
|
||||
+vmware-modules-279.2.ebuild:
|
||||
Version bump; remove old
|
||||
|
||||
*vmware-modules-279.1-r1 (12 Apr 2014)
|
||||
|
||||
12 Apr 2014; Andreas K. Huettel <dilfridge@gentoo.org>
|
||||
+vmware-modules-279.1-r1.ebuild, metadata.xml:
|
||||
Version bump to make some modules optional, bug 501536
|
||||
|
||||
*vmware-modules-271.3 (12 Apr 2014)
|
||||
|
||||
12 Apr 2014; Andreas K. Huettel <dilfridge@gentoo.org>
|
||||
-vmware-modules-264.5.ebuild, -vmware-modules-271.2.ebuild,
|
||||
+vmware-modules-271.3.ebuild:
|
||||
Version bump, bug 497816; remove old
|
||||
|
||||
27 Dec 2013; Andreas K. Huettel <dilfridge@gentoo.org>
|
||||
+files/264-newline.patch, vmware-modules-264.5.ebuild:
|
||||
Add cosmetic patch for bug 439280
|
||||
|
||||
23 Nov 2013; Magnus Granberg <zorry@gentoo.org> vmware-modules-279.0.ebuild,
|
||||
vmware-modules-279.1.ebuild, +files/279-hardened.patch:
|
||||
Update hardned patch for 279.X #491342
|
||||
|
||||
*vmware-modules-279.1 (06 Nov 2013)
|
||||
|
||||
06 Nov 2013; Andreas K. Huettel <dilfridge@gentoo.org>
|
||||
+vmware-modules-279.1.ebuild:
|
||||
Version bump
|
||||
|
||||
02 Nov 2013; Andreas K. Huettel <dilfridge@gentoo.org>
|
||||
-files/279-3.10.0.patch, vmware-modules-279.0.ebuild:
|
||||
Re-add keywords after testing
|
||||
|
||||
02 Nov 2013; Andreas K. Huettel <dilfridge@gentoo.org>
|
||||
files/279-vmblock.patch, vmware-modules-279.0.ebuild:
|
||||
Apply proper patches. Tested with 3.10.7-gentoo-r1.
|
||||
|
||||
22 Oct 2013; Andreas K. Huettel <dilfridge@gentoo.org>
|
||||
-files/238-2.6.39.patch, -files/238-makefile-kernel-dir.patch,
|
||||
-files/238-3.2.0.patch, -files/238-d-make-root.patch,
|
||||
-files/238-jobserver.patch, -files/238-makefile-include.patch,
|
||||
-files/238-netdevice.patch, -files/238-sema.patch,
|
||||
-files/238-unlocked_ioctl.patch, -vmware-modules-238.6.ebuild:
|
||||
Drop old
|
||||
|
||||
*vmware-modules-279.0 (19 Oct 2013)
|
||||
|
||||
19 Oct 2013; Andreas K. Huettel <dilfridge@gentoo.org>
|
||||
+files/279-3.10.0.patch, +files/279-apic.patch,
|
||||
+files/279-makefile-include.patch, +files/279-makefile-kernel-dir.patch,
|
||||
+files/279-netdevice.patch, +files/279-putname.patch,
|
||||
+files/279-vmblock.patch, +vmware-modules-279.0.ebuild:
|
||||
Version bump, added without keywords for testing. Bug 484098. Thanks to Billy
|
||||
DeVincentis for the files.
|
||||
|
||||
11 Aug 2013; Andreas K. Huettel <dilfridge@gentoo.org>
|
||||
+files/264-3.10.0.patch, +files/271-3.10.0.patch,
|
||||
vmware-modules-264.5.ebuild, vmware-modules-271.2.ebuild:
|
||||
Add contributed patches for kernel 3.10.0, see bug 470896
|
||||
|
||||
23 Jun 2013; Andreas K. Huettel <dilfridge@gentoo.org>
|
||||
+files/264-3.8.0.patch, -vmware-modules-264.4.ebuild,
|
||||
vmware-modules-264.5.ebuild:
|
||||
Remove old; add patch to build 264 with kernel 3.8, bug 458228
|
||||
|
||||
21 Jun 2013; Andreas K. Huettel <dilfridge@gentoo.org>
|
||||
vmware-modules-238.6.ebuild, vmware-modules-264.5.ebuild,
|
||||
vmware-modules-271.2.ebuild:
|
||||
Add support for epatch_user, bug 459182
|
||||
|
||||
16 Jun 2013; Vadim Kuznetsov vadimk@gentoo.org metadata.xml:
|
||||
dropped myself as a maintainer. maintainer needed
|
||||
|
||||
*vmware-modules-271.2 (10 Mar 2013)
|
||||
|
||||
10 Mar 2013; Vadim Kuznetsov vadimk@gentoo.org +vmware-modules-271.2.ebuild,
|
||||
-vmware-modules-271.1-r1.ebuild, -vmware-modules-271.1.ebuild:
|
||||
vmware desktop 9.0.2 version bump. Bugs 459566, 458228, 460908.
|
||||
|
||||
*vmware-modules-264.5 (07 Jan 2013)
|
||||
|
||||
07 Jan 2013; Vadim Kuznetsov vadimk@gentoo.org +files/264-putname.patch,
|
||||
+vmware-modules-264.5.ebuild:
|
||||
vmware desktop 8.0.5 version bump
|
||||
|
||||
22 Dec 2012; Vadim Kuznetsov vadimk@gentoo.org vmware-modules-271.1-r1.ebuild:
|
||||
apply patch to kernel gte 3.7.0
|
||||
|
||||
*vmware-modules-271.1-r1 (16 Dec 2012)
|
||||
|
||||
16 Dec 2012; Vadim Kuznetsov vadimk@gentoo.org +files/271-putname.patch,
|
||||
+vmware-modules-271.1-r1.ebuild:
|
||||
putname patch. Bug 447154.
|
||||
|
||||
12 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
|
||||
vmware-modules-238.6.ebuild, vmware-modules-264.4.ebuild,
|
||||
vmware-modules-271.1.ebuild:
|
||||
Use udev.eclass and udev_dorules to install rules into correct directory wrt
|
||||
#433912 by Martin von Gagern
|
||||
|
||||
*vmware-modules-271.1 (09 Dec 2012)
|
||||
|
||||
09 Dec 2012; Vadim Kuznetsov vadimk@gentoo.org +files/271-apic.patch,
|
||||
+files/271-makefile-include.patch, +files/271-makefile-kernel-dir.patch,
|
||||
+files/271-netdevice.patch, +files/271-vmmon.patch,
|
||||
+vmware-modules-271.1.ebuild:
|
||||
vmware desktop 9.0.1 version bump.bugs 432918, 443022
|
||||
|
||||
*vmware-modules-238.6 (17 Jun 2012)
|
||||
*vmware-modules-264.4 (17 Jun 2012)
|
||||
|
||||
17 Jun 2012; Vadim Kuznetsov vadimk@gentoo.org +vmware-modules-238.6.ebuild,
|
||||
+vmware-modules-264.4.ebuild, -vmware-modules-238.5-r1.ebuild,
|
||||
-vmware-modules-264.3.ebuild:
|
||||
bump vmware desktop. bug 421269
|
||||
|
||||
01 Jun 2012; Zac Medico <zmedico@gentoo.org> vmware-modules-238.5-r1.ebuild,
|
||||
vmware-modules-264.3.ebuild:
|
||||
inherit user for enewgroup
|
||||
|
||||
24 May 2012; Vadim Kuznetsov vadimk@gentoo.org +files/238-d-make-root.patch,
|
||||
vmware-modules-238.5-r1.ebuild:
|
||||
Andrew Dean's patch of 238 vmware modules for 3.4.0 kernel. Bug 411853
|
||||
|
||||
22 May 2012; Vadim Kuznetsov vadimk@gentoo.org +files/264-d-make-root.patch,
|
||||
vmware-modules-264.3.ebuild:
|
||||
d_make_root patch for 3.4 kernel. Bug 411853.
|
||||
|
||||
07 May 2012; Vadim Kuznetsov vadimk@gentoo.org +files/264-apic.patch:
|
||||
missing patch. Bug 414831
|
||||
|
||||
*vmware-modules-264.3 (05 May 2012)
|
||||
|
||||
05 May 2012; Vadim Kuznetsov vadimk@gentoo.org +vmware-modules-264.3.ebuild,
|
||||
-files/264.2-3.2.0.patch, -vmware-modules-264.2-r1.ebuild,
|
||||
files/264-3.2.0.patch, metadata.xml:
|
||||
VMware desktop build 703057
|
||||
|
||||
*vmware-modules-264.2-r1 (26 Mar 2012)
|
||||
*vmware-modules-238.5-r1 (26 Mar 2012)
|
||||
|
||||
26 Mar 2012; Vadim Kuznetsov vadimk@gentoo.org
|
||||
+vmware-modules-238.5-r1.ebuild, +vmware-modules-264.2-r1.ebuild,
|
||||
-vmware-modules-238.5.ebuild, -vmware-modules-264.2.ebuild:
|
||||
udev rules moved to /lib/udev/rules.d
|
||||
|
||||
24 Mar 2012; Vadim Kuznetsov <vadimk@gentoo.org> +files/hardened.patch,
|
||||
-vmware-modules-264.1.ebuild, vmware-modules-264.2.ebuild:
|
||||
patch for hardened
|
||||
|
||||
12 Mar 2012; Vadim Kuznetsov <vadimk@gentoo.org> +files/264.2-3.2.0.patch:
|
||||
missing patch
|
||||
|
||||
*vmware-modules-264.2 (10 Mar 2012)
|
||||
|
||||
10 Mar 2012; Vadim Kuznetsov <vadimk@gentoo.org> +vmware-modules-264.2.ebuild:
|
||||
vmware desktop version bump
|
||||
|
||||
10 Jan 2012; Vadim Kuznetsov <vadimk@gentoo.org> +files/238-3.2.0.patch,
|
||||
+files/238-netdevice.patch, vmware-modules-238.5.ebuild:
|
||||
patches for 3.1.x and 3.2 kernels. Bug 395305
|
||||
|
||||
06 Jan 2012; Vadim Kuznetsov <vadimk@gentoo.org> files/264-3.2.0.patch:
|
||||
fixed patch for 3.2.0 kernel . Bug 397733.
|
||||
|
||||
06 Jan 2012; Vadim Kuznetsov <vadimk@gentoo.org> +files/264-3.2.0.patch,
|
||||
vmware-modules-264.1.ebuild:
|
||||
added patch for 3.2 kernel
|
||||
|
||||
05 Dec 2011; Vadim Kuznetsov <vadimk@gentoo.org>
|
||||
-files/1.0.0.25-autoconf-generated.patch,
|
||||
-files/1.0.0.25-makefile-include.patch,
|
||||
-files/1.0.0.25-makefile-kernel-dir.patch, -files/1.0.0.25-sema.patch,
|
||||
-vmware-modules-1.0.0.25-r3.ebuild, -files/1.0.0.25-sk_sleep.patch,
|
||||
-vmware-modules-1.0.0.25-r4.ebuild, -files/1.0.0.25-unlocked_ioctl.patch,
|
||||
-files/sched_h-2.6.32.patch, -files/apic.patch:
|
||||
removed old version. bug 385727.
|
||||
|
||||
*vmware-modules-264.1 (03 Dec 2011)
|
||||
|
||||
03 Dec 2011; Vadim Kuznetsov <vadimk@gentoo.org> +files/264-jobserver.patch,
|
||||
+files/264-makefile-include.patch, +files/264-netdevice.patch,
|
||||
+vmware-modules-264.1.ebuild, +files/264-makefile-kernel-dir.patch:
|
||||
vmware desktop version bump
|
||||
|
||||
19 Oct 2011; Vadim Kuznetsov <vadimk@gentoo.org> -files/208-sema.patch,
|
||||
-files/208-sk_sleep.patch, -files/208-unlocked_ioctl.patch,
|
||||
-vmware-modules-208.2.ebuild:
|
||||
208 vmware modules removed
|
||||
|
||||
17 Oct 2011; Vadim Kuznetsov <vadimk@gentoo.org>
|
||||
-vmware-modules-238.4.ebuild, -vmware-modules-238.4-r1.ebuild:
|
||||
cleanup
|
||||
|
||||
*vmware-modules-238.5 (08 Oct 2011)
|
||||
|
||||
08 Oct 2011; Vadim Kuznetsov <vadimk@gentoo.org>
|
||||
+vmware-modules-238.5.ebuild:
|
||||
version bump
|
||||
|
||||
*vmware-modules-238.4-r1 (04 Sep 2011)
|
||||
|
||||
04 Sep 2011; Vadim Kuznetsov <vadimk@gentoo.org> +files/238-2.6.39.patch,
|
||||
+vmware-modules-238.4-r1.ebuild:
|
||||
Bug 368139
|
||||
|
||||
18 Jul 2011; Vadim Kuznetsov <vadimk@gentoo.org>
|
||||
-vmware-modules-238.3-r8.ebuild:
|
||||
bug 374599
|
||||
|
||||
*vmware-modules-238.4 (15 Apr 2011)
|
||||
|
||||
15 Apr 2011; Vadim Kuznetsov <vadimk@gentoo.org>
|
||||
+vmware-modules-238.4.ebuild:
|
||||
version bump
|
||||
|
||||
09 Apr 2011; Vadim Kuznetsov <vadimk@gentoo.org>
|
||||
-files/1.0.0.24-autoconf-generated.patch,
|
||||
-files/1.0.0.24-kernel-2.6.29.patch, -files/1.0.0.24-kernel-2.6.30.patch,
|
||||
-files/1.0.0.24-makefile-kernel-dir.patch, -files/1.0.0.24-sema.patch,
|
||||
-files/1.0.0.24-sk_sleep.patch, -files/1.0.0.24-vmnet-2.6.31.patch,
|
||||
-files/1.0.0.24-unlocked_ioctl.patch, -vmware-modules-1.0.0.24-r3.ebuild:
|
||||
1.0.0.24 is replaced by 208.2
|
||||
|
||||
30 Mar 2011; Vadim Kuznetsov <vadimk@gentoo.org> files/208-sema.patch:
|
||||
corrected sema patch
|
||||
|
||||
*vmware-modules-208.2 (27 Mar 2011)
|
||||
|
||||
27 Mar 2011; Vadim Kuznetsov <vadimk@gentoo.org> +files/208-sema.patch,
|
||||
+files/208-sk_sleep.patch, +files/208-unlocked_ioctl.patch,
|
||||
+vmware-modules-208.2.ebuild:
|
||||
vmware kernel modules for vmware server 2 host
|
||||
|
||||
*vmware-modules-238.3-r8 (27 Mar 2011)
|
||||
|
||||
27 Mar 2011; Vadim Kuznetsov <vadimk@gentoo.org> +files/238-jobserver.patch,
|
||||
+files/238-makefile-include.patch, +files/238-makefile-kernel-dir.patch,
|
||||
+files/238-sema.patch, +files/238-unlocked_ioctl.patch,
|
||||
+vmware-modules-238.3-r8.ebuild:
|
||||
vmware kernel modules of the vmware player 3.1.3 or workstation 7.1.3 host
|
||||
|
||||
*vmware-modules-1.0.0.25-r4 (18 Mar 2011)
|
||||
|
||||
18 Mar 2011; Vadim Kuznetsov <vadimk@gentoo.org>
|
||||
+vmware-modules-1.0.0.25-r4.ebuild:
|
||||
BKL check, updated udev rules, better sed
|
||||
|
||||
16 Mar 2011; Vadim Kuznetsov <vadimk@gentoo.org>
|
||||
vmware-modules-1.0.0.24-r3.ebuild, vmware-modules-1.0.0.25-r3.ebuild:
|
||||
patched for 2.6.38
|
||||
|
||||
16 Mar 2011; Vadim Kuznetsov <vadimk@gentoo.org>
|
||||
-vmware-modules-1.0.0.25-r1.ebuild,
|
||||
cleanup
|
||||
|
||||
16 Mar 2011; Vadim Kuznetsov <vadimk@gentoo.org>
|
||||
-files/patches/000_all_makefile-include-directory.patch,
|
||||
-files/patches/020_all_epoll-def-warnings.patch,
|
||||
-vmware-modules-1.0.0.15-r2.ebuild,
|
||||
-files/patches/vmmon/035_all_kernel-2.6.25.patch,
|
||||
-files/patches/vmmon/040_all_kernel-2.6.27.patch,
|
||||
-files/patches/vmnet/021_all_wireless_fix.patch,
|
||||
-files/patches/vmblock/010_all_kernel-2.6.25.patch,
|
||||
-files/patches/vmnet/025_all_kernel-2.6.25.patch,
|
||||
-files/patches/vmnet/030_all_kernel-2.6.27.patch,
|
||||
-files/patches/vmmon/030_all_fix-linux-headers.patch:
|
||||
Bug 354383
|
||||
|
||||
17 Feb 2011; Thomas Kahle <tomka@gentoo.org>
|
||||
vmware-modules-1.0.0.25-r3.ebuild:
|
||||
x86 stable per bug 352421
|
||||
|
||||
11 Feb 2011; Vadim Kuznetsov <vadimk@gentoo.org>
|
||||
vmware-modules-1.0.0.15-r2.ebuild:
|
||||
back to testing
|
||||
|
||||
11 Feb 2011; Vadim Kuznetsov <vadimk@gentoo.org>
|
||||
-vmware-modules-1.0.0.24-r1.ebuild, -vmware-modules-1.0.0.24-r2.ebuild,
|
||||
-vmware-modules-1.0.0.25-r2.ebuild:
|
||||
clean up
|
||||
|
||||
11 Feb 2011; Vadim Kuznetsov <vadimk@gentoo.org>
|
||||
-vmware-modules-1.0.0.15-r1.ebuild:
|
||||
clean up
|
||||
|
||||
25 Jan 2011; Markos Chandras <hwoarang@gentoo.org>
|
||||
vmware-modules-1.0.0.25-r3.ebuild:
|
||||
Stable on amd64 wrt bug #352421
|
||||
|
||||
*vmware-modules-1.0.0.24-r3 (15 Jan 2011)
|
||||
|
||||
15 Jan 2011; Vadim Kuznetsov <vadimk@gentoo.org> +files/1.0.0.24-sema.patch,
|
||||
+vmware-modules-1.0.0.24-r3.ebuild:
|
||||
Bugs 345145, 351592.
|
||||
Thanks Mateusz Dziadko, c1pher.
|
||||
|
||||
*vmware-modules-1.0.0.25-r3 (13 Jan 2011)
|
||||
|
||||
13 Jan 2011; Vadim Kuznetsov <vadimk@gentoo.org> +files/1.0.0.25-sema.patch,
|
||||
+vmware-modules-1.0.0.25-r3.ebuild:
|
||||
Bug 345145 and 349649 and 351592
|
||||
Thanks to Mateusz Dziadko, Dane Smith and bugs et al.
|
||||
|
||||
*vmware-modules-1.0.0.24-r2 (21 Nov 2010)
|
||||
|
||||
21 Nov 2010; Vadim Kuznetsov <vadimk@gentoo.org>
|
||||
+files/1.0.0.24-unlocked_ioctl.patch, +vmware-modules-1.0.0.24-r2.ebuild,
|
||||
vmware-modules-1.0.0.25-r2.ebuild:
|
||||
unlocked_ioctl patch
|
||||
|
||||
*vmware-modules-1.0.0.25-r2 (21 Nov 2010)
|
||||
|
||||
21 Nov 2010; Vadim Kuznetsov <vadimk@gentoo.org>
|
||||
+files/1.0.0.25-unlocked_ioctl.patch, +vmware-modules-1.0.0.25-r2.ebuild:
|
||||
updated unlocked_ioctl patch
|
||||
|
||||
21 Nov 2010; Vadim Kuznetsov <vadimk@gentoo.org>
|
||||
-files/1.0.0.26-ioctl-2.6.36.patch, -files/1.0.0.26-iommu_map.patch,
|
||||
-files/1.0.0.26-makefile-include.patch,
|
||||
-files/1.0.0.26-makefile-kernel-dir.patch, -files/1.0.0.26-sk_sleep.patch,
|
||||
-vmware-modules-1.0.0.26.ebuild:
|
||||
replaced by vmware-modules-235 (in overlay)
|
||||
|
||||
05 Nov 2010; Fabio Erculiani <lxnay@gentoo.org>
|
||||
vmware-modules-1.0.0.25-r1.ebuild, vmware-modules-1.0.0.26.ebuild,
|
||||
+files/1.0.0.26-ioctl-2.6.36.patch:
|
||||
add 2.6.36 Linux kernel support
|
||||
|
||||
04 Aug 2010; Vadim Kuznetsov <vadimk@gentoo.org>
|
||||
+files/1.0.0.24-sk_sleep.patch, vmware-modules-1.0.0.24-r1.ebuild,
|
||||
+files/1.0.0.25-sk_sleep.patch, vmware-modules-1.0.0.25-r1.ebuild,
|
||||
+files/1.0.0.26-iommu_map.patch, vmware-modules-1.0.0.26.ebuild,
|
||||
+files/1.0.0.26-sk_sleep.patch:
|
||||
patches for 2.6.35 kernel. Bug 322245, Bug 330019
|
||||
|
||||
03 May 2010; Vadim Kuznetsov <vadimk@gentoo.org>
|
||||
vmware-modules-1.0.0.25-r1.ebuild, vmware-modules-1.0.0.26.ebuild,
|
||||
+files/apic.patch:
|
||||
Bugs 274529, 317583
|
||||
Thanks to Mikhail Zolotaryov for the patch.
|
||||
|
||||
*vmware-modules-1.0.0.26 (28 Feb 2010)
|
||||
|
||||
28 Feb 2010; Vadim Kuznetsov <vadimk@gentoo.org>
|
||||
+files/1.0.0.26-makefile-include.patch, -vmware-modules-1.0.0.25.ebuild,
|
||||
+files/1.0.0.26-makefile-kernel-dir.patch,
|
||||
+vmware-modules-1.0.0.26.ebuild:
|
||||
vmware-modules for VMware Workstation 7.0.x and Player 3.0.x
|
||||
|
||||
26 Feb 2010; Vadim Kuznetsov <vadimk@gentoo.org>
|
||||
+files/1.0.0.24-autoconf-generated.patch,
|
||||
vmware-modules-1.0.0.24-r1.ebuild,
|
||||
+files/1.0.0.25-autoconf-generated.patch,
|
||||
vmware-modules-1.0.0.25-r1.ebuild:
|
||||
Bug 301320
|
||||
|
||||
*vmware-modules-1.0.0.25-r1 (13 Feb 2010)
|
||||
|
||||
13 Feb 2010; Patrick Lauer <patrick@gentoo.org>
|
||||
+vmware-modules-1.0.0.25-r1.ebuild:
|
||||
Small fix for header changes in 2.6.33 and later
|
||||
|
||||
02 Jan 2010; Vadim Kuznetsov <vadimk@gentoo.org>
|
||||
-vmware-modules-1.0.0.24.ebuild, vmware-modules-1.0.0.24-r1.ebuild,
|
||||
vmware-modules-1.0.0.25.ebuild, +files/sched_h-2.6.32.patch:
|
||||
Bug 295955
|
||||
|
||||
30 Oct 2009; Vadim Kuznetsov vadimk@gentoo.org
|
||||
-files/1.0.0.23-makefile-kernel-dir.patch,
|
||||
-vmware-modules-1.0.0.23.ebuild, -vmware-modules-1.0.0.23-r1.ebuild,
|
||||
-files/1.0.0.23-r1-kernel-2.6.29.patch:
|
||||
cleanup
|
||||
|
||||
25 Sep 2009; Markus Meier <maekke@gentoo.org>
|
||||
vmware-modules-1.0.0.25.ebuild:
|
||||
amd64 stable, bug #282213
|
||||
|
||||
*vmware-modules-1.0.0.24-r1 (22 Sep 2009)
|
||||
|
||||
22 Sep 2009; Vadim Kuznetsov vadimk@gentoo.org
|
||||
+vmware-modules-1.0.0.24-r1.ebuild, +files/1.0.0.24-vmnet-2.6.31.patch:
|
||||
vmnet patch for 2.6.31 kernel. Bug 274173, comment 15.
|
||||
|
||||
02 Sep 2009; Vadim Kuznetsov vadimk@gentoo.org
|
||||
-files/patches/vmmon/050_all_kernel-2.6.29.patch,
|
||||
-files/patches/vmnet/040_all_kernel-2.6.29.patch:
|
||||
revert previous commit. Bug 273173
|
||||
|
||||
28 Aug 2009; Vadim Kuznetsov vadimk@gentoo.org
|
||||
+files/patches/vmmon/050_all_kernel-2.6.29.patch,
|
||||
+files/patches/vmnet/040_all_kernel-2.6.29.patch:
|
||||
bugs 264098, 273173. 1.0.0.15-r2 patches suggested in 272173
|
||||
|
||||
25 Aug 2009; Christian Faulhammer <fauli@gentoo.org>
|
||||
vmware-modules-1.0.0.25.ebuild:
|
||||
stable x86, security bug 282213
|
||||
|
||||
*vmware-modules-1.0.0.25 (22 Aug 2009)
|
||||
|
||||
22 Aug 2009; Vadim Kuznetsov vadimk@gentoo.org
|
||||
+files/1.0.0.25-makefile-include.patch, +vmware-modules-1.0.0.25.ebuild,
|
||||
+files/1.0.0.25-makefile-kernel-dir.patch:
|
||||
Version bump. modules for vmware-{workstation,player}-{6.2}.5.3
|
||||
|
||||
03 Jul 2009; Jeroen Roovers <jer@gentoo.org> metadata.xml:
|
||||
Fix e-mail address.
|
||||
|
||||
*vmware-modules-1.0.0.24 (14 Jun 2009)
|
||||
|
||||
14 Jun 2009; Vadim Kuznetsov vadimk@gentoo.org
|
||||
+vmware-modules-1.0.0.24.ebuild, +files/1.0.0.24-kernel-2.6.29.patch,
|
||||
+files/1.0.0.24-kernel-2.6.30.patch,
|
||||
+files/1.0.0.24-makefile-kernel-dir.patch, metadata.xml:
|
||||
Bugs 268099, 270150, 273750. New ebuild without vmware-mod eclass.
|
||||
|
||||
*vmware-modules-1.0.0.23-r1 (16 May 2009)
|
||||
|
||||
16 May 2009; Mike Auty <ikelos@gentoo.org>
|
||||
+vmware-modules-1.0.0.23-r1.ebuild,
|
||||
+files/1.0.0.23-r1-kernel-2.6.29.patch:
|
||||
Version bump vmware-modules for 2.6.29 support.
|
||||
|
||||
22 Feb 2009; Mike Auty <ikelos@gentoo.org>
|
||||
-files/1.0.0.20-vmblock-2.6.26-2.patch,
|
||||
-files/1.0.0.20-makefile-kernel-dir.patch,
|
||||
-files/1.0.0.20-vmblock-2.6.26-1.patch,
|
||||
-files/1.0.0.20-vmmon-2.6.26.patch, -files/1.0.0.20-vmnet-2.6.26.patch,
|
||||
-files/1.0.0.22-makefile-kernel-dir.patch,
|
||||
-vmware-modules-1.0.0.20.ebuild, -vmware-modules-1.0.0.22.ebuild:
|
||||
Clear out old versions of vmware-modules that are no longer needed due to
|
||||
the removal of insecure versions of vmware products (bug 245941).
|
||||
|
||||
14 Jan 2009; Mike Auty <ikelos@gentoo.org>
|
||||
files/patches/vmnet/030_all_kernel-2.6.27.patch:
|
||||
Third time lucky, more patches for < 2.6.26 kernels.
|
||||
|
||||
14 Jan 2009; Mike Auty <ikelos@gentoo.org>
|
||||
files/patches/vmnet/030_all_kernel-2.6.27.patch:
|
||||
Add patch to try and fix bug 254768.
|
||||
|
||||
12 Jan 2009; Mike Auty <ikelos@gentoo.org> Manifest:
|
||||
Fix up vmware-modules-1.0.0.15 patches for kernels older than 2.6.27.
|
||||
|
||||
12 Jan 2009; Markus Meier <maekke@gentoo.org>
|
||||
vmware-modules-1.0.0.23.ebuild:
|
||||
amd64/x86 stable, bug #245941
|
||||
|
||||
11 Jan 2009; Markus Meier <maekke@gentoo.org>
|
||||
vmware-modules-1.0.0.15-r2.ebuild:
|
||||
amd64/x86 stable, bug #236167
|
||||
|
||||
10 Jan 2009; Mike Auty <ikelos@gentoo.org>
|
||||
-files/1.0.0.17-update115-nasty-hack.patch,
|
||||
-vmware-modules-1.0.0.16-r1.ebuild, -vmware-modules-1.0.0.17.ebuild,
|
||||
-vmware-modules-1.0.0.17-r1.ebuild:
|
||||
Clear out old modules for products no longer in the tree.
|
||||
|
||||
*vmware-modules-1.0.0.15-r2 (10 Jan 2009)
|
||||
|
||||
10 Jan 2009; Mike Auty <ikelos@gentoo.org>
|
||||
+files/patches/vmmon/040_all_kernel-2.6.27.patch,
|
||||
+files/patches/vmnet/030_all_kernel-2.6.27.patch,
|
||||
+vmware-modules-1.0.0.15-r2.ebuild:
|
||||
Add in vmware-modules-1.0.0.15-r2. Should compile on kernels up to and
|
||||
including 2.6.28, big thanks go to Tim Yamin for help with the patches.
|
||||
|
||||
*vmware-modules-1.0.0.23 (09 Nov 2008)
|
||||
|
||||
09 Nov 2008; Mike Auty <ikelos@gentoo.org>
|
||||
+files/1.0.0.23-makefile-kernel-dir.patch, vmware-modules-1.0.0.20.ebuild,
|
||||
vmware-modules-1.0.0.22.ebuild, +vmware-modules-1.0.0.23.ebuild:
|
||||
Add in vmware-modules-1.0.0.23 for vmware-workstation-6.5 and
|
||||
vmware-player-2.5.
|
||||
|
||||
*vmware-modules-1.0.0.22 (30 Sep 2008)
|
||||
|
||||
30 Sep 2008; Mike Auty <ikelos@gentoo.org>
|
||||
+files/1.0.0.20-vmblock-2.6.26-1.patch,
|
||||
+files/1.0.0.20-vmblock-2.6.26-2.patch,
|
||||
+files/1.0.0.20-vmmon-2.6.26.patch,
|
||||
+files/1.0.0.22-makefile-kernel-dir.patch,
|
||||
+files/1.0.0.20-vmnet-2.6.26.patch, -vmware-modules-1.0.0.11-r1.ebuild,
|
||||
-vmware-modules-1.0.0.13-r1.ebuild, vmware-modules-1.0.0.20.ebuild,
|
||||
+vmware-modules-1.0.0.22.ebuild:
|
||||
Remove old unused versions, fix up 1.0.0.20 bugs and put in a new version
|
||||
for workstation 6.0.5 and player 2.0.5.
|
||||
|
||||
18 Jun 2008; Mike Auty <ikelos@gentoo.org>
|
||||
+files/1.0.0.20-makefile-kernel-dir.patch, vmware-modules-1.0.0.20.ebuild:
|
||||
Fix kernel build directories (bug 227941).
|
||||
|
||||
*vmware-modules-1.0.0.20 (14 Jun 2008)
|
||||
|
||||
14 Jun 2008; Mike Auty <ikelos@gentoo.org> +vmware-modules-1.0.0.20.ebuild:
|
||||
Add in vmware-modules-1.0.0.20 for workstation 6.0.4 and player 2.0.4.
|
||||
|
||||
26 Apr 2008; Mike Auty <ikelos@gentoo.org>
|
||||
+files/patches/vmblock/010_all_kernel-2.6.25.patch,
|
||||
+files/patches/vmmon/035_all_kernel-2.6.25.patch,
|
||||
+files/patches/vmnet/025_all_kernel-2.6.25.patch:
|
||||
Add patches for -r1 ebuilds to ensure they work on 2.6.25 and older
|
||||
kernels.
|
||||
|
||||
31 Jan 2008; Mike Auty <ikelos@gentoo.org> ChangeLog:
|
||||
Re-sign digestless manifest.
|
||||
|
||||
*vmware-modules-1.0.0.17-r1 (26 Jan 2008)
|
||||
|
||||
26 Jan 2008; Mike Auty <ikelos@gentoo.org>
|
||||
+files/1.0.0.17-update115-nasty-hack.patch,
|
||||
+files/patches/vmmon/030_all_fix-linux-headers.patch,
|
||||
+files/patches/vmnet/021_all_wireless_fix.patch,
|
||||
+vmware-modules-1.0.0.17-r1.ebuild:
|
||||
Bump vmware-modules to any-any115, and apply fixes for wireless and 2.6.24.
|
||||
|
||||
25 Nov 2007; Mike Auty <ikelos@gentoo.org>
|
||||
-files/1.0.0.16-kernel-2.6.22.patch, -vmware-modules-1.0.0.16.ebuild,
|
||||
vmware-modules-1.0.0.17.ebuild:
|
||||
Bump to vmware-any-any-update114. Also update 1.0.0.17 to use the latest
|
||||
vmware-player package.
|
||||
|
||||
14 Oct 2007; Mike Auty <ikelos@gentoo.org>
|
||||
vmware-modules-1.0.0.16-r1.ebuild:
|
||||
Add vmblock module building to vmware-modules-1.0.0.16-r1
|
||||
|
||||
*vmware-modules-1.0.0.17 (14 Oct 2007)
|
||||
|
||||
14 Oct 2007; Mike Auty <ikelos@gentoo.org> vmware-modules-1.0.0.16.ebuild,
|
||||
+vmware-modules-1.0.0.17.ebuild:
|
||||
Add the latest modules for vmware-workstation-6.0.1
|
||||
|
||||
*vmware-modules-1.0.0.16-r1 (16 Sep 2007)
|
||||
|
||||
16 Sep 2007; Mike Auty <ikelos@gentoo.org>
|
||||
-files/1.0.0.15-gcc4-ignore-pedantic-errors.patch,
|
||||
+vmware-modules-1.0.0.16-r1.ebuild:
|
||||
Adding in vmware-modules-1.0.0.16-r1, now that vmware-any-any-update can
|
||||
handle workstation 6. Also cleaned out an old patch for 1.0.0.15.
|
||||
|
||||
28 Jul 2007; Mike Auty <ikelos@gentoo.org>
|
||||
+files/1.0.0.16-kernel-2.6.22.patch, vmware-modules-1.0.0.16.ebuild:
|
||||
Redigest for vmware-any-any-update112.
|
||||
|
||||
12 Jul 2007; Chris Gianelloni <wolf31o2@gentoo.org>
|
||||
-vmware-modules-1.0.0.11.ebuild, vmware-modules-1.0.0.11-r1.ebuild,
|
||||
-vmware-modules-1.0.0.13.ebuild, vmware-modules-1.0.0.13-r1.ebuild:
|
||||
Marking 1.0.0.11-r1 and 1.0.0.13-r1 stable on amd64/x86 since the changes
|
||||
from the previous ebuilds is just the placement of a variable, and the
|
||||
current stable versions didn't work properly.
|
||||
|
||||
*vmware-modules-1.0.0.16 (24 Jun 2007)
|
||||
|
||||
24 Jun 2007; Mike Auty <ikelos@gentoo.org>
|
||||
+vmware-modules-1.0.0.16.ebuild:
|
||||
Add in the latest modules for vmware-player-2 and vmware-workstation-6.
|
||||
|
||||
28 Apr 2007; Mike Auty <ikelos@gentoo.org>
|
||||
-files/patches/010_all_makefile-vm-build-no-unused-warnings.patch:
|
||||
Remove unnecessary patch, that's now part of any-any109.
|
||||
|
||||
28 Apr 2007; Mike Auty <ikelos@gentoo.org>
|
||||
files/digest-vmware-modules-1.0.0.11,
|
||||
files/digest-vmware-modules-1.0.0.11-r1,
|
||||
files/digest-vmware-modules-1.0.0.13,
|
||||
files/digest-vmware-modules-1.0.0.13-r1,
|
||||
files/digest-vmware-modules-1.0.0.15-r1, Manifest:
|
||||
Redigest for vmware-any-any109.
|
||||
|
||||
04 Mar 2007; Mike Auty <ikelos@gentoo.org>
|
||||
-vmware-modules-1.0.0.15.ebuild:
|
||||
Bump vmware-any-any to 108. Remove old vmware-server module ebuild.
|
||||
|
||||
05 Feb 2007; Mike Auty <ikelos@gentoo.org>
|
||||
vmware-modules-1.0.0.15-r1.ebuild:
|
||||
Vmware-any-any bump to support 2.6.20 and fix a copyright date.
|
||||
|
||||
17 Dec 2006; Mike Frysinger <vapier@gentoo.org>
|
||||
+files/patches/010_all_makefile-vm-build-no-unused-warnings.patch,
|
||||
+files/patches/020_all_epoll-def-warnings.patch:
|
||||
Fix building with newer kernels #146004.
|
||||
|
||||
01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
|
||||
vmware-modules-1.0.0.15-r1.ebuild:
|
||||
Stable on amd64/x86 for vmware-workstation-5.5.3.
|
||||
|
||||
01 Dec 2006; Mike Auty <ikelos@gentoo.org>
|
||||
files/digest-vmware-modules-1.0.0.11,
|
||||
files/digest-vmware-modules-1.0.0.11-r1,
|
||||
files/digest-vmware-modules-1.0.0.13,
|
||||
files/digest-vmware-modules-1.0.0.13-r1,
|
||||
files/digest-vmware-modules-1.0.0.15-r1, Manifest:
|
||||
Redigest for vmware-any-any105.
|
||||
|
||||
30 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
|
||||
-vmware-modules-1.0.0.8.ebuild:
|
||||
Removed verion 0.0.8 since we have removed the only VMware product (VMware
|
||||
Workstation 3.2.1) that used it.
|
||||
|
||||
*vmware-modules-1.0.0.15-r1 (17 Oct 2006)
|
||||
*vmware-modules-1.0.0.13-r1 (17 Oct 2006)
|
||||
*vmware-modules-1.0.0.11-r1 (17 Oct 2006)
|
||||
|
||||
17 Oct 2006; Mike Auty <ikelos@gentoo.org>
|
||||
+vmware-modules-1.0.0.11-r1.ebuild, +vmware-modules-1.0.0.13-r1.ebuild,
|
||||
+vmware-modules-1.0.0.15-r1.ebuild:
|
||||
Version bump for all vmware-modules to fix for bug 149679, thanks to Jason
|
||||
Urbank.
|
||||
|
||||
22 Sep 2006; Mike Auty <ikelos@gentoo.org>
|
||||
files/patches/000_all_makefile-include-directory.patch:
|
||||
Updated patch fixing bug #148613, thanks to Alon Bar-Lev.
|
||||
|
||||
13 Sep 2006; Mike Auty <ikelos@gentoo.org>
|
||||
+files/1.0.0.15-gcc4-ignore-pedantic-errors.patch,
|
||||
vmware-modules-1.0.0.15.ebuild:
|
||||
Add a patch to fix compilation against kernels <= 2.6.16 with gcc-4.1.
|
||||
Closes bug #146004.
|
||||
|
||||
28 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org>
|
||||
vmware-modules-1.0.0.8.ebuild:
|
||||
Stable on x86 for vmware-workstation.
|
||||
|
||||
27 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org>
|
||||
vmware-modules-1.0.0.11.ebuild:
|
||||
Stable on amd64 and x86 for vmware-workstation.
|
||||
|
||||
25 Aug 2006; Mike Auty <ikelos@gentoo.org>
|
||||
files/digest-vmware-modules-1.0.0.8, files/digest-vmware-modules-1.0.0.11,
|
||||
files/digest-vmware-modules-1.0.0.13, Manifest:
|
||||
Redigested for vmware-any-any-update104.
|
||||
|
||||
22 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org>
|
||||
vmware-modules-1.0.0.13.ebuild:
|
||||
Stable on amd64 and x86 for vmware-workstation and vmware-player.
|
||||
|
||||
19 Aug 2006; Mike Auty <ikelos@gentoo.org> vmware-modules-1.0.0.15.ebuild:
|
||||
Update vmware-modules to use the latest vmware-server package.
|
||||
|
||||
08 Aug 2006; Mike Auty <ikelos@gentoo.org>
|
||||
files/digest-vmware-modules-1.0.0.8, files/digest-vmware-modules-1.0.0.11,
|
||||
files/digest-vmware-modules-1.0.0.13, Manifest:
|
||||
Make use of vmware-any-any103, which fixes kernel problems on 2.6.18, and
|
||||
also two patches for problems with the kernel build system, thanks to Georgi
|
||||
Georgiev <chutz (at) gg3.net> and Alon Bar-Lev <alon.barlev (at) gmail.com>.
|
||||
Closes bug #142855.
|
||||
|
||||
*vmware-modules-1.0.0.13 (31 Jul 2006)
|
||||
*vmware-modules-1.0.0.11 (31 Jul 2006)
|
||||
*vmware-modules-1.0.0.8 (31 Jul 2006)
|
||||
|
||||
31 Jul 2006; Mike Auty <ikelos@gentoo.org> +vmware-modules-1.0.0.8.ebuild,
|
||||
+vmware-modules-1.0.0.11.ebuild, +vmware-modules-1.0.0.13.ebuild,
|
||||
vmware-modules-1.0.0.15.ebuild:
|
||||
Add in vmware-modules for workstation and player products.
|
||||
|
||||
*vmware-modules-1.0.0.15 (31 Jul 2006)
|
||||
|
||||
31 Jul 2006; Mike Auty <ikelos@gentoo.org>
|
||||
+files/patches/000_all_makefile-include-directory.patch, +metadata.xml,
|
||||
+vmware-modules-1.0.0.15.ebuild:
|
||||
Initial commit of vmware-modules, as used by several vmware-packages.
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- vmci-only/linux/driver.c.orig 2014-04-15 01:41:40.000000000 +0400
|
||||
+++ vmci-only/linux/driver.c 2014-08-06 14:57:29.000000000 +0400
|
||||
@@ -737,7 +737,7 @@
|
||||
goto init_release;
|
||||
}
|
||||
|
||||
- user = current_uid();
|
||||
+ user = current_uid().val;
|
||||
retval = VMCIContext_InitContext(initBlock.cid, initBlock.flags,
|
||||
0 /* Unused */, vmciLinux->userVersion,
|
||||
&user, &vmciLinux->context);
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
--- vmblock-only/linux/inode.c.orig 2014-08-06 13:28:35.000000000 +0400
|
||||
+++ vmblock-only/linux/inode.c 2014-08-06 14:05:54.000000000 +0400
|
||||
@@ -177,7 +177,11 @@
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 14, 99)
|
||||
return vfs_readlink(dentry, buffer, buflen, iinfo->name);
|
||||
+#else
|
||||
+ return readlink_copy(buffer, buflen, iinfo->name);
|
||||
+#endif
|
||||
}
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
diff -rupN vsock-only/linux/af_vsock.c vsock-only-mod/linux/af_vsock.c
|
||||
--- vsock-only/linux/af_vsock.c 2014-04-15 03:11:41.000000000 +0530
|
||||
+++ vsock-only-mod/linux/af_vsock.c 2014-05-27 21:39:51.081284121 +0530
|
||||
@@ -2869,7 +2869,8 @@ __VSockVmciCreate(struct net *net,
|
||||
vsk->connectTimeout = psk->connectTimeout;
|
||||
} else {
|
||||
vsk->trusted = capable(CAP_NET_ADMIN);
|
||||
- vsk->owner = current_uid();
|
||||
+ kuid_t kern_uid = current_uid();
|
||||
+ vsk->owner = kern_uid.val;
|
||||
vsk->queuePairSize = VSOCK_DEFAULT_QP_SIZE;
|
||||
vsk->queuePairMinSize = VSOCK_DEFAULT_QP_SIZE_MIN;
|
||||
vsk->queuePairMaxSize = VSOCK_DEFAULT_QP_SIZE_MAX;
|
||||
diff -rupN vsock-only/linux/notify.c vsock-only-mod/linux/notify.c
|
||||
--- vsock-only/linux/notify.c 2014-04-15 03:11:41.000000000 +0530
|
||||
+++ vsock-only-mod/linux/notify.c 2014-05-27 21:36:56.713291909 +0530
|
||||
@@ -516,7 +516,7 @@ VSockVmciHandleWrote(struct sock *sk,
|
||||
PKT_FIELD(vsk, sentWaitingRead) = FALSE;
|
||||
#endif
|
||||
|
||||
- sk->sk_data_ready(sk, 0);
|
||||
+ sk->sk_data_ready(sk);
|
||||
}
|
||||
|
||||
|
||||
diff -rupN vsock-only/linux/notifyQState.c vsock-only-mod/linux/notifyQState.c
|
||||
--- vsock-only/linux/notifyQState.c 2014-04-15 03:11:41.000000000 +0530
|
||||
+++ vsock-only-mod/linux/notifyQState.c 2014-05-27 21:38:52.561286734 +0530
|
||||
@@ -164,7 +164,7 @@ VSockVmciHandleWrote(struct sock *sk,
|
||||
struct sockaddr_vm *dst, // IN: unused
|
||||
struct sockaddr_vm *src) // IN: unused
|
||||
{
|
||||
- sk->sk_data_ready(sk, 0);
|
||||
+ sk->sk_data_ready(sk);
|
||||
}
|
||||
|
||||
|
||||
--- vsock-only/linux/notifyQState.c.orig 2014-04-15 01:41:41.000000000 +0400
|
||||
+++ vsock-only/linux/notifyQState.c 2014-08-06 15:08:43.000000000 +0400
|
||||
@@ -566,7 +566,7 @@
|
||||
}
|
||||
|
||||
/* See the comment in VSockVmciNotifyPktSendPostEnqueue */
|
||||
- sk->sk_data_ready(sk, 0);
|
||||
+ sk->sk_data_ready(sk);
|
||||
}
|
||||
|
||||
return err;
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
|
||||
index f1f4b10..c43242f 100644
|
||||
--- a/vmmon-only/linux/hostif.c
|
||||
+++ b/vmmon-only/linux/hostif.c
|
||||
@@ -55,6 +55,7 @@
|
||||
#include <linux/kthread.h>
|
||||
#include <linux/wait.h>
|
||||
|
||||
+#include <asm/apic.h>
|
||||
|
||||
#include "vmware.h"
|
||||
#include "x86apic.h"
|
||||
|
|
@ -1,91 +0,0 @@
|
|||
diff --git a/vmblock-only/linux/file.c b/vmblock-only/linux/file.c
|
||||
index d7ac1f6..5499169 100644
|
||||
--- a/vmblock-only/linux/file.c
|
||||
+++ b/vmblock-only/linux/file.c
|
||||
@@ -38,46 +38,6 @@ typedef u64 inode_num_t;
|
||||
typedef ino_t inode_num_t;
|
||||
#endif
|
||||
|
||||
-/* Specifically for our filldir_t callback */
|
||||
-typedef struct FilldirInfo {
|
||||
- filldir_t filldir;
|
||||
- void *dirent;
|
||||
-} FilldirInfo;
|
||||
-
|
||||
-
|
||||
-/*
|
||||
- *----------------------------------------------------------------------------
|
||||
- *
|
||||
- * Filldir --
|
||||
- *
|
||||
- * Callback function for readdir that we use in place of the one provided.
|
||||
- * This allows us to specify that each dentry is a symlink, but pass through
|
||||
- * everything else to the original filldir function.
|
||||
- *
|
||||
- * Results:
|
||||
- * Original filldir's return value.
|
||||
- *
|
||||
- * Side effects:
|
||||
- * Directory information gets copied to user's buffer.
|
||||
- *
|
||||
- *----------------------------------------------------------------------------
|
||||
- */
|
||||
-
|
||||
-static int
|
||||
-Filldir(void *buf, // IN: Dirent buffer passed from FileOpReaddir
|
||||
- const char *name, // IN: Dirent name
|
||||
- int namelen, // IN: len of dirent's name
|
||||
- loff_t offset, // IN: Offset
|
||||
- inode_num_t ino, // IN: Inode number of dirent
|
||||
- unsigned int d_type) // IN: Type of file
|
||||
-{
|
||||
- FilldirInfo *info = buf;
|
||||
-
|
||||
- /* Specify DT_LNK regardless */
|
||||
- return info->filldir(info->dirent, name, namelen, offset, ino, DT_LNK);
|
||||
-}
|
||||
-
|
||||
-
|
||||
/* File operations */
|
||||
|
||||
/*
|
||||
@@ -166,11 +126,10 @@ FileOpOpen(struct inode *inode, // IN
|
||||
|
||||
static int
|
||||
FileOpReaddir(struct file *file, // IN
|
||||
- void *dirent, // IN
|
||||
- filldir_t filldir) // IN
|
||||
+ struct dir_context *ctx) // IN
|
||||
{
|
||||
int ret;
|
||||
- FilldirInfo info;
|
||||
+
|
||||
struct file *actualFile;
|
||||
|
||||
if (!file) {
|
||||
@@ -184,12 +143,10 @@ FileOpReaddir(struct file *file, // IN
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
- info.filldir = filldir;
|
||||
- info.dirent = dirent;
|
||||
-
|
||||
- actualFile->f_pos = file->f_pos;
|
||||
- ret = vfs_readdir(actualFile, Filldir, &info);
|
||||
- file->f_pos = actualFile->f_pos;
|
||||
+ /* Ricky Wong Yung Fei:
|
||||
+ * Manipulation of pos is now handled internally by iterate_dir().
|
||||
+ */
|
||||
+ ret = iterate_dir(actualFile, ctx);
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -237,7 +194,7 @@ FileOpRelease(struct inode *inode, // IN
|
||||
|
||||
|
||||
struct file_operations RootFileOps = {
|
||||
- .readdir = FileOpReaddir,
|
||||
+ .iterate = FileOpReaddir,
|
||||
.open = FileOpOpen,
|
||||
.release = FileOpRelease,
|
||||
};
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
--- vmblock-only/linux/control.c.orig 2014-08-06 13:28:35.000000000 +0400
|
||||
+++ vmblock-only/linux/control.c 2014-08-06 15:35:00.000000000 +0400
|
||||
@@ -279,11 +279,17 @@
|
||||
int i;
|
||||
int retval;
|
||||
|
||||
- name = getname(buf);
|
||||
+ name = __getname();
|
||||
if (IS_ERR(name)) {
|
||||
return PTR_ERR(name);
|
||||
}
|
||||
|
||||
+ i = strncpy_from_user(name, buf, PATH_MAX);
|
||||
+ if (i < 0 || i == PATH_MAX) {
|
||||
+ __putname(name);
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
for (i = strlen(name) - 1; i >= 0 && name[i] == '/'; i--) {
|
||||
name[i] = '\0';
|
||||
}
|
||||
|
|
@ -1,113 +0,0 @@
|
|||
diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c
|
||||
index b21dd44..960c2aa 100644
|
||||
--- a/vmmon-only/linux/driver.c
|
||||
+++ b/vmmon-only/linux/driver.c
|
||||
@@ -178,7 +178,22 @@ static struct vm_operations_struct vmuser_mops = {
|
||||
#endif
|
||||
};
|
||||
|
||||
-static struct file_operations vmuser_fops;
|
||||
+static struct file_operations vmuser_fops = {
|
||||
+ .owner = THIS_MODULE,
|
||||
+ .poll = LinuxDriverPoll,
|
||||
+#ifdef HAVE_UNLOCKED_IOCTL
|
||||
+ .unlocked_ioctl = LinuxDriver_UnlockedIoctl,
|
||||
+#else
|
||||
+ .ioctl = LinuxDriver_Ioctl,
|
||||
+#endif
|
||||
+#ifdef HAVE_COMPAT_IOCTL
|
||||
+ .compat_ioctl = LinuxDriver_UnlockedIoctl,
|
||||
+#endif
|
||||
+ .open = LinuxDriver_Open,
|
||||
+ .release = LinuxDriver_Close,
|
||||
+ .mmap = LinuxDriverMmap
|
||||
+};
|
||||
+
|
||||
static struct timer_list tscTimer;
|
||||
|
||||
/*
|
||||
@@ -357,27 +372,6 @@ init_module(void)
|
||||
spin_lock_init(&linuxState.pollListLock);
|
||||
#endif
|
||||
|
||||
- /*
|
||||
- * Initialize the file_operations structure. Because this code is always
|
||||
- * compiled as a module, this is fine to do it here and not in a static
|
||||
- * initializer.
|
||||
- */
|
||||
-
|
||||
- memset(&vmuser_fops, 0, sizeof vmuser_fops);
|
||||
- vmuser_fops.owner = THIS_MODULE;
|
||||
- vmuser_fops.poll = LinuxDriverPoll;
|
||||
-#ifdef HAVE_UNLOCKED_IOCTL
|
||||
- vmuser_fops.unlocked_ioctl = LinuxDriver_UnlockedIoctl;
|
||||
-#else
|
||||
- vmuser_fops.ioctl = LinuxDriver_Ioctl;
|
||||
-#endif
|
||||
-#ifdef HAVE_COMPAT_IOCTL
|
||||
- vmuser_fops.compat_ioctl = LinuxDriver_UnlockedIoctl;
|
||||
-#endif
|
||||
- vmuser_fops.open = LinuxDriver_Open;
|
||||
- vmuser_fops.release = LinuxDriver_Close;
|
||||
- vmuser_fops.mmap = LinuxDriverMmap;
|
||||
-
|
||||
#ifdef VMX86_DEVEL
|
||||
devel_init_module();
|
||||
linuxState.minor = 0;
|
||||
diff --git a/vmnet-only/driver.c b/vmnet-only/driver.c
|
||||
index b12b982..40bd4cf 100644
|
||||
--- a/vmnet-only/driver.c
|
||||
+++ b/vmnet-only/driver.c
|
||||
@@ -165,7 +165,22 @@ static long VNetFileOpUnlockedIoctl(struct file * filp,
|
||||
unsigned int iocmd, unsigned long ioarg);
|
||||
#endif
|
||||
|
||||
-static struct file_operations vnetFileOps;
|
||||
+static struct file_operations vnetFileOps = {
|
||||
+ .owner = THIS_MODULE,
|
||||
+ .read = VNetFileOpRead,
|
||||
+ .write = VNetFileOpWrite,
|
||||
+ .poll = VNetFileOpPoll,
|
||||
+#ifdef HAVE_UNLOCKED_IOCTL
|
||||
+ .unlocked_ioctl = VNetFileOpUnlockedIoctl,
|
||||
+#else
|
||||
+ .ioctl = VNetFileOpIoctl,
|
||||
+#endif
|
||||
+#ifdef HAVE_COMPAT_IOCTL
|
||||
+ .compat_ioctl = VNetFileOpUnlockedIoctl,
|
||||
+#endif
|
||||
+ .open = VNetFileOpOpen,
|
||||
+ .release = VNetFileOpClose
|
||||
+};
|
||||
|
||||
/*
|
||||
* Utility functions
|
||||
@@ -476,28 +491,6 @@ init_module(void)
|
||||
goto err_proto;
|
||||
}
|
||||
|
||||
- /*
|
||||
- * Initialize the file_operations structure. Because this code is always
|
||||
- * compiled as a module, this is fine to do it here and not in a static
|
||||
- * initializer.
|
||||
- */
|
||||
-
|
||||
- memset(&vnetFileOps, 0, sizeof vnetFileOps);
|
||||
- vnetFileOps.owner = THIS_MODULE;
|
||||
- vnetFileOps.read = VNetFileOpRead;
|
||||
- vnetFileOps.write = VNetFileOpWrite;
|
||||
- vnetFileOps.poll = VNetFileOpPoll;
|
||||
-#ifdef HAVE_UNLOCKED_IOCTL
|
||||
- vnetFileOps.unlocked_ioctl = VNetFileOpUnlockedIoctl;
|
||||
-#else
|
||||
- vnetFileOps.ioctl = VNetFileOpIoctl;
|
||||
-#endif
|
||||
-#ifdef HAVE_COMPAT_IOCTL
|
||||
- vnetFileOps.compat_ioctl = VNetFileOpUnlockedIoctl;
|
||||
-#endif
|
||||
- vnetFileOps.open = VNetFileOpOpen;
|
||||
- vnetFileOps.release = VNetFileOpClose;
|
||||
-
|
||||
retval = register_chrdev(VNET_MAJOR_NUMBER, "vmnet", &vnetFileOps);
|
||||
if (retval) {
|
||||
LOG(0, (KERN_NOTICE "/dev/vmnet: could not register major device %d\n",
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
diff -Nurp work.orig/vmblock-only/linux/inode.c work/vmblock-only/linux/inode.c
|
||||
--- work.orig/vmblock-only/linux/inode.c 2013-10-18 17:56:11.000000000 +0000
|
||||
+++ work/vmblock-only/linux/inode.c 2013-11-14 16:44:41.079398115 +0000
|
||||
@@ -135,7 +135,8 @@ InodeOpLookup(struct inode *dir, //
|
||||
inode->i_size = INODE_TO_IINFO(inode)->nameLen;
|
||||
inode->i_version = 1;
|
||||
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
|
||||
- inode->i_uid = inode->i_gid = 0;
|
||||
+ inode->i_uid = KUIDT_INIT(0);
|
||||
+ inode->i_gid = KGIDT_INIT(0);
|
||||
inode->i_op = &LinkInodeOps;
|
||||
|
||||
d_add(dentry, inode);
|
||||
|
||||
|
|
@ -1,65 +0,0 @@
|
|||
diff --git a/vmblock-only/Makefile.kernel b/vmblock-only/Makefile.kernel
|
||||
index ab7a727..e3ec9d2 100644
|
||||
--- a/vmblock-only/Makefile.kernel
|
||||
+++ b/vmblock-only/Makefile.kernel
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
INCLUDE += -I$(SRCROOT)/include
|
||||
|
||||
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
|
||||
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
|
||||
|
||||
EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachecreate.c, -DVMW_KMEMCR_HAS_DTOR, )
|
||||
EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachector.c, -DVMW_KMEMCR_CTOR_HAS_3_ARGS, )
|
||||
diff --git a/vmci-only/Makefile.kernel b/vmci-only/Makefile.kernel
|
||||
index ba343ee..861ea83 100644
|
||||
--- a/vmci-only/Makefile.kernel
|
||||
+++ b/vmci-only/Makefile.kernel
|
||||
@@ -21,7 +21,7 @@ CC_OPTS += -DVMCI
|
||||
|
||||
INCLUDE += -I$(SRCROOT)/shared -I$(SRCROOT)/common -I$(SRCROOT)/linux
|
||||
|
||||
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
|
||||
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
|
||||
|
||||
obj-m += $(DRIVER).o
|
||||
|
||||
diff --git a/vmmon-only/Makefile.kernel b/vmmon-only/Makefile.kernel
|
||||
index 8770d1d..c4746c3 100644
|
||||
--- a/vmmon-only/Makefile.kernel
|
||||
+++ b/vmmon-only/Makefile.kernel
|
||||
@@ -22,7 +22,7 @@ CC_OPTS += -DVMMON -DVMCORE
|
||||
INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \
|
||||
-I$(SRCROOT)/vmcore
|
||||
|
||||
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
|
||||
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
|
||||
|
||||
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/smpcall.c, -DVMW_HAVE_SMP_CALL_3ARG, )
|
||||
|
||||
diff --git a/vmnet-only/Makefile.kernel b/vmnet-only/Makefile.kernel
|
||||
index d1e3133..665d428 100644
|
||||
--- a/vmnet-only/Makefile.kernel
|
||||
+++ b/vmnet-only/Makefile.kernel
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
INCLUDE := -I$(SRCROOT)
|
||||
|
||||
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
|
||||
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
|
||||
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, )
|
||||
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_dev_net.c,-DVMW_NETDEV_HAS_DEV_NET, )
|
||||
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/nfhook_uses_skb.c,-DVMW_NFHOOK_USES_SKB, )
|
||||
diff --git a/vsock-only/Makefile.kernel b/vsock-only/Makefile.kernel
|
||||
index b4629ee..264b8cb 100644
|
||||
--- a/vsock-only/Makefile.kernel
|
||||
+++ b/vsock-only/Makefile.kernel
|
||||
@@ -25,7 +25,7 @@ INCLUDE += -I$(SRCROOT)/include
|
||||
INCLUDE += -I$(SRCROOT)/linux
|
||||
INCLUDE += -I$(SRCROOT)/common
|
||||
|
||||
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
|
||||
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
|
||||
EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/netcreate_num_params.c, -DVMW_NETCREATE_KERNARG, )
|
||||
|
||||
|
||||
|
|
@ -1,85 +0,0 @@
|
|||
diff --git a/vmblock-only/Makefile b/vmblock-only/Makefile
|
||||
index 2b81323..746c8b8 100644
|
||||
--- a/vmblock-only/Makefile
|
||||
+++ b/vmblock-only/Makefile
|
||||
@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
|
||||
ifdef LINUXINCLUDE
|
||||
HEADER_DIR = $(LINUXINCLUDE)
|
||||
else
|
||||
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
|
||||
+HEADER_DIR = $(KERNEL_DIR)
|
||||
endif
|
||||
|
||||
-BUILD_DIR = $(HEADER_DIR)/..
|
||||
+BUILD_DIR = $(KBUILD_OUTPUT)
|
||||
|
||||
DRIVER := vmblock
|
||||
PRODUCT := ws
|
||||
diff --git a/vmci-only/Makefile b/vmci-only/Makefile
|
||||
index 8e9c5be..6ec828b 100644
|
||||
--- a/vmci-only/Makefile
|
||||
+++ b/vmci-only/Makefile
|
||||
@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
|
||||
ifdef LINUXINCLUDE
|
||||
HEADER_DIR = $(LINUXINCLUDE)
|
||||
else
|
||||
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
|
||||
+HEADER_DIR = $(KERNEL_DIR)
|
||||
endif
|
||||
|
||||
-BUILD_DIR = $(HEADER_DIR)/..
|
||||
+BUILD_DIR = $(KBUILD_OUTPUT)
|
||||
|
||||
DRIVER := vmci
|
||||
PRODUCT := ws
|
||||
diff --git a/vmmon-only/Makefile b/vmmon-only/Makefile
|
||||
index 5bd867b..91a83d4 100644
|
||||
--- a/vmmon-only/Makefile
|
||||
+++ b/vmmon-only/Makefile
|
||||
@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
|
||||
ifdef LINUXINCLUDE
|
||||
HEADER_DIR = $(LINUXINCLUDE)
|
||||
else
|
||||
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
|
||||
+HEADER_DIR = $(KERNEL_DIR)
|
||||
endif
|
||||
|
||||
-BUILD_DIR = $(HEADER_DIR)/..
|
||||
+BUILD_DIR = $(KBUILD_OUTPUT)
|
||||
|
||||
DRIVER := vmmon
|
||||
PRODUCT := @@PRODUCT@@
|
||||
diff --git a/vmnet-only/Makefile b/vmnet-only/Makefile
|
||||
index d4eb73c..c7c6d38 100644
|
||||
--- a/vmnet-only/Makefile
|
||||
+++ b/vmnet-only/Makefile
|
||||
@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
|
||||
ifdef LINUXINCLUDE
|
||||
HEADER_DIR = $(LINUXINCLUDE)
|
||||
else
|
||||
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
|
||||
+HEADER_DIR = $(KERNEL_DIR)
|
||||
endif
|
||||
|
||||
-BUILD_DIR = $(HEADER_DIR)/..
|
||||
+BUILD_DIR = $(KBUILD_OUTPUT)
|
||||
|
||||
DRIVER := vmnet
|
||||
PRODUCT := @@PRODUCT@@
|
||||
diff --git a/vsock-only/Makefile b/vsock-only/Makefile
|
||||
index 93dd61d..9765696 100644
|
||||
--- a/vsock-only/Makefile
|
||||
+++ b/vsock-only/Makefile
|
||||
@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
|
||||
ifdef LINUXINCLUDE
|
||||
HEADER_DIR = $(LINUXINCLUDE)
|
||||
else
|
||||
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
|
||||
+HEADER_DIR = $(KERNEL_DIR)
|
||||
endif
|
||||
|
||||
-BUILD_DIR = $(HEADER_DIR)/..
|
||||
+BUILD_DIR = $(KBUILD_OUTPUT)
|
||||
|
||||
DRIVER := vsock
|
||||
PRODUCT := ws
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
diff --git a/vmnet-only/compat_netdevice.h b/vmnet-only/compat_netdevice.h
|
||||
index 7a56304..9ff4548 100644
|
||||
--- a/vmnet-only/compat_netdevice.h
|
||||
+++ b/vmnet-only/compat_netdevice.h
|
||||
@@ -47,6 +47,19 @@
|
||||
# define net_device device
|
||||
#endif
|
||||
|
||||
+/* it looks like these have been removed from the kernel 3.1
|
||||
+ * probably because the "transition" is considered complete.
|
||||
+ * so to keep this source compatible we just redefine them like they were
|
||||
+ * previously
|
||||
+ */
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0)
|
||||
+#define HAVE_ALLOC_NETDEV /* feature macro: alloc_xxxdev
|
||||
+ functions are available. */
|
||||
+#define HAVE_FREE_NETDEV /* free_netdev() */
|
||||
+#define HAVE_NETDEV_PRIV /* netdev_priv() */
|
||||
+#define HAVE_NETIF_QUEUE
|
||||
+#define HAVE_NET_DEVICE_OPS
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* SET_MODULE_OWNER appeared sometime during 2.3.x. It was setting
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/vmblock-only/linux/control.c b/vmblock-only/linux/control.c
|
||||
index 79716bd..2dd83fe 100644
|
||||
--- a/vmblock-only/linux/control.c
|
||||
+++ b/vmblock-only/linux/control.c
|
||||
@@ -293,7 +293,7 @@ ExecuteBlockOp(const char __user *buf, // IN: buffer with name
|
||||
|
||||
retval = i < 0 ? -EINVAL : blockOp(name, blocker);
|
||||
|
||||
- putname(name);
|
||||
+ __putname(name);
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
diff -Naur a/linux/inode.c b/linux/inode.c
|
||||
--- a/vmblock-only/linux/inode.c 2013-10-03 04:29:47.471339204 -0400
|
||||
+++ b/vmblock-only/linux/inode.c 2013-10-03 04:31:56.607334636 -0400
|
||||
@@ -36,7 +36,7 @@
|
||||
|
||||
/* Inode operations */
|
||||
static struct dentry *InodeOpLookup(struct inode *dir,
|
||||
- struct dentry *dentry, struct nameidata *nd);
|
||||
+ struct dentry *dentry, unsigned int flags);
|
||||
static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int buflen);
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
|
||||
static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
|
||||
@@ -75,7 +75,7 @@
|
||||
static struct dentry *
|
||||
InodeOpLookup(struct inode *dir, // IN: parent directory's inode
|
||||
struct dentry *dentry, // IN: dentry to lookup
|
||||
- struct nameidata *nd) // IN: lookup intent and information
|
||||
+ unsigned int flags) // IN: lookup intent and information
|
||||
{
|
||||
char *filename;
|
||||
struct inode *inode;
|
||||
@@ -221,7 +221,7 @@
|
||||
goto out;
|
||||
}
|
||||
|
||||
- ret = vfs_follow_link(nd, iinfo->name);
|
||||
+ nd_set_link(nd, iinfo->name);
|
||||
|
||||
out:
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
diff -ruN work.orig/vmblock-only/linux/control.c work/vmblock-only/linux/control.c
|
||||
--- work.orig/vmblock-only/linux/control.c 2013-11-02 18:05:39.960226399 +0100
|
||||
+++ work/vmblock-only/linux/control.c 2013-11-02 18:09:11.760231432 +0100
|
||||
@@ -208,17 +208,14 @@
|
||||
VMBlockSetProcEntryOwner(controlProcMountpoint);
|
||||
|
||||
/* Create /proc/fs/vmblock/dev */
|
||||
- controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME,
|
||||
- VMBLOCK_CONTROL_MODE,
|
||||
- controlProcDirEntry);
|
||||
- if (!controlProcEntry) {
|
||||
+ controlProcEntry = proc_create(VMBLOCK_CONTROL_DEVNAME, VMBLOCK_CONTROL_MODE, controlProcDirEntry, &ControlFileOps);
|
||||
+ if (controlProcEntry == NULL) {
|
||||
Warning("SetupProcDevice: could not create " VMBLOCK_DEVICE "\n");
|
||||
remove_proc_entry(VMBLOCK_CONTROL_MOUNTPOINT, controlProcDirEntry);
|
||||
remove_proc_entry(VMBLOCK_CONTROL_PROC_DIRNAME, NULL);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
- controlProcEntry->proc_fops = &ControlFileOps;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -1,82 +0,0 @@
|
|||
diff -rupN vmci-only/linux/driver.c vmci-only/linux/driver.c
|
||||
--- vmci-only/linux/driver.c 2014-03-31 18:49:14.840009422 +0100
|
||||
+++ vmci-only/linux/driver.c 2014-03-31 18:49:21.385009439 +0100
|
||||
@@ -737,7 +737,7 @@ LinuxDriver_Ioctl(struct inode *inode,
|
||||
goto init_release;
|
||||
}
|
||||
|
||||
- user = current_uid();
|
||||
+ user = from_kuid(current_user_ns(), current_uid());
|
||||
retval = VMCIContext_InitContext(initBlock.cid, initBlock.flags,
|
||||
0 /* Unused */, vmciLinux->userVersion,
|
||||
&user, &vmciLinux->context);
|
||||
diff -rupN vmci-only/shared/vm_assert.h vmci-only/shared/vm_assert.h
|
||||
--- vmci-only/shared/vm_assert.h 2014-03-31 18:49:14.841009422 +0100
|
||||
+++ vmci-only/shared/vm_assert.h 2014-03-31 18:49:21.385009439 +0100
|
||||
@@ -256,6 +256,7 @@ void WarningThrottled(uint32 *count, con
|
||||
__FILE__, __LINE__, __FUNCTION__, \
|
||||
_fix))
|
||||
#else
|
||||
+ #undef DEPRECATED /* in <linux/printk.h> since 3.14.0 */
|
||||
#define DEPRECATED(_fix) do {} while (0)
|
||||
#endif
|
||||
|
||||
diff -rupN vmmon-only/include/vm_assert.h vmmon-only/include/vm_assert.h
|
||||
--- vmmon-only/include/vm_assert.h 2014-03-31 18:49:14.835009422 +0100
|
||||
+++ vmmon-only/include/vm_assert.h 2014-03-31 18:49:21.380009439 +0100
|
||||
@@ -256,6 +256,7 @@ void WarningThrottled(uint32 *count, con
|
||||
__FILE__, __LINE__, __FUNCTION__, \
|
||||
_fix))
|
||||
#else
|
||||
+ #undef DEPRECATED /* in <linux/printk.h> since 3.14.0 */
|
||||
#define DEPRECATED(_fix) do {} while (0)
|
||||
#endif
|
||||
|
||||
diff -rupN vmmon-only/linux/driver.c vmmon-only/linux/driver.c
|
||||
--- vmmon-only/linux/driver.c 2014-03-31 18:49:14.834009422 +0100
|
||||
+++ vmmon-only/linux/driver.c 2014-03-31 18:49:21.379009439 +0100
|
||||
@@ -1338,7 +1338,9 @@ LinuxDriverReadTSC(void *data, // OUT:
|
||||
*-----------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
-__attribute__((always_inline)) static Bool
|
||||
+#include <linux/compiler-gcc.h>
|
||||
+
|
||||
+__always_inline static Bool
|
||||
LinuxDriverSyncReadTSCs(uint64 *delta) // OUT: TSC max - TSC min
|
||||
{
|
||||
TSCDelta tscDelta;
|
||||
diff -rupN vmnet-only/vm_assert.h vmnet-only/vm_assert.h
|
||||
--- vmnet-only/vm_assert.h 2014-03-31 18:49:14.845009422 +0100
|
||||
+++ vmnet-only/vm_assert.h 2014-03-31 18:49:21.390009439 +0100
|
||||
@@ -256,6 +256,7 @@ void WarningThrottled(uint32 *count, con
|
||||
__FILE__, __LINE__, __FUNCTION__, \
|
||||
_fix))
|
||||
#else
|
||||
+ #undef DEPRECATED /* in <linux/printk.h> since 3.14.0 */
|
||||
#define DEPRECATED(_fix) do {} while (0)
|
||||
#endif
|
||||
|
||||
diff -rupN vsock-only/linux/af_vsock.c vsock-only/linux/af_vsock.c
|
||||
--- vsock-only/linux/af_vsock.c 2014-03-31 18:49:14.837009422 +0100
|
||||
+++ vsock-only/linux/af_vsock.c 2014-03-31 18:49:21.381009439 +0100
|
||||
@@ -2869,7 +2869,7 @@ __VSockVmciCreate(struct net *net,
|
||||
vsk->connectTimeout = psk->connectTimeout;
|
||||
} else {
|
||||
vsk->trusted = capable(CAP_NET_ADMIN);
|
||||
- vsk->owner = current_uid();
|
||||
+ vsk->owner = from_kuid(current_user_ns(), current_uid());
|
||||
vsk->queuePairSize = VSOCK_DEFAULT_QP_SIZE;
|
||||
vsk->queuePairMinSize = VSOCK_DEFAULT_QP_SIZE_MIN;
|
||||
vsk->queuePairMaxSize = VSOCK_DEFAULT_QP_SIZE_MAX;
|
||||
diff -rupN vsock-only/shared/vm_assert.h vsock-only/shared/vm_assert.h
|
||||
--- vsock-only/shared/vm_assert.h 2014-03-31 18:49:14.839009422 +0100
|
||||
+++ vsock-only/shared/vm_assert.h 2014-03-31 18:49:21.382009439 +0100
|
||||
@@ -256,6 +256,7 @@ void WarningThrottled(uint32 *count, con
|
||||
__FILE__, __LINE__, __FUNCTION__, \
|
||||
_fix))
|
||||
#else
|
||||
+ #undef DEPRECATED /* in <linux/printk.h> since 3.14.0 */
|
||||
#define DEPRECATED(_fix) do {} while (0)
|
||||
#endif
|
||||
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
diff -rupN vsock-only/linux/notify.c vsock-only/linux/notify.c
|
||||
--- vsock-only/linux/notify.c 2014-04-15 03:11:41.000000000 +0530
|
||||
+++ vsock-only/linux/notify.c 2014-05-27 21:36:56.713291909 +0530
|
||||
@@ -516,7 +516,7 @@ VSockVmciHandleWrote(struct sock *sk,
|
||||
PKT_FIELD(vsk, sentWaitingRead) = FALSE;
|
||||
#endif
|
||||
|
||||
- sk->sk_data_ready(sk, 0);
|
||||
+ sk->sk_data_ready(sk);
|
||||
}
|
||||
|
||||
|
||||
diff -rupN vsock-only/linux/notifyQState.c vsock-only/linux/notifyQState.c
|
||||
--- vsock-only/linux/notifyQState.c 2014-04-15 03:11:41.000000000 +0530
|
||||
+++ vsock-only/linux/notifyQState.c 2014-05-27 21:38:52.561286734 +0530
|
||||
@@ -164,7 +164,7 @@ VSockVmciHandleWrote(struct sock *sk,
|
||||
struct sockaddr_vm *dst, // IN: unused
|
||||
struct sockaddr_vm *src) // IN: unused
|
||||
{
|
||||
- sk->sk_data_ready(sk, 0);
|
||||
+ sk->sk_data_ready(sk);
|
||||
}
|
||||
|
||||
|
||||
@@ -566,7 +566,7 @@ VSockVmciNotifyPktRecvPostDequeue(struct
|
||||
}
|
||||
|
||||
/* See the comment in VSockVmciNotifyPktSendPostEnqueue */
|
||||
- sk->sk_data_ready(sk, 0);
|
||||
+ sk->sk_data_ready(sk);
|
||||
}
|
||||
|
||||
return err;
|
||||
|
||||
|
|
@ -1,396 +0,0 @@
|
|||
https://wiki.archlinux.org/index.php/VMware
|
||||
|
||||
VMware
|
||||
Jump to: navigation, search
|
||||
|
||||
Related articles
|
||||
|
||||
Category:Hypervisors
|
||||
Installing Arch Linux in VMware
|
||||
Moving an existing install into (or out of) a virtual machine
|
||||
|
||||
This article is about installing VMware in Arch Linux; you may also be interested in Installing Arch Linux in VMware.
|
||||
Note: This article supports only the latest major VMware versions, meaning VMware Workstation 10 and VMware Player (Plus) 6.
|
||||
Contents
|
||||
|
||||
1 Installation
|
||||
2 Configuration
|
||||
2.1 VMware module patches and installation
|
||||
2.1.1 3.14 kernels and up
|
||||
2.1.2 3.15 kernels
|
||||
2.2 init.d script
|
||||
2.3 Systemd service
|
||||
3 Launching the application
|
||||
4 Tips and tricks
|
||||
4.1 Entering the Workstation License Key
|
||||
4.1.1 From terminal
|
||||
4.1.2 From GUI
|
||||
4.2 Extracting the VMware BIOS
|
||||
4.2.1 Using the modified BIOS
|
||||
4.3 Using DKMS to manage the modules
|
||||
4.3.1 Preparation
|
||||
4.3.2 Build configuration
|
||||
4.3.2.1 1) Using Git
|
||||
4.3.2.2 2) Manual setup
|
||||
4.3.3 Installation
|
||||
5 Troubleshooting
|
||||
5.1 /dev/vmmon not found
|
||||
5.2 Kernel headers for version 3.x-xxxx were not found. If you installed them[...]
|
||||
5.3 USB devices not recognized
|
||||
5.4 The installer fails to start
|
||||
5.5 Incorrect login/password when trying to access VMware remotely
|
||||
5.6 Issues with ALSA output
|
||||
5.7 Kernel-based Virtual Machine (KVM) is running
|
||||
5.8 Guests have incorrect system clocks or are unable to boot: "[...]timeTracker_user.c:234 bugNr=148722"
|
||||
6 Uninstallation
|
||||
|
||||
Installation
|
||||
|
||||
1. Install the correct dependencies:
|
||||
|
||||
fuse - the vmware-vmblock-fuse service is favored over the vmblock module, which is not built anymore without disabling fuse in the kernel
|
||||
gtkmm - for the GUI
|
||||
linux-headers - for module compilation
|
||||
|
||||
2. Download the latest VMware Workstation or VMware Player (Plus) (or a beta version, if available).
|
||||
|
||||
3. Start the installation (--eulas-agreed skips the EULAs):
|
||||
|
||||
# sh VMware-edition-version.release.architecture.bundle --eulas-agreed
|
||||
|
||||
Tip: Some other useful flags:
|
||||
|
||||
--console - Use the console UI.
|
||||
-I, --ignore-errors - Ignore fatal errors.
|
||||
|
||||
4. For the System service scripts directory, use /etc/init.d (the default).
|
||||
Note: During the installation you will get an error about "No rc*.d style init script directories" being given. This can be safely ignored, since Arch has moved to systemd.
|
||||
Tip: To (re)build the modules from terminal later on, use:
|
||||
|
||||
# vmware-modconfig --console --install-all
|
||||
|
||||
Configuration
|
||||
Tip: There is also a package called vmware-patch in the AUR with the intention of trying to automate this section (it also supports older VMware versions).
|
||||
VMware module patches and installation
|
||||
|
||||
VMware Workstation 10.0.3 and Player (Plus) 6.0.3 support kernels up to 3.13.
|
||||
3.14 kernels and up
|
||||
|
||||
Since the 3.14 kernel the vmci and vsock modules will fail to build.
|
||||
|
||||
A patch (along with some warning fixes) can be found here:
|
||||
|
||||
$ curl http://pastie.org/pastes/9090538/download -o /tmp/vmware-3.14.patch
|
||||
|
||||
Extract module sources:
|
||||
|
||||
$ cd /usr/lib/vmware/modules/source
|
||||
# for i in vmci vmmon vmnet vsock; do tar -xf $i.tar; done
|
||||
|
||||
Apply the patch:
|
||||
|
||||
$ patch -p0 -i /tmp/vmware-3.14.patch
|
||||
|
||||
Re-create the archives:
|
||||
|
||||
$ for i in *-only; do tar -cf ${i/-only}.tar $i; done
|
||||
|
||||
Remove the leftovers:
|
||||
|
||||
$ rm -r *-only
|
||||
|
||||
Rebuild modules:
|
||||
|
||||
# vmware-modconfig --console --install-all
|
||||
|
||||
Note: Tar does not support multiple operations, hence the for loop is being used.
|
||||
3.15 kernels
|
||||
|
||||
On 3.15 kernel the vsock module requires an additional patch:
|
||||
|
||||
$ curl http://pastie.org/pastes/9311773/download -o /tmp/vmware-vsock-3.15.patch
|
||||
|
||||
Extract module sources:
|
||||
|
||||
$ cd /usr/lib/vmware/modules/source
|
||||
# tar -xf vsock.tar
|
||||
|
||||
Apply the patch:
|
||||
|
||||
# patch -p0 -i /tmp/vmware-vsock-3.15.patch
|
||||
|
||||
Re-create the archives:
|
||||
|
||||
# tar -cf vsock.tar vsock-only
|
||||
|
||||
Remove the leftovers:
|
||||
|
||||
# rm -r vsock-only
|
||||
|
||||
Rebuild modules:
|
||||
|
||||
# vmware-modconfig --console --install-all
|
||||
|
||||
init.d script
|
||||
|
||||
5. The Virtual machine communication interface (vmci) and VM communication interface socket family (vsock) services are are known to fail on startup, due to the main init.d script incorrectly handling the inclusion of the in-kernel drivers.
|
||||
|
||||
This can be fixed by only defining the bundled ones:
|
||||
|
||||
# sed -i 's/mod=$(vmwareRealModName $vmci $vmci_alias)/mod=vmci/' /etc/init.d/vmware
|
||||
# sed -i 's/mod=$(vmwareRealModName $vsock $vsock_alias)/mod=vsock/' /etc/init.d/vmware
|
||||
|
||||
Systemd service
|
||||
|
||||
6. (Optional) Instead of using # /etc/init.d/vmware {start|stop|status|restart} directly to manage the services you may also create a .service file (or files):
|
||||
|
||||
/etc/systemd/system/vmware.service
|
||||
|
||||
[Unit]
|
||||
Description=VMware daemon
|
||||
|
||||
[Service]
|
||||
ExecStart=/etc/init.d/vmware start
|
||||
ExecStop=/etc/init.d/vmware stop
|
||||
PIDFile=/var/lock/subsys/vmware
|
||||
TimeoutSec=0
|
||||
RemainAfterExit=yes
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
||||
After which you can enable it on boot, with:
|
||||
|
||||
# systemctl enable vmware
|
||||
|
||||
Launching the application
|
||||
|
||||
To open VMware Workstation:
|
||||
|
||||
$ vmware
|
||||
|
||||
or VMware Player (Plus):
|
||||
|
||||
$ vmplayer
|
||||
|
||||
Tips and tricks
|
||||
Entering the Workstation License Key
|
||||
From terminal
|
||||
|
||||
# /usr/lib/vmware/bin/vmware-vmx-debug --new-sn XXXXX-XXXXX-XXXXX-XXXXX-XXXXX
|
||||
|
||||
Where XXXXX-XXXXX-XXXXX-XXXXX-XXXXX is your license key.
|
||||
Note: The -debug binary informs the user of an incorrect license.
|
||||
From GUI
|
||||
|
||||
If the above does not work, you can try:
|
||||
|
||||
# /usr/lib/vmware/bin/vmware-enter-serial
|
||||
|
||||
Extracting the VMware BIOS
|
||||
|
||||
$ objcopy /usr/lib/vmware/bin/vmware-vmx -O binary -j bios440 --set-section-flags bios440=a bios440.rom.Z
|
||||
$ perl -e 'use Compress::Zlib; my $v; read STDIN, $v, '$(stat -c%s "./bios440.rom.Z")'; $v = uncompress($v); print $v;' < bios440.rom.Z > bios440.rom
|
||||
|
||||
Using the modified BIOS
|
||||
|
||||
If and when you decide to modify the extracted BIOS you can make your virtual machine use it by moving it to ~/vmware/Virtual_machine_name:
|
||||
|
||||
$ mv bios440.rom ~/vmware/Virtual_machine_name/
|
||||
|
||||
then adding the name to the Virtual_machine_name.vmx file:
|
||||
|
||||
~/vmware/Virtual_machine_name/Virtual_machine_name.vmx
|
||||
|
||||
bios440.filename = "bios440.rom"
|
||||
|
||||
Using DKMS to manage the modules
|
||||
|
||||
The Dynamic Kernel Module Support (DKMS) can be used to manage Workstation modules and to void from re-running vmware-modconfig each time the kernel changes. The following example uses a custom Makefile to compile and install the modules through vmware-modconfig. Afterwards they are removed from the current kernel tree.
|
||||
Preparation
|
||||
|
||||
First install dkms from the official repositories.
|
||||
|
||||
Then create a source directory for the Makefile and the dkms.conf:
|
||||
|
||||
# mkdir /usr/src/vmware-modules-10/
|
||||
|
||||
Build configuration
|
||||
|
||||
Fetch the files with git or use the ones below.
|
||||
1) Using Git
|
||||
|
||||
$ cd /tmp
|
||||
$ git clone git://github.com/bawaaaaah/dkms-workstation.git
|
||||
$ sed -i 's/9/10/' dkms-workstation/dkms.conf
|
||||
# cp dkms-workstation/Makefile dkms-workstation/dkms.conf /usr/src/vmware-modules-10/
|
||||
|
||||
2) Manual setup
|
||||
|
||||
The dkms.conf describes the module names and the compilation/installation procedure. AUTOINSTALL="yes" tells the modules to be recompiled/installed automatically each time:
|
||||
|
||||
/usr/src/vmware-modules-10/dkms.conf
|
||||
|
||||
PACKAGE_NAME="vmware-modules"
|
||||
PACKAGE_VERSION="10"
|
||||
|
||||
MAKE[0]="make all"
|
||||
CLEAN="make clean"
|
||||
|
||||
BUILT_MODULE_NAME[0]="vmmon"
|
||||
BUILT_MODULE_LOCATION[0]="modules"
|
||||
|
||||
BUILT_MODULE_NAME[1]="vmnet"
|
||||
BUILT_MODULE_LOCATION[1]="modules"
|
||||
|
||||
BUILT_MODULE_NAME[2]="vmblock"
|
||||
BUILT_MODULE_LOCATION[2]="modules"
|
||||
|
||||
BUILT_MODULE_NAME[3]="vmci"
|
||||
BUILT_MODULE_LOCATION[3]="modules"
|
||||
|
||||
BUILT_MODULE_NAME[4]="vsock"
|
||||
BUILT_MODULE_LOCATION[4]="modules"
|
||||
|
||||
DEST_MODULE_LOCATION[0]="/extra/vmware"
|
||||
DEST_MODULE_LOCATION[1]="/extra/vmware"
|
||||
DEST_MODULE_LOCATION[2]="/extra/vmware"
|
||||
DEST_MODULE_LOCATION[3]="/extra/vmware"
|
||||
DEST_MODULE_LOCATION[4]="/extra/vmware"
|
||||
|
||||
AUTOINSTALL="yes"
|
||||
|
||||
and now the Makefile:
|
||||
|
||||
/usr/src/vmware-modules-10/Makefile
|
||||
|
||||
KERNEL := $(KERNELRELEASE)
|
||||
HEADERS := /usr/lib/modules/$(KERNEL)/build/include
|
||||
GCC := $(shell vmware-modconfig --console --get-gcc)
|
||||
DEST := /lib/modules/$(KERNEL)/vmware
|
||||
|
||||
TARGETS := vmmon vmnet vmblock vmci vsock
|
||||
|
||||
LOCAL_MODULES := $(addsuffix .ko, $(TARGETS))
|
||||
|
||||
all: $(LOCAL_MODULES)
|
||||
mkdir -p modules/
|
||||
mv *.ko modules/
|
||||
rm -rf $(DEST)
|
||||
depmod
|
||||
|
||||
$(HEADERS)/linux/version.h:
|
||||
ln -s $(HEADERS)/generated/uapi/linux/version.h $(HEADERS)/linux/version.h
|
||||
|
||||
%.ko: $(HEADERS)/linux/version.h
|
||||
vmware-modconfig --console --build-mod -k $(KERNEL) $* $(GCC) $(HEADERS) vmware/
|
||||
cp -f $(DEST)/$@ .
|
||||
|
||||
clean: rm -rf modules/
|
||||
|
||||
Installation
|
||||
|
||||
The modules can then be installed with:
|
||||
|
||||
# dkms install vmware-modules/10 -k $(uname -r)
|
||||
|
||||
Troubleshooting
|
||||
/dev/vmmon not found
|
||||
|
||||
The full error is:
|
||||
|
||||
Could not open /dev/vmmon: No such file or directory.
|
||||
Please make sure that the kernel module `vmmon' is loaded.
|
||||
|
||||
This means that at least the vmmon VMware service is not running. If using the systemd service from step 6. it should be (re)started.
|
||||
Kernel headers for version 3.x-xxxx were not found. If you installed them[...]
|
||||
|
||||
Install the headers (linux-headers).
|
||||
Note: Upgrading the kernel and the headers will require you to boot to the new kernel to match the version of the headers. This is a relatively common error.
|
||||
USB devices not recognized
|
||||
Tip: Also handled by vmware-patch.
|
||||
|
||||
If VMware services are running (see step 6. for a systemd service), your installation is missing the vmware-USBArbitrator script. To readd it manually see this forum post.
|
||||
|
||||
You may also manually extract the VMware bundle and copy the vmware-USBArbitrator script from destination_folder/vmware-usbarbitrator/etc/init.d/ to /etc/init.d/:
|
||||
|
||||
$ sh VMware-edition-version.release.architecture.bundle --extract /tmp/vmware-bundle/
|
||||
# cp /tmp/vmware-bundle/vmware-usbarbitrator/etc/init.d/vmware-USBArbitrator /etc/init.d/
|
||||
|
||||
The installer fails to start
|
||||
|
||||
If you just get back to the prompt when opening the .bundle, then you probably have a deprecated or broken version of the VMware installer and it should removed (you may also refer to the uninstallation section of this article):
|
||||
|
||||
# rm -r /etc/vmware-installer/
|
||||
|
||||
Incorrect login/password when trying to access VMware remotely
|
||||
|
||||
VMware Workstation 10 provides the possibility to remotely manage Shared VMs through the vmware-workstation-server service. However, this will fail with the error "incorrect username/password" due to incorrect PAM configuration of the vmware-authd service. To fix it, edit /etc/pam.d/vmware-authd like this:
|
||||
|
||||
/etc/pam.d/vmware-authd
|
||||
|
||||
#%PAM-1.0
|
||||
auth required pam_unix.so
|
||||
account required pam_unix.so
|
||||
password required pam_permit.so
|
||||
session required pam_unix.so
|
||||
|
||||
and restart the vmware systemd service.
|
||||
|
||||
Now you can connect to the server with the credentials provided during the installation.
|
||||
Note: libxslt may be required for starting virtual machines.
|
||||
Issues with ALSA output
|
||||
|
||||
To fix sound quality issues or enabling proper HD audio output, first run:
|
||||
|
||||
$ aplay -L
|
||||
|
||||
If interested in playing 5.1 surround sound from the guest, look for surround51:CARD=vendor_name,DEV=num, if experiencing quality issues, look for front:CARD=vendor_name,DEV=num. Finally put the name in the .vmx:
|
||||
|
||||
~/vmware/Virtual_machine_name/Virtual_machine_name.vmx
|
||||
|
||||
sound.fileName="surround51:CARD=Live,DEV=0"
|
||||
sound.autodetect="FALSE"
|
||||
|
||||
OSS emulation should also be disabled.
|
||||
Kernel-based Virtual Machine (KVM) is running
|
||||
|
||||
To disable KVM on boot, you can use something like:
|
||||
|
||||
/etc/modprobe.d/vmware.conf
|
||||
|
||||
blacklist kvm
|
||||
blacklist kvm-amd # For AMD CPUs
|
||||
blacklist kvm-intel # For Intel CPUs
|
||||
|
||||
Guests have incorrect system clocks or are unable to boot: "[...]timeTracker_user.c:234 bugNr=148722"
|
||||
|
||||
This is due to incomplete support of power management features (Intel SpeedStep and AMD PowerNow!/Cool'n'Quiet) in VMware Linux that vary the CPU frequency. In March 2012, the maximum frequency Performance governor in the kernel was replaced in favor of the dynamic Ondemand with the release of linux 3.3-1 package. When the host CPU frequency changes, the Guest system clock runs too quickly or too slowly, but may also render it unbootable.
|
||||
|
||||
To prevent this, the maximum host CPU frequency can be specified, and Time Stamp Counter (TSC) disabled, in the global configuration:
|
||||
|
||||
/etc/vmware/config
|
||||
|
||||
host.cpukHz = "X" # The maximum speed in KHz, e.g. 3GHz is "3000000".
|
||||
host.noTSC = "TRUE" # Keep the Guest system clock accurate even when
|
||||
ptsc.noTSC = "TRUE" # the time stamp counter (TSC) is slow.
|
||||
|
||||
Tip: To periodically correct the time (once per minute), in the Options tab of VMware Tools, enable: "Time synchronization between the virtual machine and the host operating system".
|
||||
Uninstallation
|
||||
|
||||
To uninstall VMware you need the product name (either vmware-workstation or vmware-player). To list all the installed products:
|
||||
|
||||
$ vmware-installer -l
|
||||
|
||||
and uninstall with (--required skips the confirmation):
|
||||
|
||||
# vmware-installer -u product --required
|
||||
|
||||
Remember to also disable and remove the vmware service:
|
||||
|
||||
# systemctl disable vmware
|
||||
|
||||
You may also want to have a look at the module directories in /usr/lib/modules/kernel_name/misc/ for any leftovers.
|
||||
Category:
|
||||
|
||||
Hypervisors
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>vmware</herd>
|
||||
<longdescription>
|
||||
VMware kernel modules.
|
||||
</longdescription>
|
||||
<use>
|
||||
<flag name="pax_kernel">Apply patch needed for pax enabled kernels</flag>
|
||||
<flag name="vmci">Build the Virtual Machine Communication Interface module; disable this if you want to use the module from the mainline kernel</flag>
|
||||
<flag name="vsock">Build the VMware VMCI transport for Virtual Sockets; disable this if you want to use the module from the mainline kernel</flag>
|
||||
</use>
|
||||
</pkgmetadata>
|
||||
|
|
@ -1,106 +0,0 @@
|
|||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-279.2.ebuild,v 1.5 2014/06/09 15:24:07 dilfridge Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils flag-o-matic linux-info linux-mod user versionator udev
|
||||
|
||||
PV_MAJOR=$(get_major_version)
|
||||
PV_MINOR=$(get_version_component_range 2)
|
||||
|
||||
DESCRIPTION="VMware kernel modules"
|
||||
HOMEPAGE="http://www.vmware.com/"
|
||||
|
||||
SRC_URI=""
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="pax_kernel +vmci +vsock"
|
||||
|
||||
RDEPEND=""
|
||||
DEPEND="${RDEPEND}
|
||||
|| ( =app-emulation/vmware-player-6.0.${PV_MINOR}*
|
||||
=app-emulation/vmware-workstation-10.0.${PV_MINOR}* )"
|
||||
|
||||
S=${WORKDIR}
|
||||
|
||||
pkg_setup() {
|
||||
CONFIG_CHECK="~HIGH_RES_TIMERS"
|
||||
if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
|
||||
CONFIG_CHECK="${CONFIG_CHECK} BKL"
|
||||
fi
|
||||
if use vmci ; then
|
||||
CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI"
|
||||
else
|
||||
CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI"
|
||||
fi
|
||||
if use vsock ; then
|
||||
CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS"
|
||||
else
|
||||
CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS"
|
||||
fi
|
||||
|
||||
linux-info_pkg_setup
|
||||
|
||||
linux-mod_pkg_setup
|
||||
|
||||
VMWARE_GROUP=${VMWARE_GROUP:-vmware}
|
||||
|
||||
VMWARE_MODULE_LIST_ALL="vmblock vmmon vmnet vmci vsock"
|
||||
VMWARE_MODULE_LIST="vmblock vmmon vmnet"
|
||||
use vmci && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmci"
|
||||
use vsock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vsock"
|
||||
|
||||
VMWARE_MOD_DIR="${PN}-${PVR}"
|
||||
|
||||
BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
|
||||
|
||||
enewgroup "${VMWARE_GROUP}"
|
||||
filter-flags -mfpmath=sse
|
||||
|
||||
for mod in ${VMWARE_MODULE_LIST}; do
|
||||
MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
|
||||
done
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
cd "${S}"
|
||||
for mod in ${VMWARE_MODULE_LIST_ALL}; do
|
||||
tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
|
||||
done
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
|
||||
epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
|
||||
epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
|
||||
use pax_kernel && epatch "${FILESDIR}/${PV_MAJOR}-hardened.patch"
|
||||
epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
|
||||
kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
|
||||
kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-vmblock.patch"
|
||||
kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-filldir.patch"
|
||||
kernel_is ge 3 12 0 && epatch "${FILESDIR}/${PV_MAJOR}-vfsfollowlink.patch"
|
||||
#kernel_is ge 3 14 0 && epatch "${FILESDIR}/${PV_MAJOR}-vmware-3.14.patch"
|
||||
#kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-vmware-vsock-3.15.patch"
|
||||
epatch "${FILESDIR}/${PV_MAJOR}-inode_patch.patch"
|
||||
epatch "${FILESDIR}/${PV_MAJOR}-3.15-vfsreadlink.patch"
|
||||
kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-lindrv-ioctrl.patch"
|
||||
kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-vsock2.patch"
|
||||
kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-getname.patch"
|
||||
# Allow user patches so they can support RC kernels and whatever else
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_install() {
|
||||
linux-mod_src_install
|
||||
local udevrules="${T}/60-vmware.rules"
|
||||
cat > "${udevrules}" <<-EOF
|
||||
KERNEL=="vmci", GROUP="vmware", MODE=660
|
||||
KERNEL=="vmw_vmci", GROUP="vmware", MODE=660
|
||||
KERNEL=="vmmon", GROUP="vmware", MODE=660
|
||||
KERNEL=="vsock", GROUP="vmware", MODE=660
|
||||
EOF
|
||||
udev_dorules "${udevrules}"
|
||||
}
|
||||
|
|
@ -1 +0,0 @@
|
|||
DIST fuzz-0.4.tar.gz 19462 SHA256 1f7e5426f7a212b94e4f28e8a0815138420b44f97df9793f1c41a324c23ffc77
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
# Copyright 1999-2004 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /root/portage/app-fuzz/fuzzer/fuzzer-1.2.ebuild,v 1.1.1.1 2006/03/12 23:52:44 grimmlin Exp $
|
||||
|
||||
DESCRIPTION="Python based fuzzer for multi protocols, and faultinject"
|
||||
HOMEPAGE="http://taviso.decsystem.org/software.html#toc2"
|
||||
SRC_URI="http://taviso.decsystem.org/files/${PN}/${P}.tar.gz"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=""
|
||||
|
||||
src_compile () {
|
||||
emake PREFIX="/usr"
|
||||
}
|
||||
|
||||
src_install () {
|
||||
dobin fuzz
|
||||
insinto /usr/lib/fuzz
|
||||
insopts -m 0755
|
||||
doins builtins.so
|
||||
insopts -m 0644
|
||||
doins define.sh util.sh init.sh decay.sh
|
||||
dodoc README README.html TODO ChangeLog
|
||||
}
|
||||
|
|
@ -1 +0,0 @@
|
|||
DIST fslint-2.42.tar.gz 111520 SHA256 babbef4a34f42ab1d396152fd79b4353adc114b2e8d68b838e20a8067c5a3273 SHA512 e32575827769a6e0e1847f6edb4ed5337fc5705d65f327e93510af29cafe11df175eec9924f15e9525ff7c320048940e9341e9e62b4ec717b2630aa405a484e6 WHIRLPOOL fc74fb8ddd9d03283d6f7ec7763c2efef9036242ab5ba487046af14f880f0bc8661cec07614fc61fcee684933614abe49142f6dde4c3ef1d42d0f5292437be67
|
||||
|
|
@ -1,109 +0,0 @@
|
|||
# Copyright 1999-2006 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
# original ebuild by bearingspacer@free.fr
|
||||
# updated ebuild by mobidyc@msn.com
|
||||
# updated ebuild by davide.bettio@kdemail.net
|
||||
|
||||
DESCRIPTION="A utility to find and clean various forms of lint on a filesystem."
|
||||
HOMEPAGE="http://www.pixelbeat.org/fslint/"
|
||||
SRC_URI="http://www.pixelbeat.org/fslint/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* x86 amd64"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=">=x11-libs/gtk+-2.4
|
||||
>=dev-lang/python-2.3
|
||||
gnome-base/libglade
|
||||
>=dev-python/pygtk-2.4"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
if [ "${A}" != "" ]; then
|
||||
unpack ${A}
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
echo ${S}
|
||||
pwd
|
||||
|
||||
# GUI executable
|
||||
dodir /usr/bin
|
||||
exeinto /usr/bin
|
||||
doexe fslint-gui
|
||||
|
||||
# GUI file
|
||||
dodir /usr/share/fslint
|
||||
insinto /usr/share/fslint
|
||||
doins fslint.glade
|
||||
|
||||
# other executables
|
||||
dodir /usr/share/fslint/fslint
|
||||
exeinto /usr/share/fslint/fslint
|
||||
doexe fslint/find* fslint/zipdir fslint/fslint
|
||||
|
||||
dodir /usr/share/fslint/fslint/fstool
|
||||
exeinto /usr/share/fslint/fslint/fstool
|
||||
doexe fslint/fstool/*
|
||||
|
||||
dodir /usr/share/fslint/fslint/supprt
|
||||
exeinto /usr/share/fslint/fslint/supprt
|
||||
doexe fslint/supprt/get* fslint/supprt/fslver fslint/supprt/md5sum_approx
|
||||
|
||||
dodir /usr/share/fslint/fslint/supprt/rmlint
|
||||
exeinto /usr/share/fslint/fslint/supprt/rmlint
|
||||
doexe fslint/supprt/rmlint/*
|
||||
|
||||
# icon
|
||||
dodir /usr/share/pixmaps
|
||||
insinto /usr/share/pixmaps
|
||||
doins fslint_icon.png
|
||||
|
||||
# shortcut
|
||||
dodir /etc/X11/applnk/System
|
||||
insinto /etc/X11/applnk/System
|
||||
doins fslint.desktop
|
||||
|
||||
# locales
|
||||
cd po
|
||||
emake DESTDIR=${D}/usr DATADIR=share install
|
||||
cd ..
|
||||
|
||||
# docs
|
||||
cd doc
|
||||
dodoc FAQ NEWS README TODO
|
||||
cd ..
|
||||
|
||||
cd man
|
||||
doman fslint-gui.1 fslint.1
|
||||
cd ..
|
||||
|
||||
# create python init file
|
||||
# Other option here is to instead edit fslint-gui itself so that:
|
||||
# ^liblocation = '/usr/share/fslint/'
|
||||
# ^locale_base = None
|
||||
python_site=`python -c "import sys ; \
|
||||
print '%s/lib/python%s/site-packages' % (sys.exec_prefix,sys.version[:3])"`
|
||||
dodir $python_site/fslint
|
||||
echo "liblocation = '/usr/share/fslint/'" > ${D}/$python_site/fslint/__init__.py
|
||||
|
||||
# link to icon in main fslint dir
|
||||
dosym /usr/share/pixmaps/fslint_icon.png /usr/share/fslint/fslint_icon.png
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "Note the fslint tools do a lot of inode access and to speed them"
|
||||
einfo "up you can use the following method to not update access times"
|
||||
einfo "on disk while gathering inode information:"
|
||||
einfo "mount -o remount,noatime mountpoint"
|
||||
einfo "fslint or fslint-gui"
|
||||
einfo "mount -o remount,atime mountpoint"
|
||||
einfo ""
|
||||
einfo "Command Line Executables are installed in:"
|
||||
einfo "/usr/share/fslint/fslint"
|
||||
einfo "you may want to add them in your PATH."
|
||||
}
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
DIST bro-2.2.tar.gz 9646602 SHA256 86909361c2d804681f314604a6ce763be663937b2f045c8d25d810528a633dc9 SHA512 d5301e60b3929708002a42e72076778a94907c5aceb57d9dfc7b9d6b2840ac66840c2027a7aa4545895ef53094e910bc4cdbff972eb476d587591c44626a2215 WHIRLPOOL 239e4cc355fbcd09cf9b6a9233b7e76cb26c304d3e87f83f484561dd91bb0c539fcad8b829b8790f0afe56f6a1a2377b9f4002cfedd65ee521a528e2114ac3eb
|
||||
DIST bro-2.3.1.tar.gz 10406928 SHA256 ff32d21e335d2ddb3e2942527c3212de6ead4e7ffd6ac958497fa80e04e60800 SHA512 ad77db4c0b4eb7832d9dfe6124bf4a06440f7511e7d2cb297aa442fa086d2f62a1d30ada2a4027e668713340c68f88be3efbc664c681b5a11b8f1d1a9421abc0 WHIRLPOOL 0b430906a78cfa7ddefa9a86aa1d2c7ddaf5218b386ffc50ce43bbb0711a800289e2d9b314425dcc48c70949a6d9c78c4d73173093571197627c704af8bbe1de
|
||||
DIST bro-2.3.tar.gz 10283001 SHA256 46bb9f46fbe71b22afd12ad12e0eb32033fb991a2a60b3bc2d881750249b85cd SHA512 333925a08a9b394c60604a75b4943973d6f6f45ad12967b32861b4d012581bdbd011defc89d6c790c45a772c60b136352ce3a0d950196a7ef7482a5864708315 WHIRLPOOL a912fbd05accde3c4f5f1e39f5d64b2229a6c80226affa70017631fda12caea3d11d8b01ecbeb55a2edcd903c5761831f20d3a553a9a487e265b44b16607be5e
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit autotools cmake-utils
|
||||
|
||||
DESCRIPTION="a advanced intrusion detection system"
|
||||
HOMEPAGE="http://www.bro.org/"
|
||||
SRC_URI="http://www.bro.org/downloads/release/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~arm"
|
||||
IUSE="debug ipv6 perftools"
|
||||
|
||||
DEPEND="dev-libs/geoip
|
||||
dev-libs/openssl
|
||||
sys-apps/file
|
||||
net-libs/libpcap
|
||||
sys-libs/ncurses
|
||||
net-misc/curl
|
||||
perftools? ( dev-util/google-perftools )"
|
||||
RDEPEND="$DEPEND"
|
||||
|
||||
src_configure() {
|
||||
# bro uses special configure script for cmake
|
||||
# neither cmake-utils_xxx nor econf work correctly.
|
||||
./configure \
|
||||
--prefix="${EPREFIX}"/usr \
|
||||
--scriptdir="${EPREFIX}"/usr/share/bro \
|
||||
--conf-files-dir="${EPREFIX}"/etc/bro \
|
||||
$(use debug && echo --enable-debug)\
|
||||
$(use ipv6 && echo --enable-mobile-ipv6)\
|
||||
$(use perftools && echo --enable-perftools)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cd build && emake -j1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
DESTDIR="${D}" emake install || die "install failed"
|
||||
}
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
DESCRIPTION="a advanced intrusion detection system"
|
||||
HOMEPAGE="http://www.bro.org/"
|
||||
SRC_URI="http://www.bro.org/downloads/release/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~arm"
|
||||
IUSE="debug ipv6 perftools"
|
||||
|
||||
DEPEND="dev-libs/geoip
|
||||
dev-libs/openssl
|
||||
sys-apps/file
|
||||
net-libs/libpcap
|
||||
sys-libs/ncurses
|
||||
net-misc/curl
|
||||
dev-lang/swig
|
||||
perftools? ( dev-util/google-perftools )"
|
||||
RDEPEND="$DEPEND"
|
||||
|
||||
src_configure() {
|
||||
# bro uses special configure script for cmake
|
||||
# neither cmake-utils_xxx nor econf work correctly.
|
||||
./configure \
|
||||
--prefix="${EPREFIX}"/usr \
|
||||
--scriptdir="${EPREFIX}"/usr/share/bro \
|
||||
--conf-files-dir="${EPREFIX}"/etc/bro \
|
||||
$(use debug && echo --enable-debug)\
|
||||
$(use ipv6 && echo --enable-mobile-ipv6)\
|
||||
$(use perftools && echo --enable-perftools)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cd build && emake -j1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
DESTDIR="${D}" emake install || die "install failed"
|
||||
}
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
DESCRIPTION="a advanced intrusion detection system"
|
||||
HOMEPAGE="http://www.bro.org/"
|
||||
SRC_URI="http://www.bro.org/downloads/release/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~arm"
|
||||
IUSE="debug ipv6 perftools"
|
||||
|
||||
DEPEND="dev-libs/geoip
|
||||
dev-libs/openssl
|
||||
sys-apps/file
|
||||
net-libs/libpcap
|
||||
sys-libs/ncurses
|
||||
net-misc/curl
|
||||
dev-lang/swig
|
||||
perftools? ( dev-util/google-perftools )"
|
||||
RDEPEND="$DEPEND"
|
||||
|
||||
src_configure() {
|
||||
# bro uses special configure script for cmake
|
||||
# neither cmake-utils_xxx nor econf work correctly.
|
||||
./configure \
|
||||
--prefix="${EPREFIX}"/usr \
|
||||
--scriptdir="${EPREFIX}"/usr/share/bro \
|
||||
--conf-files-dir="${EPREFIX}"/etc/bro \
|
||||
$(use debug && echo --enable-debug)\
|
||||
$(use ipv6 && echo --enable-mobile-ipv6)\
|
||||
$(use perftools && echo --enable-perftools)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cd build && emake -j1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
DESTDIR="${D}" emake install || die "install failed"
|
||||
}
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
DIST fwknop-2.6.0.tar.bz2 1381795 SHA256 341156c919562f30fa3cde93954778ae1711472e4aa9158e428c3d0a154cf882 SHA512 ea62bc8c2003ae512d474b7a80fb875db39f3458cfcb0afe7ef165a693eda10bd0185569ad4fea27ccb5c8984f2ed9593a525f9ff2db86f6fe267db95f5cd0a6 WHIRLPOOL 40ff5e81668c361b75542a6a1f0d2065cd1a4053fb7b786101bf79530186b0bfd2b4886936122031af8ae8a85e4a53ad5d53dbfb6eae71fa9069707fe0a8fbd7
|
||||
DIST fwknop-2.6.1.tar.bz2 1383822 SHA256 cfd92cc4a18de7a8d8dc31ae8fdae8a84e797d641a944f92f6f747cce1f3c112 SHA512 ca28a2c412619d662b1f3eac083851d768da642b7a9f9933c776086e86dde942ffbc39f71201f3dae8dcc44805d002d35b34e044e342689cd5d3763acd410c79 WHIRLPOOL 06d644d9a9eaf1378379ab08db9ae00f5bf768b1b8a1d1493778114525052c02693711c9e11e4987570a59f30c11463d42b9eb18790ea95a9f907785c71c2777
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
FWKNOP_CONF="/etc/fwknop/fwknop.conf"
|
||||
FWKNOPD_OPTS="-c ${FWKNOP_CONF}"
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
#!/sbin/runscript
|
||||
# Copyright 2006 Michael Rash
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# Author: Michael Rash
|
||||
# Developed for the Gentoo Linux distribution
|
||||
# $Id: fwknop-init.gentoo 568 2006-10-16 02:08:51Z mbr $
|
||||
|
||||
depend() {
|
||||
need logger net
|
||||
}
|
||||
|
||||
checkconfig() {
|
||||
if [ ! -f ${FWKNOP_CONF} ] ; then
|
||||
eerror "Please create ${FWKNOP_CONF}"
|
||||
eerror "You can find a sample config file at ${FWKNOP_CONF}.sample"
|
||||
return 1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
start() {
|
||||
checkconfig || return 1
|
||||
|
||||
ebegin "Starting ${SVCNAME}"
|
||||
start-stop-daemon --start --exec /usr/sbin/fwknopd -- ${FWKNOPD_OPTS}
|
||||
eend $? "Failed to start ${SVCNAME}"
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping knopwatchd"
|
||||
start-stop-daemon --stop --quiet --pidfile /var/run/fwknop/knopwatchd.pid
|
||||
eend $? "Failed to stop knopwatchd"
|
||||
|
||||
ebegin "Stopping ${SVCNAME}"
|
||||
start-stop-daemon --stop --quiet --pidfile /var/run/fwknop/fwknopd.pid
|
||||
eend $? "Failed to stop ${SVCNAME}"
|
||||
|
||||
if [ -f /var/run/fwknop/knopmd.pid ] ; then
|
||||
ebegin "Stopping knopmd"
|
||||
start-stop-daemon --stop --quiet --pidfile /var/run/fwknop/knopmd.pid
|
||||
eend $? "Failed to stop knopmd"
|
||||
fi
|
||||
|
||||
if [ -f /var/run/fwknop/knoptm.pid ] ; then
|
||||
ebegin "Stopping knoptm"
|
||||
start-stop-daemon --stop --quiet --pidfile /var/run/fwknop/knoptm.pid
|
||||
eend $? "Failed to stop knoptm"
|
||||
fi
|
||||
|
||||
if [ -f /var/run/fwknop/fwknop_serv.pid ] ; then
|
||||
ebegin "Stopping fwknop_serv"
|
||||
start-stop-daemon --stop --quiet --pidfile /var/run/fwknop/fwknop_serv.pid
|
||||
eend $? "Failed to stop fwknop_serv"
|
||||
fi
|
||||
}
|
||||
|
|
@ -1,72 +0,0 @@
|
|||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python{2_7,3_3} )
|
||||
inherit versionator linux-info distutils-r1
|
||||
|
||||
MY_PV=$(delete_version_separator 3)
|
||||
MY_P=${PN}-${MY_PV}
|
||||
|
||||
DESCRIPTION="Single Packet Authorization and Port Knocking application"
|
||||
HOMEPAGE="http://www.cipherdyne.org/fwknop/"
|
||||
SRC_URI="http://www.cipherdyne.org/${PN}/download/${MY_P}.tar.bz2"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~x86 ~amd64"
|
||||
IUSE="+gpg +client +server python"
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="${DEPEND}
|
||||
net-libs/libpcap
|
||||
net-firewall/iptables
|
||||
>=app-crypt/gpgme-1.3.0-r1"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
ERROR_NET="PF_RING-${PV} requires CONFIG_NET=y set in the kernel."
|
||||
CONFIG_CHECK="~NETFILTER_XT_MATCH_COMMENT"
|
||||
|
||||
pkg_setup() {
|
||||
linux-info_pkg_setup
|
||||
if use python; then
|
||||
python_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
sed -i 's|gpgme.h|gpgme/gpgme.h|g' lib/{fko_common.h,fko_error.c} || die
|
||||
if use python; then
|
||||
cd "${S}/python"
|
||||
distutils-r1_src_prepare
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_enable client) \
|
||||
$(use_enable server) \
|
||||
$(use_with gpg gpgme)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake || die "emake failed"
|
||||
if use python; then
|
||||
cd "${S}/python"
|
||||
distutils-r1_src_compile
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# copy init debian script
|
||||
newinitd "${FILESDIR}"/fwknopd.initd fwknopd
|
||||
newconfd "${FILESDIR}"/fwknopd.confd fwknopd
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
if use python; then
|
||||
cd "${S}/python"
|
||||
distutils-r1_src_install
|
||||
fi
|
||||
}
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit versionator linux-info
|
||||
|
||||
MY_PV=$(delete_version_separator 3)
|
||||
MY_P=${PN}-${MY_PV}
|
||||
|
||||
DESCRIPTION="Single Packet Authorization and Port Knocking application"
|
||||
HOMEPAGE="http://www.cipherdyne.org/fwknop/"
|
||||
SRC_URI="http://www.cipherdyne.org/${PN}/download/${MY_P}.tar.bz2"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~x86 ~amd64"
|
||||
IUSE="+gpg +client +server"
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="${DEPEND}
|
||||
net-libs/libpcap
|
||||
net-firewall/iptables
|
||||
>=app-crypt/gpgme-1.3.0-r1"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
ERROR_NET="PF_RING-${PV} requires CONFIG_NET=y set in the kernel."
|
||||
CONFIG_CHECK="~NETFILTER_XT_MATCH_COMMENT"
|
||||
|
||||
pkg_setup() {
|
||||
linux-info_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
sed -i 's|gpgme.h|gpgme/gpgme.h|g' lib/{fko_common.h,fko_error.c} || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_enable client) \
|
||||
$(use_enable server) \
|
||||
$(use_with gpg gpgme)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# copy init debian script
|
||||
newinitd "${FILESDIR}"/fwknopd.initd fwknopd
|
||||
newconfd "${FILESDIR}"/fwknopd.confd fwknopd
|
||||
emake DESTDIR="${D}" install
|
||||
}
|
||||
|
|
@ -1,72 +0,0 @@
|
|||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python{2_7,3_3} )
|
||||
inherit versionator linux-info distutils-r1
|
||||
|
||||
MY_PV=$(delete_version_separator 3)
|
||||
MY_P=${PN}-${MY_PV}
|
||||
|
||||
DESCRIPTION="Single Packet Authorization and Port Knocking application"
|
||||
HOMEPAGE="http://www.cipherdyne.org/fwknop/"
|
||||
SRC_URI="http://www.cipherdyne.org/${PN}/download/${MY_P}.tar.bz2"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~x86 ~amd64"
|
||||
IUSE="+gpg +client +server python"
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="${DEPEND}
|
||||
net-libs/libpcap
|
||||
net-firewall/iptables
|
||||
>=app-crypt/gpgme-1.3.0-r1"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
ERROR_NET="PF_RING-${PV} requires CONFIG_NET=y set in the kernel."
|
||||
CONFIG_CHECK="~NETFILTER_XT_MATCH_COMMENT"
|
||||
|
||||
pkg_setup() {
|
||||
linux-info_pkg_setup
|
||||
if use python; then
|
||||
python_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
sed -i 's|gpgme.h|gpgme/gpgme.h|g' lib/{fko_common.h,fko_error.c} || die
|
||||
if use python; then
|
||||
cd "${S}/python"
|
||||
distutils-r1_src_prepare
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_enable client) \
|
||||
$(use_enable server) \
|
||||
$(use_with gpg gpgme)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake || die "emake failed"
|
||||
if use python; then
|
||||
cd "${S}/python"
|
||||
distutils-r1_src_compile
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# copy init debian script
|
||||
newinitd "${FILESDIR}"/fwknopd.initd fwknopd
|
||||
newconfd "${FILESDIR}"/fwknopd.confd fwknopd
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
if use python; then
|
||||
cd "${S}/python"
|
||||
distutils-r1_src_install
|
||||
fi
|
||||
}
|
||||
|
|
@ -1 +0,0 @@
|
|||
DIST bluez-5.39.tar.xz 1659576 SHA256 21d1bc9150d3576296595217efb98a746b592389d25d5637e8bee5da7272593b SHA512 a0c43d0de4dcbfa20bbfe34e805a60703f4b94d0aa6c1d128a0917dfaa490593b26eb555b0a343ff44d1f94349b61776189438039e489ddcf8fe107354740230 WHIRLPOOL da299f8556418cf38d5a05b91079fdb6ff85761127d4708783bcd97fa4502e208187c013b1d8622688b438308506fbb06732426c35f6fedc2fe25cfd68a93486
|
||||
|
|
@ -1,237 +0,0 @@
|
|||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
|
||||
|
||||
inherit autotools eutils multilib python-single-r1 readme.gentoo-r1 systemd udev user multilib-minimal
|
||||
|
||||
DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
|
||||
HOMEPAGE="http://www.bluez.org"
|
||||
SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2+ LGPL-2.1+"
|
||||
SLOT="0/3"
|
||||
KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ~ppc64 x86"
|
||||
|
||||
IUSE="cups doc debug deprecated extra-tools experimental +obex +readline selinux systemd test test-programs +udev"
|
||||
REQUIRED_USE="
|
||||
test? ( ${PYTHON_REQUIRED_USE} )
|
||||
test-programs? ( ${PYTHON_REQUIRED_USE} )
|
||||
"
|
||||
|
||||
CDEPEND="
|
||||
>=dev-libs/glib-2.28:2
|
||||
>=sys-apps/dbus-1.6:=
|
||||
>=sys-apps/hwids-20121202.2
|
||||
cups? ( net-print/cups:= )
|
||||
obex? ( dev-libs/libical:= )
|
||||
readline? ( sys-libs/readline:= )
|
||||
systemd? ( sys-apps/systemd )
|
||||
udev? ( >=virtual/udev-172 )
|
||||
"
|
||||
TEST_DEPS="${PYTHON_DEPS}
|
||||
>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
|
||||
dev-python/pygobject:3[${PYTHON_USEDEP}]
|
||||
"
|
||||
|
||||
DEPEND="${CDEPEND}
|
||||
virtual/pkgconfig
|
||||
test? ( ${TEST_DEPS} )
|
||||
"
|
||||
RDEPEND="${CDEPEND}
|
||||
selinux? ( sec-policy/selinux-bluetooth )
|
||||
test-programs? ( ${TEST_DEPS} )
|
||||
"
|
||||
DOC_CONTENTS="
|
||||
If you want to use rfcomm as a normal user, you need to add the user
|
||||
to the uucp group.
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
# Use static group "plugdev" if there is no ConsoleKit (or systemd logind)
|
||||
"${FILESDIR}"/bluez-plugdev.patch
|
||||
|
||||
# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
|
||||
# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
|
||||
"${FILESDIR}"/bluez-udevadm-path.patch
|
||||
|
||||
# build: Quote systemd variable names, bug #527432
|
||||
"${FILESDIR}"/bluez-5.39-systemd-quote.patch
|
||||
|
||||
# http://article.gmane.org/gmane.linux.bluez.kernel/67230
|
||||
# Fedora patches
|
||||
# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
|
||||
"${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
|
||||
|
||||
# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
|
||||
"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
|
||||
|
||||
# http://www.spinics.net/lists/linux-bluetooth/msg41264.html
|
||||
"${FILESDIR}"/0002-autopair-Don-t-handle-the-iCade.patch
|
||||
|
||||
# ???
|
||||
"${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup plugdev
|
||||
|
||||
if use test || use test-programs; then
|
||||
python-single-r1_pkg_setup
|
||||
fi
|
||||
|
||||
if ! use udev; then
|
||||
ewarn
|
||||
ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
|
||||
ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
|
||||
ewarn "and hid2hci will not be available."
|
||||
ewarn
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
if use cups; then
|
||||
sed -i \
|
||||
-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
|
||||
Makefile.{in,tools} || die
|
||||
fi
|
||||
|
||||
eautoreconf
|
||||
|
||||
multilib_copy_sources
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myconf=(
|
||||
# readline is automagic when client is enabled
|
||||
# --enable-client always needs readline, bug #504038
|
||||
ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
|
||||
)
|
||||
|
||||
if ! multilib_is_native_abi; then
|
||||
myconf+=(
|
||||
# deps not used for the library
|
||||
{DBUS,GLIB}_{CFLAGS,LIBS}=' '
|
||||
)
|
||||
fi
|
||||
|
||||
econf \
|
||||
--localstatedir=/var \
|
||||
--disable-android \
|
||||
--enable-datafiles \
|
||||
--enable-experimental \
|
||||
--enable-optimization \
|
||||
$(use_enable debug) \
|
||||
--enable-pie \
|
||||
--enable-threads \
|
||||
--enable-library \
|
||||
--enable-tools \
|
||||
--enable-manpages \
|
||||
--enable-monitor \
|
||||
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
|
||||
$(multilib_native_use_enable cups) \
|
||||
$(multilib_native_use_enable deprecated) \
|
||||
$(multilib_native_use_enable experimental) \
|
||||
$(multilib_native_use_enable obex) \
|
||||
$(multilib_native_use_enable readline client) \
|
||||
$(multilib_native_use_enable systemd) \
|
||||
$(multilib_native_use_enable test-programs test) \
|
||||
$(multilib_native_use_enable udev) \
|
||||
$(multilib_native_use_enable udev sixaxis)
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
if multilib_is_native_abi; then
|
||||
default
|
||||
else
|
||||
emake -f Makefile -f - libs \
|
||||
<<<'libs: $(lib_LTLIBRARIES)'
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
multilib_is_native_abi && default
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
if multilib_is_native_abi; then
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
# Only install extra-tools when relevant USE flag is enabled
|
||||
if use extra-tools; then
|
||||
ewarn "Upstream doesn't support using this tools and their bugs are"
|
||||
ewarn "likely to be ignored forever, also that tools can break"
|
||||
ewarn "without previous announcement."
|
||||
ewarn "Upstream also states all this tools are not really needed,"
|
||||
ewarn "then, if you still need to rely on them, you must ask them"
|
||||
ewarn "to either install that tool by default or add the needed"
|
||||
ewarn "functionality to the existing 'official' tools."
|
||||
ewarn "Please report this issues to:"
|
||||
ewarn "http://www.bluez.org/development/lists/"
|
||||
|
||||
# Upstream doesn't install this, bug #524640
|
||||
# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
|
||||
# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
|
||||
# gatttool is only built with readline, bug #530776
|
||||
if use readline; then
|
||||
dobin attrib/gatttool
|
||||
dobin tools/btmgmt
|
||||
fi
|
||||
dobin tools/hex2hcd
|
||||
fi
|
||||
|
||||
# Unittests are not that useful once installed, so make them optional
|
||||
if use test-programs; then
|
||||
#remove python3 only tests
|
||||
rm -f "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-{client,server}
|
||||
python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test
|
||||
for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do
|
||||
dosym "${i}" /usr/bin/bluez-"${i##*/}"
|
||||
done
|
||||
fi
|
||||
else
|
||||
emake DESTDIR="${D}" \
|
||||
install-includeHEADERS \
|
||||
install-libLTLIBRARIES \
|
||||
install-pkgconfigDATA
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
prune_libtool_files --modules
|
||||
|
||||
keepdir /var/lib/bluetooth
|
||||
|
||||
# Upstream don't want people to play with them
|
||||
# But we keep installing them due to 'historical' reasons
|
||||
insinto /etc/bluetooth
|
||||
local d
|
||||
for d in input network proximity; do
|
||||
doins profiles/${d}/${d}.conf
|
||||
done
|
||||
doins src/main.conf
|
||||
|
||||
newinitd "${FILESDIR}"/bluetooth-init.d-r3 bluetooth
|
||||
newinitd "${FILESDIR}"/rfcomm-init.d-r2 rfcomm
|
||||
|
||||
einstalldocs
|
||||
use doc && dodoc doc/*.txt
|
||||
readme.gentoo_create_doc
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
readme.gentoo_print_elog
|
||||
|
||||
use udev && udev_reload
|
||||
|
||||
has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp."
|
||||
|
||||
if ! has_version sys-auth/consolekit && ! has_version sys-apps/systemd; then
|
||||
elog "Since you don't have sys-auth/consolekit neither sys-apps/systemd, you will"
|
||||
elog "need to add the user to the plugdev group."
|
||||
fi
|
||||
}
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001
|
||||
From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org>
|
||||
Date: Sat, 12 Oct 2013 17:45:25 +0200
|
||||
Subject: [PATCH] Allow using obexd without systemd in the user session
|
||||
|
||||
Not all sessions run systemd --user (actually, the majority
|
||||
doesn't), so the dbus daemon must be able to spawn obexd
|
||||
directly, and to do so it needs the full path of the daemon.
|
||||
---
|
||||
Makefile.obexd | 4 ++--
|
||||
obexd/src/org.bluez.obex.service | 4 ----
|
||||
obexd/src/org.bluez.obex.service.in | 4 ++++
|
||||
3 files changed, 6 insertions(+), 6 deletions(-)
|
||||
delete mode 100644 obexd/src/org.bluez.obex.service
|
||||
create mode 100644 obexd/src/org.bluez.obex.service.in
|
||||
|
||||
diff --git a/Makefile.obexd b/Makefile.obexd
|
||||
index 3760867..142e7c3 100644
|
||||
--- a/Makefile.obexd
|
||||
+++ b/Makefile.obexd
|
||||
@@ -2,12 +2,12 @@
|
||||
if SYSTEMD
|
||||
systemduserunitdir = @SYSTEMD_USERUNITDIR@
|
||||
systemduserunit_DATA = obexd/src/obex.service
|
||||
+endif
|
||||
|
||||
dbussessionbusdir = @DBUS_SESSIONBUSDIR@
|
||||
dbussessionbus_DATA = obexd/src/org.bluez.obex.service
|
||||
-endif
|
||||
|
||||
-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
|
||||
+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
|
||||
|
||||
obex_plugindir = $(libdir)/obex/plugins
|
||||
|
||||
diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
|
||||
deleted file mode 100644
|
||||
index a538088..0000000
|
||||
--- a/obexd/src/org.bluez.obex.service
|
||||
+++ /dev/null
|
||||
@@ -1,4 +0,0 @@
|
||||
-[D-BUS Service]
|
||||
-Name=org.bluez.obex
|
||||
-Exec=/bin/false
|
||||
-SystemdService=dbus-org.bluez.obex.service
|
||||
diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
|
||||
new file mode 100644
|
||||
index 0000000..9c815f2
|
||||
--- /dev/null
|
||||
+++ b/obexd/src/org.bluez.obex.service.in
|
||||
@@ -0,0 +1,4 @@
|
||||
+[D-BUS Service]
|
||||
+Name=org.bluez.obex
|
||||
+Exec=@libexecdir@/obexd
|
||||
+SystemdService=dbus-org.bluez.obex.service
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
From f7861d27fbcbc519f57d8496aa9486f487908821 Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Sat, 9 Nov 2013 18:13:43 +0100
|
||||
Subject: [PATCH 1/5] obex: Use GLib helper function to manipulate paths
|
||||
|
||||
Instead of trying to do it by hand. This also makes sure that
|
||||
relative paths aren't used by the agent.
|
||||
---
|
||||
obexd/src/manager.c | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/obexd/src/manager.c b/obexd/src/manager.c
|
||||
index cec8a39..f18896e 100644
|
||||
--- a/obexd/src/manager.c
|
||||
+++ b/obexd/src/manager.c
|
||||
@@ -651,14 +651,14 @@ static void agent_reply(DBusPendingCall *call, void *user_data)
|
||||
DBUS_TYPE_STRING, &name,
|
||||
DBUS_TYPE_INVALID)) {
|
||||
/* Splits folder and name */
|
||||
- const char *slash = strrchr(name, '/');
|
||||
+ gboolean is_relative = !g_path_is_absolute(name);
|
||||
DBG("Agent replied with %s", name);
|
||||
- if (!slash) {
|
||||
- agent->new_name = g_strdup(name);
|
||||
+ if (is_relative) {
|
||||
+ agent->new_name = g_path_get_basename(name);
|
||||
agent->new_folder = NULL;
|
||||
} else {
|
||||
- agent->new_name = g_strdup(slash + 1);
|
||||
- agent->new_folder = g_strndup(name, slash - name);
|
||||
+ agent->new_name = g_path_get_basename(name);
|
||||
+ agent->new_folder = g_path_get_dirname(name);
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
1.8.4.2
|
||||
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
From c16ae7041c7511d8d1ed8441f696716fa6a9117e Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Tue, 19 Nov 2013 14:11:39 +0100
|
||||
Subject: [PATCH 2/5] autopair: Don't handle the iCade
|
||||
|
||||
We can't easily enter digits other than 1 through 4 (inclusive)
|
||||
so leave it up to the agent to figure out a good passcode
|
||||
for the iCade.
|
||||
|
||||
Note that we can not use the VID/PID of the device, as it is not
|
||||
yet known at that point.
|
||||
---
|
||||
plugins/autopair.c | 12 +++++++++++-
|
||||
1 file changed, 11 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/plugins/autopair.c b/plugins/autopair.c
|
||||
index 8c98c12..5d2f6f7 100644
|
||||
--- a/plugins/autopair.c
|
||||
+++ b/plugins/autopair.c
|
||||
@@ -57,13 +57,23 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter,
|
||||
{
|
||||
char addr[18];
|
||||
char pinstr[7];
|
||||
+ char name[25];
|
||||
uint32_t class;
|
||||
|
||||
ba2str(device_get_address(device), addr);
|
||||
|
||||
class = btd_device_get_class(device);
|
||||
|
||||
- DBG("device %s 0x%x", addr, class);
|
||||
+ device_get_name(device, name, sizeof(name));
|
||||
+ name[sizeof(name) - 1] = 0;
|
||||
+
|
||||
+ DBG("device %s (%s) 0x%x", addr, name, class);
|
||||
+
|
||||
+ g_message ("vendor 0x%X product: 0x%X", btd_device_get_vendor (device), btd_device_get_product (device));
|
||||
+
|
||||
+ /* The iCade shouldn't use random PINs like normal keyboards */
|
||||
+ if (name != NULL && strstr(name, "iCade") != NULL)
|
||||
+ return 0;
|
||||
|
||||
/* This is a class-based pincode guesser. Ignore devices with an
|
||||
* unknown class.
|
||||
--
|
||||
1.8.4.2
|
||||
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
From 67e5477687a2753d3f7b300bcfdc74464d8ad41f Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Mon, 9 Dec 2013 18:04:56 +0100
|
||||
Subject: [PATCH 4/5] agent: Assert possible infinite loop
|
||||
|
||||
---
|
||||
src/agent.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/agent.c b/src/agent.c
|
||||
index bcba969..b292881 100644
|
||||
--- a/src/agent.c
|
||||
+++ b/src/agent.c
|
||||
@@ -203,6 +203,8 @@ void agent_unref(struct agent *agent)
|
||||
if (agent->ref > 0)
|
||||
return;
|
||||
|
||||
+ g_assert (agent->ref == 0);
|
||||
+
|
||||
if (agent->request) {
|
||||
DBusError err;
|
||||
agent_pincode_cb pincode_cb;
|
||||
--
|
||||
1.8.4.2
|
||||
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
depend() {
|
||||
after coldplug
|
||||
need dbus localmount hostname
|
||||
}
|
||||
|
||||
start() {
|
||||
ebegin "Starting ${SVCNAME}"
|
||||
start-stop-daemon --start --background --exec /usr/libexec/bluetooth/bluetoothd
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Shutting down ${SVCNAME}"
|
||||
start-stop-daemon --stop --quiet --exec /usr/libexec/bluetooth/bluetoothd
|
||||
eend $?
|
||||
}
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
From f554e152715a3c06a69954d9d4f15415c798e083 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Gilbert <floppym@gentoo.org>
|
||||
Date: Sun, 3 Apr 2016 14:30:02 -0400
|
||||
Subject: [PATCH] build: Quote systemd variable names
|
||||
|
||||
If the systemd-m4 package has been installed, SYSTEMD_USERUNITDIR is
|
||||
defined as a macro. Quote this name to prevent macro expansion.
|
||||
|
||||
Bug: https://bugs.gentoo.org/527432
|
||||
---
|
||||
configure.ac | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 1679a47..4664003 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -216,7 +216,7 @@ if (test "${enable_systemd}" != "no" && test -z "${path_systemunitdir}"); then
|
||||
fi
|
||||
AC_MSG_RESULT([${path_systemunitdir}])
|
||||
fi
|
||||
-AC_SUBST(SYSTEMD_SYSTEMUNITDIR, [${path_systemunitdir}])
|
||||
+AC_SUBST([SYSTEMD_SYSTEMUNITDIR], [${path_systemunitdir}])
|
||||
|
||||
AC_ARG_WITH([systemduserunitdir],
|
||||
AC_HELP_STRING([--with-systemduserunitdir=DIR],
|
||||
@@ -230,7 +230,7 @@ if (test "${enable_systemd}" != "no" && test -z "${path_userunitdir}"); then
|
||||
fi
|
||||
AC_MSG_RESULT([${path_userunitdir}])
|
||||
fi
|
||||
-AC_SUBST(SYSTEMD_USERUNITDIR, [${path_userunitdir}])
|
||||
+AC_SUBST([SYSTEMD_USERUNITDIR], [${path_userunitdir}])
|
||||
|
||||
AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles],
|
||||
[do not install configuration and data files]),
|
||||
--
|
||||
2.8.0
|
||||
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
diff -Nurp bluez-4.39.orig/src/bluetooth.conf bluez-4.39/src/bluetooth.conf
|
||||
--- bluez-4.39.orig/src/bluetooth.conf 2008-12-20 20:18:10.000000000 +0100
|
||||
+++ bluez-4.39/src/bluetooth.conf 2009-09-05 13:30:34.411581498 +0200
|
||||
@@ -17,6 +17,10 @@
|
||||
<allow send_destination="org.bluez"/>
|
||||
</policy>
|
||||
|
||||
+ <policy group="plugdev">
|
||||
+ <allow send_destination="org.bluez"/>
|
||||
+ </policy>
|
||||
+
|
||||
<policy context="default">
|
||||
<deny send_destination="org.bluez"/>
|
||||
</policy>
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
--- a/tools/hid2hci.rules
|
||||
+++ b/tools/hid2hci.rules
|
||||
@@ -20,6 +20,7 @@
|
||||
# Unfortunately the only event seen is the BT device disappearing, so the mouse
|
||||
# device needs to be chased down on the USB bus.
|
||||
ATTR{bDeviceClass}=="e0", ATTR{bDeviceSubClass}=="01", ATTR{bDeviceProtocol}=="01", ATTR{idVendor}=="413c", \
|
||||
+ ENV{REMOVE_CMD}="/usr/bin/udevadm trigger --action=change --subsystem-match=usb --property-match=HID2HCI_SWITCH=1" \
|
||||
ENV{REMOVE_CMD}="/sbin/udevadm trigger --action=change --subsystem-match=usb --property-match=HID2HCI_SWITCH=1"
|
||||
|
||||
# CSR devices
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
depend() {
|
||||
need bluetooth
|
||||
}
|
||||
|
||||
checkconfig() {
|
||||
if [ -z "${ADDRESS}" ]; then
|
||||
eerror "ADDRESS must be set"
|
||||
return 1
|
||||
fi
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
start() {
|
||||
local DEVICE=${RC_SVCNAME#*.}
|
||||
|
||||
checkconfig || return 1
|
||||
|
||||
ebegin "Starting ${RC_SVCNAME}"
|
||||
rfcomm bind "${DEVICE}" "${ADDRESS}" ${CHANNEL}
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
local DEVICE=${RC_SVCNAME#*.}
|
||||
|
||||
ebegin "Shutting down ${RC_SVCNAME}"
|
||||
rfcomm release "${DEVICE}"
|
||||
eend $?
|
||||
}
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>pacho@gentoo.org</email>
|
||||
<name>Pacho Ramos</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="deprecated">Build deprecated plugins</flag>
|
||||
<flag name="experimental">Build experimental plugins</flag>
|
||||
<flag name="extra-tools">Install tools that upstream doesn't install on
|
||||
purpose by default. All this tools shouldn't be used. Then, please
|
||||
notify upstream about you still need them to let them know the
|
||||
situation.</flag>
|
||||
<flag name="test-programs">Install tools for testing of
|
||||
various Bluetooth functions</flag>
|
||||
<flag name="obex">Enable OBEX transfer support.</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="cpe">cpe:/a:bluez:bluez</remote-id>
|
||||
<remote-id type="cpe">cpe:/a:bluez:bluez-libs</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
|
@ -1 +0,0 @@
|
|||
DIST newlib-1.17.0.tar.gz 12768253 SHA256 b7c8135f7dbff0269436da26917d9f01fe33f4da0f37c07c3f55066cba80274e SHA512 4e58f5446e8000f7df9b874a1fe943fc48021f7e6a0618c900c600340c8f29816f5b5ccf04e79a24af8bffba56e0083ec9520cfc6bfc85243952a8d7444c7845 WHIRLPOOL 767ec9cab9e6900a947ee3a52fecb3044a6ad24d5b27d955dd1686b87b423f461bb8cfaeee8583653c66f744c8720ab0dbb75d619060c68a0f20f9f9ff5c4714
|
||||
|
|
@ -1,74 +0,0 @@
|
|||
# Copyright 1999-2010 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-libs/newlib/newlib-1.16.0.ebuild,v 1.2 2008/10/27 06:59:51 vapier Exp $
|
||||
|
||||
inherit eutils flag-o-matic toolchain-funcs
|
||||
|
||||
export CBUILD=${CBUILD:-${CHOST}}
|
||||
export CTARGET=${CTARGET:-${CHOST}}
|
||||
if [[ ${CTARGET} == ${CHOST} ]] ; then
|
||||
if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
|
||||
export CTARGET=${CATEGORY/cross-}
|
||||
fi
|
||||
fi
|
||||
|
||||
# Handle the case where we want newlib on glibc ...
|
||||
if [[ ${CTARGET} == ${CHOST} ]] && [[ ${CHOST} != *-newlib ]] ; then
|
||||
export CTARGET=${CHOST%%-*}-pc-linux-newlib
|
||||
fi
|
||||
|
||||
DESCRIPTION="Newlib is a C library intended for use on embedded systems"
|
||||
HOMEPAGE="http://sourceware.org/newlib/"
|
||||
SRC_URI="ftp://sources.redhat.com/pub/newlib/${P}.tar.gz"
|
||||
|
||||
LICENSE="NEWLIB LIBGLOSS GPL-2"
|
||||
[[ ${CTARGET} != ${CHOST} ]] \
|
||||
&& SLOT="${CTARGET}" \
|
||||
|| SLOT="0"
|
||||
KEYWORDS=" ~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
|
||||
IUSE="nls threads unicode crosscompile_opts_headers-only"
|
||||
RESTRICT="strip"
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND=""
|
||||
|
||||
NEWLIBBUILD="${WORKDIR}/build"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
mkdir -p "${NEWLIBBUILD}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# we should fix this ...
|
||||
unset LDFLAGS
|
||||
CHOST=${CTARGET} strip-unsupported-flags
|
||||
|
||||
local myconf=""
|
||||
# hardwired to avoid breakages
|
||||
[[ $(tc-is-softfloat) != "no" ]] \
|
||||
&& myconf="--disable-newlib-hw-fp" \
|
||||
|| myconf="--enable-newlib-hw-fp"
|
||||
[[ ${CTARGET} == "spu" ]] \
|
||||
&& myconf="${myconf} --disable-threads" \
|
||||
|| myconf="${myconf} $(use_enable threads)"
|
||||
|
||||
cd "${NEWLIBBUILD}"
|
||||
|
||||
ECONF_SOURCE=${S} \
|
||||
econf \
|
||||
$(use_enable unicode newlib-mb) \
|
||||
$(use_enable nls) \
|
||||
${myconf} \
|
||||
|| die "econf failed"
|
||||
emake || die "emake failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cd "${NEWLIBBUILD}"
|
||||
emake -j1 DESTDIR="${D}" install
|
||||
# env -uRESTRICT CHOST=${CTARGET} prepallstrip
|
||||
# minor hack to keep things clean
|
||||
rm -fR "${D}"/usr/share/info
|
||||
rm -fR "${D}"/usr/info
|
||||
}
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
DIST amd-catalyst-omega-14.12-linux-run-installers.zip 155616187 SHA256 68669836f20ad4351e08b13c5766c6b2ffc6b8cd2a37e9baf55779da32d3a249 SHA512 f87be6a56c03ca4aae3782668af8700d83c85872387753cf002ba4a0e0816fae9af29841a4390db972bfe2f7fb853571b32f8434c2008983461b80699347ac21 WHIRLPOOL 2675a387abd372b34c51f4e8ebfd6547300a8c3ffcc0562633838bc0cdaec3675ca3f4cfa2ab7481c8fa1238a46059f5f848611780638ef6d2301a527d900326
|
||||
DIST xvba-sdk-0.74-404001.tar.gz 583847 SHA256 731a2c489f2fb5d7318c1976061b26c1057a696f46d09dcf55fbada97fed17eb SHA512 aa1dd52b59eeeabd026d8b76e3b75eaf02587ef286438ba28884afeef5a5efaf50283b5ee4f5b81b12cf79cb4ec77c9a235a886b29fb7cdf850c9779f4b07b35 WHIRLPOOL 69917b746d353a884512e97b9d9a9b89e6f51add3119e69ddd119d51c0c3f2820b93a449fe42bd76d671dc505f92bf25b7f2c5868b33768fc68a19596e460951
|
||||
|
|
@ -1,612 +0,0 @@
|
|||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild,v 1.6 2015/06/14 18:12:07 ulm Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
MULTILIB_COMPAT=( abi_x86_{32,64} )
|
||||
inherit eutils multilib-build linux-info linux-mod toolchain-funcs versionator pax-utils
|
||||
|
||||
DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets"
|
||||
HOMEPAGE="http://www.amd.com"
|
||||
RUN="${WORKDIR}/fglrx-14.501.1003/amd-driver-installer-14.501.1003-x86.x86_64.run"
|
||||
SLOT="1"
|
||||
# Uses javascript for download YESSSS
|
||||
#DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip"
|
||||
DRIVERS_URI="mirror://gentoo/amd-catalyst-omega-14.12-linux-run-installers.zip"
|
||||
XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"
|
||||
SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
|
||||
FOLDER_PREFIX="common/"
|
||||
IUSE="debug +modules qt4 static-libs pax_kernel"
|
||||
|
||||
LICENSE="AMD GPL-2 QPL-1.0"
|
||||
KEYWORDS="-* amd64 x86"
|
||||
|
||||
RESTRICT="bindist test"
|
||||
|
||||
RDEPEND="
|
||||
<=x11-base/xorg-server-1.16.49[-minimal]
|
||||
>=app-eselect/eselect-opengl-1.0.7
|
||||
app-eselect/eselect-opencl
|
||||
sys-power/acpid
|
||||
x11-apps/xauth
|
||||
x11-libs/libX11
|
||||
x11-libs/libXext
|
||||
x11-libs/libXinerama
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libXrender
|
||||
virtual/glu
|
||||
!x11-libs/xvba-video
|
||||
abi_x86_32? (
|
||||
virtual/glu[abi_x86_32]
|
||||
x11-libs/libX11[abi_x86_32]
|
||||
x11-libs/libXext[abi_x86_32]
|
||||
x11-libs/libXinerama[abi_x86_32]
|
||||
x11-libs/libXrandr[abi_x86_32]
|
||||
x11-libs/libXrender[abi_x86_32]
|
||||
)
|
||||
qt4? (
|
||||
x11-libs/libICE
|
||||
x11-libs/libSM
|
||||
x11-libs/libXcursor
|
||||
x11-libs/libXfixes
|
||||
x11-libs/libXxf86vm
|
||||
dev-qt/qtcore:4
|
||||
dev-qt/qtgui:4[accessibility]
|
||||
)
|
||||
"
|
||||
if [[ legacy != ${SLOT} ]]; then
|
||||
RDEPEND="${RDEPEND}
|
||||
!x11-drivers/ati-drivers:legacy"
|
||||
else
|
||||
RDEPEND="${RDEPEND}
|
||||
!x11-drivers/ati-drivers:1"
|
||||
fi
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
x11-proto/inputproto
|
||||
x11-proto/xf86miscproto
|
||||
x11-proto/xf86vidmodeproto
|
||||
x11-proto/xineramaproto
|
||||
x11-libs/libXtst
|
||||
sys-apps/findutils
|
||||
app-misc/pax-utils
|
||||
app-arch/unzip
|
||||
"
|
||||
|
||||
EMULTILIB_PKG="true"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
# QA Silencing
|
||||
QA_TEXTRELS="
|
||||
usr/lib*/opengl/ati/lib/libGL.so.1.2
|
||||
usr/lib*/libatiadlxx.so
|
||||
usr/lib*/xorg/modules/glesx.so
|
||||
usr/lib*/libaticaldd.so
|
||||
usr/lib*/dri/fglrx_dri.so
|
||||
"
|
||||
|
||||
QA_EXECSTACK="
|
||||
opt/bin/atiode
|
||||
opt/bin/amdcccle
|
||||
usr/lib*/opengl/ati/lib/libGL.so.1.2
|
||||
usr/lib*/dri/fglrx_dri.so
|
||||
"
|
||||
|
||||
QA_WX_LOAD="
|
||||
usr/lib*/opengl/ati/lib/libGL.so.1.2
|
||||
usr/lib*/dri/fglrx_dri.so
|
||||
"
|
||||
|
||||
QA_PRESTRIPPED="
|
||||
usr/lib\(32\|64\)\?/libXvBAW.so.1.0
|
||||
usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
|
||||
usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
|
||||
usr/lib\(32\|64\)\?/xorg/modules/glesx.so
|
||||
usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
|
||||
usr/lib\(32\|64\)\?/libaticaldd.so
|
||||
usr/lib\(32\|64\)\?/dri/fglrx_dri.so
|
||||
usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
|
||||
usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\).so
|
||||
"
|
||||
|
||||
QA_SONAME="
|
||||
usr/lib\(32\|64\)\?/libatiadlxx.so
|
||||
usr/lib\(32\|64\)\?/libaticalcl.so
|
||||
usr/lib\(32\|64\)\?/libaticaldd.so
|
||||
usr/lib\(32\|64\)\?/libaticalrt.so
|
||||
usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
|
||||
usr/lib\(32\|64\)\?/libamdhsasc\(32\|64\)\?.so
|
||||
"
|
||||
|
||||
QA_DT_HASH="
|
||||
opt/bin/amdcccle
|
||||
opt/bin/aticonfig
|
||||
opt/bin/atiodcli
|
||||
opt/bin/atiode
|
||||
opt/bin/clinfo
|
||||
opt/bin/fglrxinfo
|
||||
opt/sbin/atieventsd
|
||||
opt/sbin/amdnotifyui
|
||||
usr/lib\(32\|64\)\?/libaticalcl.so
|
||||
usr/lib\(32\|64\)\?/libaticalrt.so
|
||||
usr/lib\(32\|64\)\?/libatiuki.so.1.0
|
||||
usr/lib\(32\|64\)\?/libatiadlxx.so
|
||||
usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
|
||||
usr/lib\(32\|64\)\?/libXvBAW.so.1.0
|
||||
usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
|
||||
usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
|
||||
usr/lib\(32\|64\)\?/xorg/modules/glesx.so
|
||||
usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
|
||||
usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
|
||||
usr/lib\(32\|64\)\?/libaticaldd.so
|
||||
usr/lib\(32\|64\)\?/dri/fglrx_dri.so
|
||||
usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
|
||||
usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
|
||||
usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
|
||||
usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
|
||||
usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so
|
||||
usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
|
||||
"
|
||||
|
||||
pkg_nofetch() {
|
||||
einfo "The driver packages"
|
||||
einfo ${A}
|
||||
einfo "need to be downloaded manually from"
|
||||
einfo "http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64"
|
||||
einfo "and ${XVBA_SDK_URI}"
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
local CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR"
|
||||
use amd64 && CONFIG_CHECK+=" COMPAT"
|
||||
|
||||
local ERROR_MTRR="CONFIG_MTRR required for direct rendering."
|
||||
local ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module and not loaded for direct
|
||||
rendering to work."
|
||||
local ERROR_LOCKDEP="CONFIG_LOCKDEP (lock tracking) exports the symbol lock_acquire
|
||||
as GPL-only. This prevents ${P} from compiling with an error like this:
|
||||
FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
|
||||
local ERROR_PAX_KERNEXEC_PLUGIN_METHOD_OR="This config option will cause
|
||||
kernel to reject loading the fglrx module with
|
||||
\"ERROR: could not insert 'fglrx': Exec format error.\"
|
||||
You may want to try CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS instead."
|
||||
local ERROR_BKL="CONFIG_BKL must be enabled for kernels 2.6.37-2.6.38."
|
||||
|
||||
# workaround until bug 365543 is solved
|
||||
if use modules; then
|
||||
linux-info_pkg_setup
|
||||
require_configured_kernel
|
||||
kernel_is ge 2 6 37 && kernel_is le 2 6 38 && CONFIG_CHECK+=" BKL"
|
||||
check_extra_config
|
||||
if ! linux_chkconfig_present AGP && \
|
||||
! linux_chkconfig_present PCIEPORTBUS; then
|
||||
ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
|
||||
ewarn "Direct rendering will not work."
|
||||
fi
|
||||
fi
|
||||
|
||||
if ! has XT ${PAX_MARKINGS} && use pax_kernel; then
|
||||
ewarn "You have disabled xattr pax markings for portage."
|
||||
ewarn "This will likely cause programs using ati-drivers provided"
|
||||
ewarn "libraries to be killed kernel."
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
if use modules; then
|
||||
MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod/2.6.x)"
|
||||
BUILD_TARGETS="kmod_build"
|
||||
linux-mod_pkg_setup
|
||||
BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_OUT_DIR}"
|
||||
BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
|
||||
if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
|
||||
BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
|
||||
else
|
||||
BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
|
||||
fi
|
||||
fi
|
||||
# Define module dir.
|
||||
MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
|
||||
# get the xorg-server version and set BASE_DIR for that
|
||||
BASE_DIR="${S}/xpic"
|
||||
|
||||
# amd64/x86
|
||||
if use amd64 ; then
|
||||
MY_BASE_DIR="${BASE_DIR}_64a"
|
||||
PKG_LIBDIR=lib64
|
||||
ARCH_DIR="${S}/arch/x86_64"
|
||||
else
|
||||
MY_BASE_DIR="${BASE_DIR}"
|
||||
PKG_LIBDIR=lib
|
||||
ARCH_DIR="${S}/arch/x86"
|
||||
fi
|
||||
|
||||
elog
|
||||
elog "Please note that this driver only supports graphic cards based on"
|
||||
elog "Evergreen chipset and newer."
|
||||
elog "This includes the AMD Radeon HD 5400+ series at this moment."
|
||||
elog
|
||||
elog "If your card is older then use ${CATEGORY}/xf86-video-ati"
|
||||
elog "For migration informations please refer to:"
|
||||
elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
|
||||
einfo
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
local DRIVERS_DISTFILE XVBA_SDK_DISTFILE
|
||||
DRIVERS_DISTFILE=${DRIVERS_URI##*/}
|
||||
XVBA_SDK_DISTFILE=${XVBA_SDK_URI##*/}
|
||||
|
||||
if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then
|
||||
unpack ${DRIVERS_DISTFILE}
|
||||
else
|
||||
#please note, RUN may be insanely assigned at top near SRC_URI
|
||||
if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then
|
||||
unpack ${DRIVERS_DISTFILE}
|
||||
[[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}"
|
||||
else
|
||||
RUN="${DISTDIR}/${DRIVERS_DISTFILE}"
|
||||
fi
|
||||
sh "${RUN}" --extract "${S}" 2>&1 > /dev/null || die
|
||||
fi
|
||||
|
||||
mkdir xvba_sdk
|
||||
cd xvba_sdk
|
||||
unpack ${XVBA_SDK_DISTFILE}
|
||||
|
||||
mkdir -p "${WORKDIR}/extra" || die "mkdir extra failed"
|
||||
cd "${WORKDIR}/extra"
|
||||
tar -xf "../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if use modules; then
|
||||
if use debug; then
|
||||
sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
|
||||
"${MODULE_DIR}/firegl_public.c" \
|
||||
|| die "Failed to enable debug output."
|
||||
fi
|
||||
fi
|
||||
|
||||
# These are the userspace utilities that we also have source for.
|
||||
# We rebuild these later.
|
||||
rm \
|
||||
"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
|
||||
|| die "bin rm failed"
|
||||
|
||||
# in this version amdcccle isn't static, thus we depend on qt4
|
||||
use qt4 || rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle
|
||||
|
||||
# ACPI fixups
|
||||
sed -i \
|
||||
-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
|
||||
-e "s:/var/lib/gdm/:/var/gdm/:" \
|
||||
"${S}/${FOLDER_PREFIX}etc/ati/authatieventsd.sh" \
|
||||
|| die "ACPI fixups failed."
|
||||
|
||||
# Since "who" is in coreutils, we're using that one instead of "finger".
|
||||
sed -i -e 's:finger:who:' \
|
||||
"${S}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
|
||||
|| die "Replacing 'finger' with 'who' failed."
|
||||
# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
|
||||
# add function to detect default state.
|
||||
epatch "${FILESDIR}"/ati-powermode-opt-path-3.patch
|
||||
|
||||
# see http://ati.cchtml.com/show_bug.cgi?id=495
|
||||
#epatch "${FILESDIR}"/ati-drivers-old_rsp.patch
|
||||
# first hunk applied upstream second (x32 related) was not
|
||||
epatch "${FILESDIR}"/ati-drivers-x32_something_something.patch
|
||||
|
||||
# compile fix for AGP-less kernel, bug #435322
|
||||
epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch
|
||||
|
||||
epatch "${FILESDIR}/ati-drivers-13.8-beta-include-seq_file.patch"
|
||||
|
||||
# Fix #483400
|
||||
epatch "${FILESDIR}/fgl_glxgears-do-not-include-glATI.patch"
|
||||
|
||||
# Fix #524658
|
||||
epatch "${FILESDIR}/fix-the-linux-3.17-no_hotplug-error.patch"
|
||||
|
||||
# Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870
|
||||
use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch"
|
||||
|
||||
# Compile fix, #526602
|
||||
epatch "${FILESDIR}/use-kernel_fpu_begin.patch"
|
||||
|
||||
#moar compile fixes
|
||||
epatch "${FILESDIR}/get-percpu-without-preempt-on-linux-3.19.patch"
|
||||
epatch "${FILESDIR}/kernel-4-ugh.patch"
|
||||
epatch "${FILESDIR}/KCL-ACPI_Slot_No_Hotplug-remove.patch"
|
||||
|
||||
cd "${MODULE_DIR}"
|
||||
|
||||
# bugged fglrx build system, this file should be copied by hand
|
||||
cp ${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
|
||||
|
||||
convert_to_m 2.6.x/Makefile || die "convert_to_m failed"
|
||||
|
||||
# When built with ati's make.sh it defines a bunch of macros if
|
||||
# certain .config values are set, falling back to less reliable
|
||||
# detection methods if linux/autoconf.h is not available. We
|
||||
# simply use the linux/autoconf.h settings directly, bypassing the
|
||||
# detection script.
|
||||
sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
|
||||
sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
|
||||
|| die "MODVERSIONS sed failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
use modules && linux-mod_src_compile
|
||||
|
||||
ebegin "Building fgl_glxgears"
|
||||
cd "${S}"/extra/fgl_glxgears
|
||||
# These extra libs/utils either have an Imakefile that does not
|
||||
# work very well without tweaking or a Makefile ignoring CFLAGS
|
||||
# and the like. We bypass those.
|
||||
# The -DUSE_GLU is needed to compile using nvidia headers
|
||||
# according to a comment in ati-drivers-extra-8.33.6.ebuild.
|
||||
"$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
|
||||
-I"${S}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
|
||||
-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
|
||||
eend $?
|
||||
}
|
||||
|
||||
src_install() {
|
||||
use modules && linux-mod_src_install
|
||||
|
||||
# We can do two things here, and neither of them is very nice.
|
||||
|
||||
# For direct rendering libGL has to be able to load one or more
|
||||
# dri modules (files ending in _dri.so, like fglrx_dri.so).
|
||||
# Gentoo's mesa looks for these files in the location specified by
|
||||
# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
|
||||
# location /usr/$(get_libdir)/dri. Ati's libGL does the same
|
||||
# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
|
||||
# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
|
||||
# 64bit. So we can either put the .so files in that (unusual,
|
||||
# compared to "normal" mesa libGL) location or set
|
||||
# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
|
||||
# 101539.
|
||||
|
||||
# The problem with this approach is that LIBGL_DRIVERS_PATH
|
||||
# *overrides* the default hardcoded location, it does not extend
|
||||
# it. So if ati-drivers is merged but a non-ati libGL is selected
|
||||
# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
|
||||
# (because it changed in a newer mesa or because it was compiled
|
||||
# for a different set of multilib abis than we are) stuff breaks.
|
||||
|
||||
# We create one file per ABI to work with "native" multilib, see
|
||||
# below.
|
||||
|
||||
echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
|
||||
doenvd "${T}/03ati-colon-sep" || die
|
||||
|
||||
# All libraries that we have a 32 bit and 64 bit version of on
|
||||
# amd64 are installed in src_install-libs. Everything else
|
||||
# (including libraries only available in native 64bit on amd64)
|
||||
# goes in here.
|
||||
multilib_foreach_abi src_install-libs
|
||||
|
||||
# This is sorted by the order the files occur in the source tree.
|
||||
|
||||
# X modules.
|
||||
exeinto /usr/$(get_libdir)/xorg/modules/drivers
|
||||
doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
|
||||
exeinto /usr/$(get_libdir)/xorg/modules/linux
|
||||
doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
|
||||
exeinto /usr/$(get_libdir)/xorg/modules
|
||||
doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{glesx.so,amdxmm.so}
|
||||
|
||||
# Arch-specific files.
|
||||
# (s)bin.
|
||||
into /opt
|
||||
dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
|
||||
use qt4 && dosbin "${ARCH_DIR}"/usr/sbin/amdnotifyui
|
||||
dobin "${ARCH_DIR}"/usr/bin/clinfo
|
||||
# We cleaned out the compilable stuff in src_unpack
|
||||
dobin "${ARCH_DIR}"/usr/X11R6/bin/*
|
||||
|
||||
# Common files.
|
||||
# etc.
|
||||
insinto /etc/ati
|
||||
exeinto /etc/ati
|
||||
# Everything except for the authatieventsd.sh script.
|
||||
doins ${FOLDER_PREFIX}etc/ati/{logo*,control,signature,amdpcsdb.default}
|
||||
doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
|
||||
|
||||
# include.
|
||||
insinto /usr
|
||||
doins -r ${FOLDER_PREFIX}usr/include
|
||||
insinto /usr/include/X11/extensions
|
||||
|
||||
# Just the atigetsysteminfo.sh script.
|
||||
into /usr
|
||||
dosbin ${FOLDER_PREFIX}usr/sbin/*
|
||||
|
||||
# data files for the control panel.
|
||||
if use qt4 ; then
|
||||
insinto /usr/share
|
||||
doins -r ${FOLDER_PREFIX}usr/share/ati
|
||||
insinto /usr/share/pixmaps
|
||||
doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm
|
||||
make_desktop_entry amdcccle 'AMD Catalyst Control Center' \
|
||||
ccc_large System
|
||||
fi
|
||||
|
||||
# doc.
|
||||
dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
|
||||
|
||||
doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
|
||||
|
||||
pushd ${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi > /dev/null
|
||||
|
||||
exeinto /etc/acpi
|
||||
doexe ati-powermode.sh
|
||||
insinto /etc/acpi/events
|
||||
doins events/*
|
||||
|
||||
popd > /dev/null
|
||||
|
||||
# Done with the "source" tree. Install tools we rebuilt:
|
||||
dobin extra/fgl_glxgears/fgl_glxgears
|
||||
newdoc extra/fgl_glxgears/README README.fgl_glxgears
|
||||
|
||||
# Gentoo-specific stuff:
|
||||
newinitd "${FILESDIR}"/atieventsd.init atieventsd
|
||||
echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
|
||||
newconfd "${T}"/atieventsd.conf atieventsd
|
||||
|
||||
# PowerXpress stuff
|
||||
exeinto /usr/$(get_libdir)/fglrx
|
||||
doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
|
||||
cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
|
||||
doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
|
||||
}
|
||||
|
||||
src_install-libs() {
|
||||
if [[ "${ABI}" == "amd64" ]]; then
|
||||
local EX_BASE_DIR="${BASE_DIR}_64a"
|
||||
local pkglibdir=lib64
|
||||
local MY_ARCH_DIR="${S}/arch/x86_64"
|
||||
local oclsuffix=64
|
||||
else
|
||||
local EX_BASE_DIR="${BASE_DIR}"
|
||||
local pkglibdir=lib
|
||||
local MY_ARCH_DIR="${S}/arch/x86"
|
||||
local oclsuffix=32
|
||||
fi
|
||||
einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
|
||||
|
||||
local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
|
||||
# To make sure we do not miss a spot when these change.
|
||||
local libmajor=1 libminor=2
|
||||
local libver=${libmajor}.${libminor}
|
||||
|
||||
# The GLX libraries
|
||||
# (yes, this really is "lib" even on amd64/multilib --marienz)
|
||||
exeinto ${ATI_ROOT}/lib
|
||||
newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
|
||||
libGL.so.${libver}
|
||||
dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
|
||||
dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
|
||||
|
||||
if multilib_is_native_abi; then
|
||||
exeinto ${ATI_ROOT}/extensions
|
||||
doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/fglrx/fglrx-libglx.so
|
||||
mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
|
||||
fi
|
||||
|
||||
# other libs
|
||||
exeinto /usr/$(get_libdir)
|
||||
# Everything except for the libGL.so installed some row above
|
||||
doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
|
||||
-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
|
||||
insinto /usr/$(get_libdir)
|
||||
doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
|
||||
-maxdepth 1 -type f -not -name '*.so*')
|
||||
|
||||
# DRI modules, installed into the path used by recent versions of mesa.
|
||||
exeinto /usr/$(get_libdir)/dri
|
||||
doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
|
||||
|
||||
# AMD Cal and OpenCL libraries
|
||||
exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
|
||||
doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
|
||||
doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
|
||||
dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
|
||||
exeinto /usr/$(get_libdir)
|
||||
doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
|
||||
doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdhsasc*.so
|
||||
|
||||
# OpenCL vendor files
|
||||
insinto /etc/OpenCL/vendors/
|
||||
cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
|
||||
/usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so
|
||||
EOF
|
||||
doins "${T}"/amdocl${oclsuffix}.icd
|
||||
|
||||
local envname="${T}"/04ati-dri-path
|
||||
if [[ -n ${ABI} ]]; then
|
||||
envname="${envname}-${ABI}"
|
||||
fi
|
||||
echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
|
||||
doenvd "${envname}"
|
||||
|
||||
# Silence the QA notice by creating missing soname symlinks
|
||||
for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
|
||||
do
|
||||
local soname=${so##*/}
|
||||
local soname_one=${soname%.[0-9]}
|
||||
local soname_zero=${soname_one%.[0-9]}
|
||||
dosym ${soname} /usr/$(get_libdir)/${soname_one}
|
||||
dosym ${soname_one} /usr/$(get_libdir)/${soname_zero}
|
||||
done
|
||||
|
||||
# See https://bugs.gentoo.org/show_bug.cgi?id=443466
|
||||
dodir /etc/revdep-rebuild/
|
||||
echo "SEARCH_DIRS_MASK=\"/opt/bin/clinfo\"" > "${ED}/etc/revdep-rebuild/62-ati-drivers"
|
||||
|
||||
#remove static libs if not wanted
|
||||
use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a
|
||||
|
||||
#install xvba sdk headers
|
||||
doheader xvba_sdk/include/amdxvba.h
|
||||
|
||||
# VA-API internal wrapper
|
||||
dosym /usr/$(get_libdir)/libXvBAW.so.1.0 /usr/$(get_libdir)/va/drivers/fglrx_drv_video.so
|
||||
|
||||
if use pax_kernel; then
|
||||
pax-mark m "${D}"/usr/lib*/opengl/ati/lib/libGL.so.1.2 || die "pax-mark failed"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "To switch to AMD OpenGL, run \"eselect opengl set ati\""
|
||||
elog "To change your xorg.conf you can use the bundled \"aticonfig\""
|
||||
elog
|
||||
elog "If you experience unexplained segmentation faults and kernel crashes"
|
||||
elog "with this driver and multi-threaded applications such as wine,"
|
||||
elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
|
||||
elog
|
||||
elog "Fully rebooting the system after an ${PN} update is recommended"
|
||||
elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
|
||||
elog "might not work"
|
||||
elog
|
||||
elog "Some cards need acpid running to handle events"
|
||||
elog "Please add it to boot runlevel with rc-update add acpid boot"
|
||||
elog
|
||||
|
||||
use modules && linux-mod_pkg_postinst
|
||||
"${ROOT}"/usr/bin/eselect opengl set --use-old ati
|
||||
"${ROOT}"/usr/bin/eselect opencl set --use-old amd
|
||||
|
||||
if has_version "x11-drivers/xf86-video-intel[sna]"; then
|
||||
ewarn "It is reported that xf86-video-intel built with USE=\"sna\" causes the X server"
|
||||
ewarn "to crash on systems that use hybrid AMD/Intel graphics. If you experience"
|
||||
ewarn "this crash, downgrade to xf86-video-intel-2.20.2 or earlier or"
|
||||
ewarn "try disabling sna for xf86-video-intel."
|
||||
ewarn "For details, see https://bugs.gentoo.org/show_bug.cgi?id=430000"
|
||||
fi
|
||||
|
||||
if use pax_kernel; then
|
||||
ewarn "Please run \"revdep-pax -s libGL.so.1 -me\" after installation and"
|
||||
ewarn "after you have run \"eselect opengl set ati\". Executacle"
|
||||
ewarn "revdep-pax is part of package sys-apps/elfix."
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
use modules && linux-mod_pkg_preinst
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use modules && linux-mod_pkg_postrm
|
||||
"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
|
||||
}
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
diff -Naur work/common/lib/modules/fglrx/build_mod/kcl_acpi.c work-fixed/common/lib/modules/fglrx/build_mod/kcl_acpi.c
|
||||
--- work/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2015-08-01 16:18:47.813171957 -0400
|
||||
+++ work-fixed/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2015-08-01 16:24:27.023170514 -0400
|
||||
@@ -863,6 +863,7 @@
|
||||
void ATI_API_CALL KCL_ACPI_No_Hotplug(void* dev)
|
||||
{
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,7)
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
|
||||
struct pci_dev *pdev = (struct pci_dev*)dev;
|
||||
|
||||
if(pdev && pdev->bus && pdev->bus->bridge)
|
||||
@@ -870,6 +871,7 @@
|
||||
acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_HANDLE(pdev->bus->bridge), 1, KCL_ACPI_Slot_No_Hotplug, NULL, pdev , NULL);
|
||||
}
|
||||
#endif
|
||||
+#endif
|
||||
}
|
||||
|
||||
#else
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
From: Vasiliy Yeremeyev <vayerx@gmail.com>
|
||||
Date: Sun, 4 Nov 2012 23:59:36 +0400
|
||||
Subject: [PATCH] KCL_AGP_FindCapsRegisters stub for AGP-less systems
|
||||
|
||||
---
|
||||
common/lib/modules/fglrx/build_mod/kcl_agp.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/common/lib/modules/fglrx/build_mod/kcl_agp.c b/common/lib/modules/fglrx/build_mod/kcl_agp.c
|
||||
index b9c0655..cb1902b 100644
|
||||
--- a/common/lib/modules/fglrx/build_mod/kcl_agp.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/kcl_agp.c
|
||||
@@ -479,6 +479,11 @@ int ATI_API_CALL KCL_AGP_Enable(unsigned long mode)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
+int ATI_API_CALL KCL_AGP_FindCapsRegisters(KCL_PCI_DevHandle dev)
|
||||
+{
|
||||
+ return -EINVAL;
|
||||
+}
|
||||
+
|
||||
int ATI_API_CALL KCL_AGP_ReadCapsRegisters(KCL_PCI_DevHandle dev, unsigned int *caps)
|
||||
{
|
||||
return -EINVAL;
|
||||
--
|
||||
1.7.12
|
||||
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
diff -urN common.old/lib/modules/fglrx/build_mod/kcl_acpi.c common/lib/modules/fglrx/build_mod/kcl_acpi.c
|
||||
--- common.old/lib/modules/fglrx/build_mod/kcl_acpi.c 2013-12-27 13:32:34.734832283 +0100
|
||||
+++ common/lib/modules/fglrx/build_mod/kcl_acpi.c 2013-12-27 13:33:31.849831765 +0100
|
||||
@@ -1002,7 +1002,11 @@
|
||||
#endif
|
||||
{
|
||||
return KCL_ACPI_ERROR;
|
||||
- }
|
||||
+ }
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,1)
|
||||
+ ((acpi_tbl_table_handler)handler)(hdr);
|
||||
+#else
|
||||
((acpi_table_handler)handler)(hdr);
|
||||
+#endif
|
||||
return KCL_ACPI_OK;
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
index 22561c5..fdfe65e 100755
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
@@ -520,6 +520,8 @@ static int func##_wrap(char *buf, char **start, kcl_off_t offset, \
|
||||
}
|
||||
|
||||
#else
|
||||
+#include <linux/seq_file.h>
|
||||
+
|
||||
#define READ_PROC_WRAP(func) \
|
||||
static int func##_wrap(struct seq_file *m, void* data) \
|
||||
{ \
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
--- a/common/lib/modules/fglrx/build_mod/kcl_ioctl.c 2012-05-26 19:11:03.402987821 +0200
|
||||
+++ b/common/lib/modules/fglrx/build_mod/kcl_ioctl.c 2012-05-26 19:13:00.273986422 +0200
|
||||
@@ -217,6 +217,10 @@
|
||||
* \param size [in] Number of bytes to allocate
|
||||
* \return Pointer to allocated memory
|
||||
*/
|
||||
+#ifndef CONFIG_X86_X32
|
||||
+DEFINE_PER_CPU(unsigned long, old_rsp);
|
||||
+#endif
|
||||
+
|
||||
void* ATI_API_CALL KCL_IOCTL_AllocUserSpace32(long size)
|
||||
{
|
||||
void __user *ret = COMPAT_ALLOC_USER_SPACE(size);
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
--- a/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2012-08-17 22:39:05.077984979 +0800
|
||||
+++ b/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2012-08-17 22:41:15.919976149 +0800
|
||||
@@ -4,6 +4,8 @@
|
||||
# Control script for ACPI lid state and AC adapter state
|
||||
#
|
||||
|
||||
+aticonfig='/opt/bin/aticonfig'
|
||||
+
|
||||
getXuser() {
|
||||
user=`who| grep -m1 ":$displaynum " | awk '{print $1}'`
|
||||
if [ x"$user" = x"" ]; then
|
||||
@@ -47,7 +49,7 @@
|
||||
done
|
||||
|
||||
#If PPLIB is enabled
|
||||
-su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB
|
||||
+su $user -c "$aticonfig --pplib-cmd='get version'" | grep PPLIB
|
||||
if [ $? = 0 ]; then
|
||||
echo "Has PPLIB"
|
||||
has_pplib=1
|
||||
@@ -61,15 +63,15 @@
|
||||
if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then
|
||||
echo "Low power"
|
||||
if [ ${has_pplib} -eq 1 ]; then
|
||||
- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"'
|
||||
+ su $user -c "$aticonfig --pplib-cmd='notify psrc dc'"
|
||||
else
|
||||
- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now"
|
||||
+ su $user -c "$aticonfig --set-powerstate=1 --effective=now"
|
||||
fi
|
||||
else
|
||||
echo "high power"
|
||||
if [ ${has_pplib} -eq 1 ]; then
|
||||
- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"'
|
||||
+ su $user -c "$aticonfig --pplib-cmd='notify psrc ac'"
|
||||
else
|
||||
- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now"
|
||||
+ su $user -c "$aticonfig --set-powerstate=3 --effective=now"
|
||||
fi
|
||||
fi
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
#!/sbin/runscript
|
||||
# Copyright 1999-2006 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/files/atieventsd.init,v 1.3 2007/05/18 23:58:01 marienz Exp $
|
||||
|
||||
depend() {
|
||||
need acpid
|
||||
}
|
||||
|
||||
start() {
|
||||
ebegin "Starting ${SVCNAME}"
|
||||
start-stop-daemon --start --exec /opt/sbin/atieventsd -- ${ATIEVENTSDOPTS}
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping ${SVCNAME}"
|
||||
start-stop-daemon --stop --quiet --exec /opt/sbin/atieventsd
|
||||
eend $?
|
||||
}
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
diff -Nur common/lib/modules/fglrx/build_mod/kcl_acpi.c common-r1/lib/modules/fglrx/build_mod/kcl_acpi.c
|
||||
--- common/lib/modules/fglrx/build_mod/kcl_acpi.c 2013-01-29 17:03:51.000000000 +0200
|
||||
+++ common-r1/lib/modules/fglrx/build_mod/kcl_acpi.c 2013-02-15 20:33:10.611838616 +0200
|
||||
@@ -15,6 +15,9 @@
|
||||
****************************************************************************/
|
||||
|
||||
#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
|
||||
+#include <linux/notifier.h>
|
||||
+#endif
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
|
||||
#include <generated/autoconf.h>
|
||||
#else
|
||||
@@ -145,7 +148,11 @@
|
||||
return NOTIFY_OK;
|
||||
}
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
|
||||
+static notifier_block_no_const firegl_acpi_lid_notifier = {
|
||||
+#else
|
||||
static struct notifier_block firegl_acpi_lid_notifier = {
|
||||
+#endif
|
||||
.notifier_call = firegl_acpi_lid_event,
|
||||
};
|
||||
#endif
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
diff -Nur extra/fgl_glxgears/fgl_glxgears.c extra-r1/fgl_glxgears/fgl_glxgears.c
|
||||
--- extra/fgl_glxgears/fgl_glxgears.c 2012-08-29 09:59:03.000000000 +0300
|
||||
+++ extra-r1/fgl_glxgears/fgl_glxgears.c 2013-09-07 09:26:11.034723135 +0300
|
||||
@@ -78,7 +78,6 @@
|
||||
#endif // _WIN32
|
||||
|
||||
#define INT_PTR ptrdiff_t
|
||||
-#include <GL/glATI.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <GL/wglATI.h>
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
--- common/lib/modules/fglrx/build_mod/kcl_acpi.c.orig 2014-07-11 11:46:19.000000000 +0200
|
||||
+++ common/lib/modules/fglrx/build_mod/kcl_acpi.c 2014-10-08 15:12:55.535638391 +0200
|
||||
@@ -829,6 +829,7 @@
|
||||
|
||||
static acpi_status KCL_ACPI_Slot_No_Hotplug(KCL_ACPI_DevHandle handle, u32 lvl, void *data, void **rv)
|
||||
{
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,7)
|
||||
struct acpi_device *tdev;
|
||||
struct pci_dev *pdev = (struct pci_dev *)data;
|
||||
@@ -844,6 +845,7 @@
|
||||
}
|
||||
}
|
||||
#endif
|
||||
+#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
From 56ca74832b1f97c8e89329a313c7ca2405cd26cb Mon Sep 17 00:00:00 2001
|
||||
From: Emil Karlson <jekarlson@gmail.com>
|
||||
Date: Thu, 12 Feb 2015 21:59:46 +0200
|
||||
Subject: [PATCH] get percpu without preempton linux-3.19
|
||||
|
||||
---
|
||||
common/lib/modules/fglrx/build_mod/firegl_public.c | 15 ++++++++++++---
|
||||
1 file changed, 12 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
index 360b6ac..3cba36e 100755
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
@@ -4816,8 +4816,13 @@ static unsigned long kasSetExecutionLevel(unsigned long level)
|
||||
{
|
||||
unsigned long orig_level;
|
||||
|
||||
- orig_level = __get_cpu_var(kasExecutionLevel);
|
||||
- __get_cpu_var(kasExecutionLevel) = level;
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
|
||||
+ orig_level = __get_cpu_var(kasExecutionLevel);
|
||||
+ __get_cpu_var(kasExecutionLevel) = level;
|
||||
+#else
|
||||
+ orig_level = (*this_cpu_ptr(&(kasExecutionLevel)));
|
||||
+ (*this_cpu_ptr(&(kasExecutionLevel))) = level;
|
||||
+#endif
|
||||
|
||||
return orig_level;
|
||||
}
|
||||
@@ -4829,7 +4834,11 @@ static unsigned long kasSetExecutionLevel(unsigned long level)
|
||||
*/
|
||||
static unsigned long kas_GetExecutionLevel(void)
|
||||
{
|
||||
- return __get_cpu_var(kasExecutionLevel);
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
|
||||
+ return __get_cpu_var(kasExecutionLevel);
|
||||
+#else
|
||||
+ return (*this_cpu_ptr(&(kasExecutionLevel)));
|
||||
+#endif
|
||||
}
|
||||
|
||||
/** \brief Type definition for kas_spin_lock() parameter */
|
||||
--
|
||||
2.0.5
|
||||
|
||||
|
|
@ -1,140 +0,0 @@
|
|||
From 66a25e76c538f7844568a20243bfe015ee0315a1 Mon Sep 17 00:00:00 2001
|
||||
From: Krzysztof Kolasa <kkolasa@winsoft.pl>
|
||||
Date: Tue, 17 Mar 2015 23:41:25 +0100
|
||||
Subject: [PATCH] changes for kernel 4.0.0
|
||||
|
||||
---
|
||||
firegl_public.c | 38 ++++++++++++++++++++++++++++++--------
|
||||
kcl_acpi.c | 2 ++
|
||||
kcl_str.c | 4 ++++
|
||||
4 files changed, 42 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/firegl_public.c b/firegl_public.c
|
||||
index eccbc1c..a7368c8 100644
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
@@ -93,7 +93,7 @@
|
||||
and they use different config options. These options can only be enabled
|
||||
on x86_64 with newer 2.6 kernels (2.6.23 for intel, 2.6.26 for amd).
|
||||
*/
|
||||
-#if defined(CONFIG_AMD_IOMMU) || defined(CONFIG_DMAR)
|
||||
+#if defined(CONFIG_AMD_IOMMU) || defined(CONFIG_INTEL_IOMMU) || defined(CONFIG_DMAR)
|
||||
#define FIREGL_DMA_REMAPPING
|
||||
#endif
|
||||
|
||||
@@ -269,8 +269,12 @@ module_param(firegl, charp, 0);
|
||||
#endif
|
||||
|
||||
#ifdef MODULE_LICENSE
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
|
||||
+MODULE_LICENSE("GPL\0Proprietary. (C) 2002 - ATI Technologies, Starnberg, GERMANY");
|
||||
+#else
|
||||
MODULE_LICENSE("Proprietary. (C) 2002 - ATI Technologies, Starnberg, GERMANY");
|
||||
#endif
|
||||
+#endif
|
||||
#ifdef MODULE_DEVICE_TABLE
|
||||
MODULE_DEVICE_TABLE(pci, fglrx_pci_table);
|
||||
#endif
|
||||
@@ -4496,8 +4500,13 @@ static void kcl_mem_pat_setup (void *info)
|
||||
|
||||
if (cpu_has_pge)
|
||||
{
|
||||
- cr4 = read_cr4();
|
||||
- write_cr4(cr4 & ~X86_CR4_PGE);
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
|
||||
+ cr4 = read_cr4();
|
||||
+ write_cr4(cr4 & ~X86_CR4_PGE);
|
||||
+#else
|
||||
+ cr4 = __read_cr4();
|
||||
+ __write_cr4(cr4 & ~X86_CR4_PGE);
|
||||
+#endif
|
||||
}
|
||||
__flush_tlb();
|
||||
|
||||
@@ -4510,7 +4519,11 @@ static void kcl_mem_pat_setup (void *info)
|
||||
write_cr0(cr0 & 0xbfffffff);
|
||||
if (cpu_has_pge)
|
||||
{
|
||||
- write_cr4(cr4);
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
|
||||
+ write_cr4(cr4);
|
||||
+#else
|
||||
+ __write_cr4(cr4);
|
||||
+#endif
|
||||
}
|
||||
local_irq_restore(flags);
|
||||
|
||||
@@ -4537,8 +4550,13 @@ static void kcl_mem_pat_restore (void *info)
|
||||
|
||||
if (cpu_has_pge)
|
||||
{
|
||||
- cr4 = read_cr4();
|
||||
- write_cr4(cr4 & ~X86_CR4_PGE);
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
|
||||
+ cr4 = read_cr4();
|
||||
+ write_cr4(cr4 & ~X86_CR4_PGE);
|
||||
+#else
|
||||
+ cr4 = __read_cr4();
|
||||
+ __write_cr4(cr4 & ~X86_CR4_PGE);
|
||||
+#endif
|
||||
}
|
||||
__flush_tlb();
|
||||
|
||||
@@ -4550,7 +4568,11 @@ static void kcl_mem_pat_restore (void *info)
|
||||
write_cr0(cr0 & 0xbfffffff);
|
||||
if (cpu_has_pge)
|
||||
{
|
||||
- write_cr4(cr4);
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
|
||||
+ write_cr4(cr4);
|
||||
+#else
|
||||
+ __write_cr4(cr4);
|
||||
+#endif
|
||||
}
|
||||
local_irq_restore(flags);
|
||||
|
||||
@@ -6420,7 +6442,7 @@ void ATI_API_CALL KCL_create_uuid(void *buf)
|
||||
generate_random_uuid((char *)buf);
|
||||
}
|
||||
|
||||
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0) && LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
|
||||
static int KCL_fpu_save_init(struct task_struct *tsk)
|
||||
{
|
||||
struct fpu *fpu = &tsk->thread.fpu;
|
||||
diff --git a/kcl_acpi.c b/kcl_acpi.c
|
||||
index 3a80984..8b88b62 100644
|
||||
--- a/common/lib/modules/fglrx/build_mod/kcl_acpi.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/kcl_acpi.c
|
||||
@@ -829,6 +829,7 @@ KCL_ACPI_DevHandle ATI_API_CALL KCL_ACPI_GetAlternateHandle(KCL_ACPI_DevHandle p
|
||||
return retHandle;
|
||||
}
|
||||
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
|
||||
static acpi_status KCL_ACPI_Slot_No_Hotplug(KCL_ACPI_DevHandle handle, u32 lvl, void *data, void **rv)
|
||||
{
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,7) && LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)
|
||||
@@ -848,6 +849,7 @@ static acpi_status KCL_ACPI_Slot_No_Hotplug(KCL_ACPI_DevHandle handle, u32 lvl,
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
+#endif
|
||||
|
||||
void ATI_API_CALL KCL_ACPI_No_Hotplug(void* dev)
|
||||
{
|
||||
diff --git a/kcl_str.c b/kcl_str.c
|
||||
index 2d89eb0..dcaa1be 100644
|
||||
--- a/common/lib/modules/fglrx/build_mod/kcl_str.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/kcl_str.c
|
||||
@@ -169,7 +169,11 @@ int ATI_API_CALL KCL_STR_Strnicmp(const char* s1,
|
||||
const char* s2,
|
||||
KCL_TYPE_SizeSigned count)
|
||||
{
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
|
||||
return strnicmp(s1, s2, count);
|
||||
+#else
|
||||
+ return strncasecmp(s1, s2, count);
|
||||
+#endif
|
||||
}
|
||||
|
||||
/** \brief Locate character in string
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
#!/bin/bash
|
||||
# switchlibGL
|
||||
#
|
||||
# Copyright (c) 2011 Advanced Micro Devices, Inc.
|
||||
#
|
||||
# Purpose:
|
||||
# For switch between AMD and Intel graphic driver library.
|
||||
#
|
||||
# Usage:
|
||||
# switchlibGL amd|intel|query
|
||||
# amd: switches to the AMD version of libGL.
|
||||
# intel: switches to the open-source version of libGL .
|
||||
# query: checks, which version is currently active and prints either "amd"
|
||||
# or "intel" or "unknown" on the standard output.
|
||||
# must be root to execute this script
|
||||
|
||||
ARCH=`uname -m`
|
||||
E_ERR=1
|
||||
|
||||
# Check if root
|
||||
if [ "`whoami`" != "root" ]; then
|
||||
echo "Must be root to run this script." 1>&2
|
||||
exit $E_ERR
|
||||
fi
|
||||
|
||||
# One parameter
|
||||
if [ $# -ne 1 ]; then
|
||||
echo "Usage: `basename $0` amd|intel|query " 1>&2
|
||||
echo "Please choose one parameter " 1>&2
|
||||
exit $E_ERR
|
||||
fi
|
||||
|
||||
current=$(eselect opengl show)
|
||||
# Switch to right mode
|
||||
case "$1" in
|
||||
"amd" )
|
||||
if [ $current != ati ] ; then
|
||||
eselect opengl set ati || return 1
|
||||
fi
|
||||
;;
|
||||
"intel" )
|
||||
if [ $current != xorg-x11 ] ; then
|
||||
eselect opengl set xorg-x11 || return 1
|
||||
fi
|
||||
;;
|
||||
"query" )
|
||||
case "$current" in
|
||||
"ati" )
|
||||
echo "amd"
|
||||
;;
|
||||
"xorg-x11" )
|
||||
echo "intel"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
* ) echo "Usage: `basename $0` amd|intel|query" 1>&2; exit $E_ERR;;
|
||||
# other than amd|intel|query parameter report an error
|
||||
esac
|
||||
|
||||
# A zero return value from the script upon exit indicates success.
|
||||
exit 0
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
index d3ad3ce..9362b58 100755
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
@@ -34,6 +34,11 @@
|
||||
#include <linux/autoconf.h>
|
||||
#endif
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
|
||||
+#include <linux/uidgid.h>
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
#if !defined(CONFIG_X86)
|
||||
#if !defined(CONFIG_X86_PC)
|
||||
#if !defined(CONFIG_X86_XEN)
|
||||
@@ -1543,9 +1548,17 @@ KCL_TYPE_Pid ATI_API_CALL KCL_GetTgid(void)
|
||||
KCL_TYPE_Uid ATI_API_CALL KCL_GetEffectiveUid(void)
|
||||
{
|
||||
#ifdef current_euid
|
||||
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
|
||||
+ return __kuid_val(current_euid());
|
||||
+# else
|
||||
return current_euid();
|
||||
+# endif
|
||||
#else
|
||||
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
|
||||
+ return __kuid_val(current->euid);
|
||||
+# else
|
||||
return current->euid;
|
||||
+# endif
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -Naur a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2014-10-27 23:30:58.630304842 +0200
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2014-10-27 23:32:57.300306011 +0200
|
||||
@@ -6389,7 +6389,7 @@
|
||||
*/
|
||||
void ATI_API_CALL KCL_fpu_begin(void)
|
||||
{
|
||||
-#ifdef CONFIG_X86_64
|
||||
+#if defined(CONFIG_X86_64) || LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
|
||||
kernel_fpu_begin();
|
||||
#else
|
||||
#ifdef TS_USEDFPU
|
||||
Loading…
Reference in a new issue