Chakra_Linux/core
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/core.git synced 2025-02-10 06:14:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'testing' of gitorious.org:chakra-packages/platform into testing

Browse Source
This commit is contained in:
Michael 2012-09-26 21:41:07 +00:00
commit e5f66124ed
17 changed files with 227 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bbswitch/PKGBUILD
View File

@ -3,7 +3,7 @@
#
# maintainer abveritas@chakra-project.org
_extramodules=extramodules-3.4-CHAKRA
_extramodules=extramodules-3.5-CHAKRA
_kver="$(cat /lib/modules/${_extramodules}/version)"
pkgname=bbswitch
@ -15,7 +15,7 @@ url=("http://github.com/Bumblebee-Project/bbswitch")
license=('GPL')
provides=('bbswitch')
install=bbswitch.install
depends=('linux>=3.4' 'linux<3.5')
depends=('linux>=3.5' 'linux<3.6')
makedepends=('linux' 'linux-headers')
source=("https://github.com/downloads/Bumblebee-Project/bbswitch/${pkgname}-${pkgver}.tar.gz")
md5sums=('0db72765c6accb49426a40c4cb1556d3')
@ -30,7 +30,7 @@ package() {
msg2 "Building module for $_kver..."
# KDIR is necessary even when cleaning
make KDIR=/usr/src/linux-${_kver} clean
#make KDIR=/usr/src/linux-${_kver} clean
make KDIR=/usr/src/linux-${_kver}
mkdir -p $pkgdir//lib/modules/${_extramodules}
install -D -m644 bbswitch.ko $pkgdir/lib/modules/${_extramodules}

6
bbswitch/bbswitch.install
View File

@ -1,15 +1,15 @@
post_install() {
EXTRAMODULES='extramodules-3.4-CHAKRA'
EXTRAMODULES='extramodules-3.5-CHAKRA'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
echo 'In order to use nvidia module, reboot the system.'
}
post_upgrade() {
EXTRAMODULES='extramodules-3.4-CHAKRA'
EXTRAMODULES='extramodules-3.5-CHAKRA'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
post_remove() {
EXTRAMODULES='extramodules-3.4-CHAKRA'
EXTRAMODULES='extramodules-3.5-CHAKRA'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}

49
catalyst-legacy/3.5-do_mmap.patch Normal file
View File

@ -0,0 +1,49 @@
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-15 18:30:13.483762070 +0200
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-17 17:47:36.543041869 +0200
@@ -2106,6 +2106,12 @@
}
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
+# define NO_DO_MMAP
+# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, f)
+# define do_munmap(a,b,c) vm_munmap(b, c)
+#endif
+
unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval(
KCL_IO_FILE_Handle file,
unsigned long addr,
@@ -2117,10 +2123,13 @@
flags = MAP_SHARED;
prot = PROT_READ|PROT_WRITE;
-
+#ifdef NO_DO_MMAP
+ vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff);
+#else
down_write(&current->mm->mmap_sem);
vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff);
up_write(&current->mm->mmap_sem);
+#endif
if (IS_ERR(vaddr))
return 0;
else
@@ -2131,7 +2140,9 @@
{
int retcode = 0;
+#ifndef NO_DO_MMAP
down_write(&current->mm->mmap_sem);
+#endif
#ifdef FGL_LINUX_RHEL_MUNMAP_API
retcode = do_munmap(current->mm,
addr,
@@ -2142,7 +2153,9 @@
addr,
len);
#endif
+#ifndef NO_DO_MMAP
up_write(&current->mm->mmap_sem);
+#endif
return retcode;
}

18
catalyst-legacy/PKGBUILD
View File

