summaryrefslogtreecommitdiff
path: root/kernels
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-04-17 03:50:25 +0000
committerroot <root@rshg054.dnsready.net>2012-04-17 03:50:25 +0000
commit0fb510ac9b1defac6c3d54a68eccd7e18635b474 (patch)
treef07639df5956bd5bbb54c5eac763dfb0af03e62b /kernels
parentd1bfef207c6695736de171fc604b68eab0c1f1cd (diff)
Tue Apr 17 03:50:24 UTC 2012
Diffstat (limited to 'kernels')
-rw-r--r--kernels/linux-libre-xen/PKGBUILD22
-rw-r--r--kernels/linux-libre-xen/config.i6863
-rw-r--r--kernels/linux-libre-xen/ext4-options.patch3
-rw-r--r--kernels/linux-libre-xen/linux-libre-xen.install2
4 files changed, 13 insertions, 17 deletions
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index 685710c52..caa0d045b 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -11,8 +11,7 @@ pkgname=('linux-libre-xen' 'linux-libre-xen-headers') # Build stock -LIBRE kerne
# pkgname=linux-custom # Build kernel with a different name
_kernelname=-LIBRE-XEN
_basekernel=3.3
-#pkgver=${_basekernel}.11
-pkgver=${_basekernel}
+pkgver=${_basekernel}.2
pkgrel=1
arch=('i686')
url="http://linux-libre.fsfla.org/"
@@ -20,7 +19,7 @@ license=('GPL2')
makedepends=('xmlto' 'docbook-xsl')
options=('!strip')
source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
- #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz"
+ "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
# the main kernel config files
'config.i686'
# standard config files for mkinitcpio ramdisk
@@ -28,29 +27,26 @@ 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'
- 'i915-gpu-finish.patch'
'ext4-options.patch')
md5sums=('5487da14ca81715a469c7594d39722fa'
- '1f29ffc2b18d7c37c781d7938ada59ab'
+ 'b43d3bdecfa355bf45bd1154819e3687'
+ '7e49ab7e4e63c890d0196be139a55656'
'b7c2805bb287a644c0a303bf7721e534'
'04b21c79df0a952c22d681dd4f4562df'
'9d3c56a4b999c8bfbd4018089a62f662'
'263725f20c0b9eb9c353040792d644e5'
- '4cd79aa147825837dc8bc9f6b736c0a0'
- 'c8299cf750a84e12d60b372c8ca7e1e8')
+ 'bb7fd1aa23016c8057046b84fd4eb528')
build() {
cd "${srcdir}/linux-${_basekernel}"
-# patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre"
+ if [ "${_basekernel}" != "${pkgver}" ]; then
+ patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
+ fi
# Add freedo as boot logo
patch -Np1 -i "${srcdir}/boot-logo.patch"
- # fix FS#27883
- # drm/i915: Only clear the GPU domains upon a successful finish
- patch -Np1 -i "${srcdir}/i915-gpu-finish.patch"
-
# Some chips detect a ghost TV output
# mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html
# Arch Linux bug report: FS#19234
@@ -171,7 +167,7 @@ package_linux-libre-xen-headers() {
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include"
for i in acpi asm-generic config crypto drm generated linux math-emu \
- media net pcmcia scsi sound trace video xen; do
+ media mtd net pcmcia scsi sound trace video xen; do
cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/"
done
diff --git a/kernels/linux-libre-xen/config.i686 b/kernels/linux-libre-xen/config.i686
index e6a221b4f..b1d41d390 100644
--- a/kernels/linux-libre-xen/config.i686
+++ b/kernels/linux-libre-xen/config.i686
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.3.0 Kernel Configuration
+# Linux/i386 3.3.2 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -5120,7 +5120,6 @@ CONFIG_RTLLIB_CRYPTO_TKIP=m
CONFIG_RTLLIB_CRYPTO_WEP=m
CONFIG_RTL8192E=m
CONFIG_R8712U=m
-CONFIG_R8712_AP=y
CONFIG_RTS_PSTOR=m
# CONFIG_RTS_PSTOR_DEBUG is not set
CONFIG_RTS5139=m
diff --git a/kernels/linux-libre-xen/ext4-options.patch b/kernels/linux-libre-xen/ext4-options.patch
index 812b05f04..ea48c384b 100644
--- a/kernels/linux-libre-xen/ext4-options.patch
+++ b/kernels/linux-libre-xen/ext4-options.patch
@@ -46,4 +46,5 @@ index 502c61f..30de9cd 100644
+#endif
default:
ext4_msg(sb, KERN_ERR,
- "Unrecognized mount option \"%s\" " \ No newline at end of file
+ "Unrecognized mount option \"%s\" "
+
diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install
index 55645b3fd..06c1f6ae8 100644
--- a/kernels/linux-libre-xen/linux-libre-xen.install
+++ b/kernels/linux-libre-xen/linux-libre-xen.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=-xen
-KERNEL_VERSION=3.3.0-1-LIBRE-XEN
+KERNEL_VERSION=3.3.2-1-LIBRE-XEN
post_install () {
# updating module dependencies