summaryrefslogtreecommitdiff
path: root/kernels
diff options
context:
space:
mode:
Diffstat (limited to 'kernels')
-rw-r--r--kernels/linux-libre-rt/3.4.4-fix-gtx560ti-nouveau-regression.patch20
-rw-r--r--kernels/linux-libre-rt/PKGBUILD26
-rw-r--r--kernels/linux-libre-rt/linux-libre-rt.install2
3 files changed, 15 insertions, 33 deletions
diff --git a/kernels/linux-libre-rt/3.4.4-fix-gtx560ti-nouveau-regression.patch b/kernels/linux-libre-rt/3.4.4-fix-gtx560ti-nouveau-regression.patch
deleted file mode 100644
index 1b70e918c..000000000
--- a/kernels/linux-libre-rt/3.4.4-fix-gtx560ti-nouveau-regression.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Revert change to include/drm/drm_fb_helper.h made in commit 4f988d132d2668b4f3b42bfc70daa531115ccca1
-
- include/drm/drm_fb_helper.h | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
-index 55e10d6..5120b01 100644
---- a/include/drm/drm_fb_helper.h
-+++ b/include/drm/drm_fb_helper.h
-@@ -35,6 +35,7 @@ struct drm_fb_helper;
- #include <linux/kgdb.h>
-
- struct drm_fb_helper_crtc {
-+ uint32_t crtc_id;
- struct drm_mode_set mode_set;
- struct drm_display_mode *desired_mode;
- };
---
-1.7.6.5
-
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index 9cf182305..ea83d99c7 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -17,7 +17,7 @@ _releasever=4
_rtpatchver=rt13
_pkgver=${_basekernel}.${_releasever}
pkgver=${_basekernel}.${_releasever}_${_rtpatchver}
-pkgrel=1
+pkgrel=1.1
arch=('i686' 'x86_64')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -33,8 +33,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'boot-logo.patch'
'change-default-console-loglevel.patch'
'i915-fix-ghost-tv-output.patch'
- '3.4.4-fix-backlight-regression.patch'
- '3.4.4-fix-gtx560ti-nouveau-regression.patch')
+ '3.4.4-fix-backlight-regression.patch')
md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
'e9bb311ab329555a61696b1a18df2d34'
'6d4beaa5ec54f86f91f66c77a5bcc8f4'
@@ -71,14 +70,8 @@ build() {
# Fix backlight control on some laptops:
# https://bugzilla.kernel.org/show_bug.cgi?id=43168
- msg "patch for backlight regression"
patch -Np1 -i "${srcdir}/3.4.4-fix-backlight-regression.patch"
- # fix nouveau regression
- # Arch Linux bug report: FS#30417
- msg "patch for gtx560ti-nouveau regression"
- patch -Np1 -i "${srcdir}/3.4.4-fix-gtx560ti-nouveau-regression.patch"
-
# set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
# remove this when a Kconfig knob is made available by upstream
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
@@ -93,6 +86,9 @@ build() {
# set extraversion to pkgrel
sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
+ # don't run depmod on 'make install'. We'll do this ourselves in packaging
+ sed -i '2iexit 0' scripts/depmod.sh
+
# get kernel version
make prepare
@@ -162,6 +158,12 @@ package_linux-libre-rt() {
# add real version for building modules and running depmod from post_install/upgrade
mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}"
echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}/version"
+
+ # move module tree /lib -> /usr/lib
+ mv "$pkgdir/lib" "$pkgdir/usr"
+
+ # Now we call depmod...
+ depmod -b "$pkgdir" -F System.map "$_kernver"
}
package_linux-libre-rt-headers() {
@@ -170,10 +172,10 @@ package_linux-libre-rt-headers() {
conflicts=('kernel26-rt-headers' 'kernel26-libre-rt-headers' 'linux-rt-headers')
replaces=('kernel26-rt-headers' 'kernel26-libre-rt-headers' 'linux-rt-headers')
- mkdir -p "${pkgdir}/lib/modules/${_kernver}"
+ install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
- cd "${pkgdir}/lib/modules/${_kernver}"
- ln -sf ../../../usr/src/linux-${_kernver} build
+ cd "${pkgdir}/usr/lib/modules/${_kernver}"
+ ln -sf ../../../src/linux-${_kernver} build
cd "${srcdir}/linux-${_basekernel}"
install -D -m644 Makefile \
diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install
index 5a65dda2b..e316a354c 100644
--- a/kernels/linux-libre-rt/linux-libre-rt.install
+++ b/kernels/linux-libre-rt/linux-libre-rt.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=-rt
-KERNEL_VERSION=3.4.4-1-rt13-LIBRE-RT
+KERNEL_VERSION=3.4.4-1.1-rt13-LIBRE-RT
post_install () {
# updating module dependencies