@ -1,13 +1,13 @@
#
# Chakra Packages for Chakra, part of chakra-project.org
#
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
_kernver="3.4.6-1-CHAKRA"
_kernver="3.5.4-1-CHAKRA"
pkgname=(catalyst-legacy chd-catalyst-legacy)
pkgname=('catalyst-legacy' 'chd-catalyst-legacy')
pkgver=12.6
pkgrel=5
pkgrel=6
arch=('i686' 'x86_64')
url="http://www.ati.amd.com"
license=('custom')
@ -16,12 +16,14 @@ makedepends=('gcc-libs' 'gcc>4.0.0' 'make' 'linux-headers')
source=("http://www2.ati.com/drivers/legacy/amd-driver-installer-${pkgver}-legacy-x86.x86_64.zip"
'ati_make.sh'
'makefile_compat.patch'
'fglrx_supported')
'fglrx_supported'
'3.5-do_mmap.patch')
md5sums=('36d5a91d60673b26705e9ac2df952daf'
'660396540b0ceaff71d6155c986734de'
'3e1b82bd69774ea808da69c983d6a43b'
'8bd182de340d6ed8b2dfcedfd3e5a389')
'8bd182de340d6ed8b2dfcedfd3e5a389'
'83b8d2063458cc9e8b6679567b280e36')
build() {
@ -51,6 +53,8 @@ build() {
# makefile patch to choose arch_compat_alloc_user_space or older compat_alloc_user_space
# works only in combination with ati_make.sh script
patch -p1 -i ../makefile_compat.patch
#linux-3.5.4 fix
patch -p1 -i ../3.5-do_mmap.patch
cd "${srcdir}/archive_files/common/lib/modules/fglrx/build_mod"
cp "${srcdir}/archive_files/arch/${_archdir}/lib/modules/fglrx/build_mod/libfglrx_ip.a" .
@ -67,7 +71,7 @@ build() {
package_catalyst-legacy() {
pkgdesc="AMD/ATI Catalyst drivers for linux. fglrx kernel module only"
screenshot="http://linuxtation3.files.wordpress.com/2007/03/pantallazo.jpg"
depends=('linux>=3.4' 'linux<3.5' 'catalyst-legacy-utils')
depends=('linux>=3.5' 'linux<3.6' 'catalyst-legacy-utils')
conflicts=('catalyst-test' 'nvidia' 'xf86-video-ati' 'xf86-video-radeonhd' 'catalyst')
install=catalyst.install

8
catalyst-legacy/catalyst.install
View File

@ -1,5 +1,5 @@
KERNEL_VERSION=3.4.6-1-CHAKRA
KERNEL_VERSION=3.5.4-1-CHAKRA
remove_hook(){
@ -11,18 +11,18 @@ remove_hook(){
}
post_install() {
EXTRAMODULES=extramodules-3.4-CHAKRA
EXTRAMODULES=extramodules-3.5-CHAKRA
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
post_upgrade() {
remove_hook
EXTRAMODULES=extramodules-3.4-CHAKRA
EXTRAMODULES=extramodules-3.5-CHAKRA
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
post_remove() {
EXTRAMODULES=extramodules-3.4-CHAKRA
EXTRAMODULES=extramodules-3.5-CHAKRA
depmod $(cat /lib/modules/$EXTRAMODULES/version)
echo "----------------------------------------------------------------"
echo "Don't forget to remove fglrx from MODULES array of /etc/rc.conf"

49
catalyst/3.5-do_mmap.patch Normal file
View File

@ -0,0 +1,49 @@
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-15 18:30:13.483762070 +0200
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-17 17:47:36.543041869 +0200
@@ -2106,6 +2106,12 @@
}
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
+# define NO_DO_MMAP
+# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, f)
+# define do_munmap(a,b,c) vm_munmap(b, c)
+#endif
+
unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval(
KCL_IO_FILE_Handle file,
unsigned long addr,
@@ -2117,10 +2123,13 @@
flags = MAP_SHARED;
prot = PROT_READ|PROT_WRITE;
-
+#ifdef NO_DO_MMAP
+ vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff);
+#else
down_write(&current->mm->mmap_sem);
vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff);
up_write(&current->mm->mmap_sem);
+#endif
if (IS_ERR(vaddr))
return 0;
else
@@ -2131,7 +2140,9 @@
{
int retcode = 0;
+#ifndef NO_DO_MMAP
down_write(&current->mm->mmap_sem);
+#endif
#ifdef FGL_LINUX_RHEL_MUNMAP_API
retcode = do_munmap(current->mm,
addr,
@@ -2142,7 +2153,9 @@
addr,
len);
#endif
+#ifndef NO_DO_MMAP
up_write(&current->mm->mmap_sem);
+#endif
return retcode;
}

16
catalyst/PKGBUILD
View File

@ -3,30 +3,32 @@
#
# maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
_kernver="3.4.6-1-CHAKRA"
_kernver="3.5.4-1-CHAKRA"
pkgname=(catalyst chd-catalyst)
pkgver=12.8
pkgrel=2
pkgrel=3
_amdver=8.982
arch=('i686' 'x86_64')
url="http://www.ati.amd.com"
license=('custom')
makedepends=('gcc-libs' 'gcc>4.0.0' 'make' 'linux-headers' 'linux>=3.4' 'linux<=3.5')
makedepends=('gcc-libs' 'gcc>4.0.0' 'make' 'linux-headers' 'linux>=3.5' 'linux<=3.6')
source=(http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip
ati_make.sh
makefile_compat.patch
fglrx_supported
switchlibglx
switchlibGL)
switchlibGL
3.5-do_mmap.patch)
md5sums=('41c5478322b13be6909eeb46412a3aa0'
'660396540b0ceaff71d6155c986734de'
'3e1b82bd69774ea808da69c983d6a43b'
'8bd182de340d6ed8b2dfcedfd3e5a389'
'99032d919ede27884b5c3e87ab110a96'
'99032d919ede27884b5c3e87ab110a96')
'99032d919ede27884b5c3e87ab110a96'
'83b8d2063458cc9e8b6679567b280e36')
build() {
@ -56,6 +58,8 @@ build() {
# makefile patch to choose arch_compat_alloc_user_space or older compat_alloc_user_space
# works only in combination with ati_make.sh script
patch -p1 -i ../makefile_compat.patch
#linux-3.5.4 fix
patch -p1 -i ../3.5-do_mmap.patch
cd "${srcdir}/archive_files/common/lib/modules/fglrx/build_mod"
cp "${srcdir}/archive_files/arch/${_archdir}/lib/modules/fglrx/build_mod/libfglrx_ip.a" .
@ -72,7 +76,7 @@ build() {
package_catalyst() {
pkgdesc="AMD/ATI Catalyst drivers for linux. fglrx kernel module only"
screenshot="http://linuxtation3.files.wordpress.com/2007/03/pantallazo.jpg"
depends=('linux>=3.4' 'linux<3.5' 'catalyst-utils')
depends=('linux>=3.5' 'linux<3.6' 'catalyst-utils')
conflicts=('nvidia' 'xf86-video-ati' 'xf86-video-radeonhd' 'catalyst-legacy')
install=catalyst.install

8
catalyst/catalyst.install
View File

@ -1,5 +1,5 @@
KERNEL_VERSION=3.4.6-1-CHAKRA
KERNEL_VERSION=3.5.4-1-CHAKRA
remove_hook(){
@ -11,18 +11,18 @@ remove_hook(){
}
post_install() {
EXTRAMODULES=extramodules-3.4-CHAKRA
EXTRAMODULES=extramodules-3.5-CHAKRA
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
post_upgrade() {
remove_hook
EXTRAMODULES=extramodules-3.4-CHAKRA
EXTRAMODULES=extramodules-3.5-CHAKRA
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
post_remove() {
EXTRAMODULES=extramodules-3.4-CHAKRA
EXTRAMODULES=extramodules-3.5-CHAKRA
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}

2
dkms-nvidia/PKGBUILD
View File

@ -7,7 +7,7 @@
pkgname=dkms-nvidia
_pkgname=nvidia
pkgver=304.51
pkgrel=1
pkgrel=2
pkgdesc="NVIDIA dynamic kernel module (DKMS) drivers for kernel26."
arch=('i686' 'x86_64')
url="http://www.nvidia.com/"

20
dkms/PKGBUILD
View File

@ -6,20 +6,20 @@
pkgname=dkms
pkgver=2.2.0.3
pkgrel=3
pkgrel=4
pkgdesc='Dynamic Kernel Modules System'
arch=('any')
url='http://linux.dell.com/dkms/'
license=('GPL2')
depends=('linux-headers' 'kmod')
backup=('etc/dkms/framework.conf' "etc/conf.d/$pkgname")
depends=('linux-headers' 'kmod' 'sh')
backup=('etc/dkms/framework.conf')
source=("http://linux.dell.com/$pkgname/permalink/$pkgname-$pkgver.tar.gz"
"$pkgname.rc"
"$pkgname.conf"
"$pkgname.service"
"$pkgname.systemd"
'01-broken-uninstall.patch')
md5sums=('11a8aaade2ebec2803653837c7593030'
'cf3bcc0cec00caf67a6d393e94c65de5'
'8be6746da3df4dcb61cd2b1459974fce'
'02e9744e3fdc3d2f68e46966fb32e260'
'51c80e29c0ca600b4737c573d3311dbc'
'4e3a580c09b5af8de7ffde0b61bdcfcf')
build() {
@ -43,8 +43,8 @@ package() {
# move bash completion in right place
install -d -m 755 "$pkgdir/usr/share/bash-completion"
mv "$pkgdir/etc/bash_completion.d" "$pkgdir/usr/share/bash-completion/completions"
# add initscripts
install -D -m 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname"
install -D -m 644 $pkgname.conf "$pkgdir/etc/conf.d/$pkgname"
# add systemd
install -D -m 644 $pkgname.service "$pkgdir/usr/lib/systemd/system/$pkgname.service"
install -D -m 755 $pkgname.systemd "$pkgdir/usr/lib/systemd/scripts/$pkgname"
}

11
dkms/dkms.service Normal file
View File

@ -0,0 +1,11 @@
[Unit]
Description=Dynamic Kernel Modules System
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/usr/lib/systemd/scripts/dkms start
ExecStop=/usr/lib/systemd/scripts/dkms stop
[Install]
WantedBy=multi-user.target

61
dkms/dkms.systemd Normal file
View File

@ -0,0 +1,61 @@
#!/bin/bash
. /etc/conf.d/dkms
# list dkms modules for the current running kernel
list_dkms_modules() {
shopt -s nullglob
declare -a DKMS_MOULES
# dkms status needs uname -r to list correctly intalled version for current kernel
local modules_path=($(dkms status -k "$(uname -r)"|sed -rn 's#(.*), (.*), (.*), (.*): installed#\1/\2/\3/\4#p'))
for p in "${modules_path[@]}"; do
for m in /var/lib/dkms/"$p"/module/*.ko{,gz}; do
m=${m##*/}
m=${m%.gz}
m=${m%.ko}
DKMS_MODULES+=("$m")
done
done
}
# load installed kernel modules for the current kernel version
load_dkms_modules() {
local ret=0
list_dkms_modules
for m in "${DKMS_MODULES[@]}"; do
modprobe "$m"
ret+=$?
done
return $ret
}
# unload installed kernel modules for the current kernel version
unload_dkms_modules() {
list_dkms_modules
# ask for removal
for m in "${DKMS_MODULES[@]}"; do
modprobe --remove --quiet "$m"
done
# check modules are unloaded
# sometimes modprobe -r fail but modules are removed
for m in "${DKMS_MODULES[@]}"; do
[[ -e /sys/modules/$m ]] && return 1
done
return 0
}
case "$1" in
start)
dkms autoinstall -k "$(uname -r)"
[[ $LOAD =~ [Yy][Ee][Ss] ]] && load_dkms_modules
;;
stop)
[[ $UNLOAD =~ [Yy][Ee][Ss] ]] && unload_dkms_modules
;;
*)
echo "usage: $0 {start|stop}" >&2
;;
esac
:
# vim:set ts=2 sw=2 ft=sh et:

6
madwifi/PKGBUILD
View File

@ -3,18 +3,18 @@
#
# maintainer abveritas@chakra-project.org
_extramodules=extramodules-3.4-CHAKRA
_extramodules=extramodules-3.5-CHAKRA
_kver="$(cat /lib/modules/${_extramodules}/version)"
pkgname=madwifi
pkgver=0.9.4.4173
_ver=0.9.4-r4173-20111008
pkgrel=8
pkgrel=9
pkgdesc="Madwifi drivers for Atheros wireless chipsets"
arch=(i686 x86_64)
license=('GPL')
url="http://madwifi-project.org"
depends=('madwifi-utils' 'linux>=3.4' 'linux<3.5')
depends=('madwifi-utils' 'linux>=3.5' 'linux<3.6')
makedepends=('linux-headers' 'sharutils')
install=madwifi-ng.install
# subversion source: svn checkout http:/madwifi-project.org/svn/madwifi/trunk madwifi

2
madwifi/madwifi-ng.install
View File

@ -5,7 +5,7 @@ post_install()
post_upgrade()
{
EXTRAMODULES='extramodules-3.4-CHAKRA'
EXTRAMODULES='extramodules-3.5-CHAKRA'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}

6
nvidia-173xx/PKGBUILD
View File

@ -3,12 +3,12 @@
#
# maintainer abveritas@chakra-project.org
_extramodules=extramodules-3.4-CHAKRA
_extramodules=extramodules-3.5-CHAKRA
_kver="$(cat /lib/modules/${_extramodules}/version)"
pkgname=(nvidia-173xx chd-nvidia-173xx)
pkgver=173.14.35
pkgrel=4
pkgrel=5
arch=('i686' 'x86_64')
[ "$CARCH" = "i686" ] && ARCH=x86
[ "$CARCH" = "x86_64" ] && ARCH=x86_64
@ -38,7 +38,7 @@ build() {
package_nvidia-173xx() {
pkgdesc="Legacy NVIDIA drivers for linux."
depends=('linux>=3.4' 'linux<3.5' 'nvidia-173xx-utils')
depends=('linux>=3.5' 'linux<3.6' 'nvidia-173xx-utils')
conflicts=('nvidia-96xx' 'nvidia')
install=nvidia.install

6
nvidia-173xx/nvidia.install
View File

@ -1,15 +1,15 @@
post_install() {
EXTRAMODULES='extramodules-3.4-CHAKRA'
EXTRAMODULES='extramodules-3.5-CHAKRA'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
echo 'In order to use nvidia module, reboot the system.'
}
post_upgrade() {
EXTRAMODULES='extramodules-3.4-CHAKRA'
EXTRAMODULES='extramodules-3.5-CHAKRA'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
post_remove() {
EXTRAMODULES='extramodules-3.4-CHAKRA'
EXTRAMODULES='extramodules-3.5-CHAKRA'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}

2
nvidia-utils-bumblebee/PKGBUILD
View File

@ -12,7 +12,7 @@ pkgname=nvidia-utils-bumblebee
#}
pkgver=304.51
pkgrel=1
pkgrel=2
pkgdesc="NVIDIA drivers utilities and libraries. Repacked and installed in different folder to be used simultaneously with libgl."
arch=('i686' 'x86_64')
url="http://www.nvidia.com/"