diff options
author | Nicolás Reynolds <fauno@parabola.nu> | 2013-03-21 12:12:27 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@parabola.nu> | 2013-03-21 12:12:27 -0300 |
commit | 9f59cbc1fd9ac9b0c5b08f81447dbd1794992f3d (patch) | |
tree | 61c08b7025d4d1044347d9efd42cf5d9680b7072 /kernels/linux-libre-pae/PKGBUILD | |
parent | 55f42c86ab5e8509098cc9763975b58bf9ce6504 (diff) | |
parent | 199598529a8f378b590f77ca6d5434bbd1a58c8d (diff) |
Merge branch 'master' of ssh://gparabola/srv/git/abslibre
Diffstat (limited to 'kernels/linux-libre-pae/PKGBUILD')
-rw-r--r-- | kernels/linux-libre-pae/PKGBUILD | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 83427aeed..5e937cbf8 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179278 2013-03-04 13:23:40Z tpowa $ +# $Id: PKGBUILD 180114 2013-03-17 13:00:07Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,8 +6,8 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.2 -pkgrel=1 +pkgver=${_basekernel}.3 +pkgrel=2 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -20,13 +20,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn # standard config files for mkinitcpio ramdisk "${pkgbase}.preset" 'boot-logo.patch' - 'change-default-console-loglevel.patch') + 'change-default-console-loglevel.patch' + 'drm-i915-enable-irqs-earlier-when-resuming.patch' + 'drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - '61b8b43e04065556b2b173d34111674d' + 'a762b6f22a64473a0b4d8dc5366b25d3' '5cc106ba38bab845ea62138fc0d1bbf1' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' - '9d3c56a4b999c8bfbd4018089a62f662') + 'f3def2cefdcbb954c21d8505d23cc83c' + '40e7b328977ad787a0b5584f193d63fe' + '8b9159931fab0c191a86dbd5a46fa328') _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE-PAE @@ -46,6 +50,11 @@ build() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" + # revert 2 patches which breaks displays + # FS 34327 + patch -Rp1 -i "${srcdir}/drm-i915-enable-irqs-earlier-when-resuming.patch" + patch -Rp1 -i "${srcdir}/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch" + cat "${srcdir}/config" > ./.config # simpler if [ "${_kernelname}" != "" ]; then |