diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-19 11:22:26 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-19 11:22:26 +0100 |
| commit | 56bf63be7060f55d0048fc1f2e37526723bf0dc7 (patch) | |
| tree | 5072df371092a3bfded8d6aadca1af5018523291 /kernels/linux-libre-xen/PKGBUILD | |
| parent | d697117f3e2c400f8a7cae7bbbbf27166edc277a (diff) | |
| parent | b54c21859be3590a319ceade1f58d0b89ac5ef32 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bitcoin/PKGBUILD
community/chmsee/PKGBUILD
community/projectm/PKGBUILD
extra/apache/PKGBUILD
extra/gv/PKGBUILD
extra/libdc1394/PKGBUILD
extra/libraw1394/PKGBUILD
extra/samba/PKGBUILD
extra/sg3_utils/PKGBUILD
extra/upower/PKGBUILD
extra/xf86-input-aiptek/PKGBUILD
extra/xf86-video-modesetting/PKGBUILD
extra/xorg-server/PKGBUILD
libre/rp-pppoe-libre/PKGBUILD
Diffstat (limited to 'kernels/linux-libre-xen/PKGBUILD')
| -rw-r--r-- | kernels/linux-libre-xen/PKGBUILD | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 3fb5fdb37..91dc1484c 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180054 2013-03-15 08:10:52Z 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> @@ -7,7 +7,7 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 pkgver=${_basekernel}.3 -pkgrel=1 +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' 'a762b6f22a64473a0b4d8dc5366b25d3' 'c13961a22d8c742fb31b59a1e27a0e7b' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' - 'f3def2cefdcbb954c21d8505d23cc83c') + 'f3def2cefdcbb954c21d8505d23cc83c' + '40e7b328977ad787a0b5584f193d63fe' + '8b9159931fab0c191a86dbd5a46fa328') _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE-XEN @@ -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 |