Commit f5ecf175 authored by Luca Giambonini's avatar Luca Giambonini

fix build of linux-lts

parent 6f2af17b
......@@ -8,14 +8,14 @@ arch=('x86_64')
url='http://github.com/Bumblebee-Project/bbswitch'
license=('GPL')
provides=('bbswitch')
_extramodules=extramodules-CHAKRA
_extramodules=extramodules-CHAKRA-LTS
depends=("linux-lts=4.4.150")
makedepends=("linux-lts-headers=4.4.150")
source=("https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz")
md5sums=('5b116b31ace3604ddf9d1fc1f4bc5807')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
cd ${_pkgname}-${pkgver}
KERNEL_VERSION=$(</usr/lib/modules/$_extramodules/version)
msg2 "Kernel = $KERNEL_VERSION"
......@@ -23,7 +23,7 @@ build() {
}
package() {
cd ${srcdir}/${pkgname}-${pkgver}
cd ${_pkgname}-${pkgver}
# KDIR is necessary even when cleaning
install -Dm644 bbswitch.ko $pkgdir/usr/lib/modules/${_extramodules}/bbswitch.ko
gzip "${pkgdir}/usr/lib/modules/${_extramodules}/bbswitch.ko"
......
......@@ -10,6 +10,8 @@
# packages in the right order to solve
# the dependencies correctly
#
# adding '+' in front of the pkgname cause
# a pkgrel++ only (deps version updated too)
#core_packages
linux-lts
......
......@@ -140,10 +140,10 @@ package_linux-lts() {
# gzip -9 all modules to save 100MB of space
find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
# make room for external modules
ln -s "../extramodules-${_basekernel}${_kernelname:--CHAKRA-LTS}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
ln -s "../extramodules${_kernelname}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
# add real version for building modules and running depmod from post_install/upgrade
mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--CHAKRA-LTS}"
echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--CHAKRA-LTS}/version"
mkdir -p "${pkgdir}/lib/modules/extramodules${_kernelname}"
echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules${_kernelname}/version"
# Now we call depmod...
depmod -b "$pkgdir" -F System.map "$_kernver"
......
......@@ -7,9 +7,9 @@ pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors.
license=('GPL')
arch=('x86_64')
url="http://ndiswrapper.sourceforge.net"
install="ndiswrapper.install"
depends=("linux-lts=4.4.150")
makedepends=("linux-lts-headers=4.4.150")
_extramodules=extramodules-CHAKRA-LTS
source=("http://downloads.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-$pkgver.tar.gz")
sha1sums=('213854ca8a83f9b5972db8fa873d346124e4bcb5')
......@@ -17,7 +17,6 @@ KERNEL_VERSION=$(</usr/lib/modules/$_extramodules/version)
prepare() {
cd "$srcdir/$_pkgname-$pkgver"
#patch -p1 -i ../ndiswrapper-1.59.patch
sed -i "/modinfo/s/s/usr\//" driver/Makefile
}
......
diff -aur ndiswrapper-1.59.old/driver/crt.c ndiswrapper-1.59.new/driver/crt.c
--- ndiswrapper-1.59.old/driver/crt.c 2013-11-28 20:42:35.000000000 +0100
+++ ndiswrapper-1.59.new/driver/crt.c 2014-04-11 20:39:22.384962602 +0200
@@ -467,7 +467,7 @@
noregparm void WIN_FUNC(_win_srand,1)
(UINT seed)
{
- net_srandom(seed);
+ prandom_seed((__force u32)(seed));
}
noregparm int WIN_FUNC(rand,0)
diff -aur ndiswrapper-1.59.old/driver/ntoskernel.h ndiswrapper-1.59.new/driver/ntoskernel.h
--- ndiswrapper-1.59.old/driver/ntoskernel.h 2013-11-28 20:42:36.000000000 +0100
+++ ndiswrapper-1.59.new/driver/ntoskernel.h 2014-04-11 20:44:03.491617236 +0200
@@ -347,7 +347,7 @@
#define netdev_notifier_info_to_dev(x) ((struct net_device *)(x))
#endif
-#ifdef INIT_COMPLETION
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0)
static inline void reinit_completion(struct completion *x)
{
INIT_COMPLETION(*x);
@@ -797,9 +797,8 @@
#define nt_spin_unlock_irqrestore(lock, flags) \
do { \
nt_spin_unlock(lock); \
- preempt_enable_no_resched(); \
+ preempt_enable(); \
local_irq_restore(flags); \
- preempt_check_resched(); \
} while (0)
static inline ULONG SPAN_PAGES(void *ptr, SIZE_T length)
......@@ -15,7 +15,6 @@ md5sums=('485506ee6a7c54780488dacddf1d56b1')
prepare() {
cd "${srcdir}"
sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
sh "${_pkg}.run" --extract-only
cd "${_pkg}"
}
......@@ -32,7 +31,6 @@ package() {
install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
"${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
install -d -m755 "${pkgdir}/etc/modprobe.d"
sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
echo "blacklist nouveau" |
install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
......
pkgname=nvidia-340xx-lts
pkgver=340.106
pkgrel=4
pkgver=340.107
pkgrel=1
pkgdesc="NVIDIA drivers for linux."
arch=('x86_64')
url="http://www.nvidia.com/"
......@@ -13,7 +13,7 @@ _extramodules=extramodules-CHAKRA-LTS
_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run")
md5sums=('37c84428b64696be2b104edbc9855f57')
md5sums=('ffca1879d77dfc491dfb0276ceb56cc1')
prepare() {
sh "${_pkg}.run" --extract-only
......
......@@ -11,10 +11,10 @@ conflicts=('nvidia-340xx-lts' 'nvidia-lts')
license=('custom')
options=('!strip')
_extramodules=extramodules-CHAKRA-LTS
source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
sha512sums=('65b92ec7f9488a98a8579efcf5b00aca42945b1d0fd0f58aacebf45c772b0b896af8bbac3abec126a931752ef9504a727fac89220c115ff474c0521f3c214d99')
_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run")
sha512sums=('517947c63dceefd4c9ef27226e39abba727baa4e5493543edf2e0d3cd16341b35e90d02b5ec7319e76c75a0adbc4ae451ede5fc48a6fc38cc2823425dfaefd7d')
prepare() {
sh "${_pkg}.run" --extract-only
......
pkgname=('nvidia-lts')
pkgdesc=('NVIDIA drivers for linux-lts')
pkgname=nvidia-lts
pkgdesc="NVIDIA drivers for linux-lts"
pkgver=396.51
pkgrel=3
pkgrel=1
arch=('x86_64')
url="http://www.nvidia.com/"
depends=("linux-lts=4.4.150" "nvidia-utils=${pkgver}" 'libglvnd')
makedepends=("linux-lts-headers=4.4.150")
_extramodules=extramodules-CHAKRA-LTS
license=('custom')
_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
#_pkg="NVIDIA-Linux-x86_64-${pkgver}"
source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
#source=("NVIDIA-Linux-x86_64-${pkgver}.run::https://developer.nvidia.com/linux64bit")
md5sums=('e41e28d1f380c64ec2eacae344fb5017')
_pkg="NVIDIA-Linux-x86_64-${pkgver}"
source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run")
md5sums=('42b1a62681dff47f82d66bf9e9406915')
prepare() {
sh "${_pkg}.run" --extract-only
......@@ -29,7 +25,7 @@ build() {
make SYSSRC=/usr/lib/modules/$KERNEL_VERSION/build module
}
package_nvidia() {
package() {
install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
"${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
......
......@@ -9,7 +9,7 @@ url="http://cdemu.sourceforge.net/"
license=('GPL2')
depends=("linux-lts>=${_kernelver}")
makedepends=("linux-lts-headers=4.4.150")
install=vhba-module.install
_extramodules=extramodules-CHAKRA-LTS
source=("http://sourceforge.net/projects/cdemu/files/vhba-module/vhba-module-$pkgver.tar.bz2"
'60-vhba.rules')
md5sums=('f9478a5f5528fc672c204b6b4bd02213'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment