diff options
author | root <root@rshg054.dnsready.net> | 2012-01-05 23:14:48 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-01-05 23:14:48 +0000 |
commit | 817e58c278cb8ebee7743205877d0f67c431fcec (patch) | |
tree | f2716cc059272be15ea4691e8d40e6a998f4c936 /libre/linux-libre/PKGBUILD | |
parent | 85828cc2c2c3ef5c0b9b03388b9323d3d163b389 (diff) |
Thu Jan 5 23:14:48 UTC 2012
Diffstat (limited to 'libre/linux-libre/PKGBUILD')
-rw-r--r-- | libre/linux-libre/PKGBUILD | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 966e3d979..e7668ca29 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -8,8 +8,13 @@ pkgbase=linux-libre pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -LIBRE kernel # pkgname=linux-custom # Build kernel with a different name _kernelname=${pkgname#linux-libre} +<<<<<<< HEAD _basekernel=3.1 pkgver=${_basekernel}.7 +======= +_basekernel=3.2 +pkgver=${_basekernel} +>>>>>>> ddf6b4309b9f9816e75828359a2d60a23a0ca68c pkgrel=1 arch=('i686' 'x86_64') url="http://linux-libre.fsfla.org/" @@ -17,7 +22,7 @@ license=('GPL2') makedepends=('xmlto' 'docbook-xsl') options=('!strip') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-libre/linux-${_basekernel}-libre.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}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz" # the main kernel config files 'config.i686' 'config.x86_64' # standard config files for mkinitcpio ramdisk @@ -25,7 +30,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li 'boot-logo.patch' 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' - 'i915-fix-incorrect-error-message.patch' 'usb-add-reset-resume-quirk-for-several-webcams.patch') md5sums=('d73df15ab1d36fe3c102755d8f42117f' '47e4a10500ad90694b7f42fb447ab810' @@ -41,7 +45,7 @@ md5sums=('d73df15ab1d36fe3c102755d8f42117f' build() { cd "${srcdir}/linux-${_basekernel}" - patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre" +# patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre" # Add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" @@ -55,11 +59,6 @@ build() { # needed. patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch" - # In 3.1.1, a DRM_DEBUG message is falsely declared as DRM_ERROR. This - # worries users, as this message is displayed even at loglevel 4. Fix - # this. - patch -Np1 -i "${srcdir}/i915-fix-incorrect-error-message.patch" - # Add the USB_QUIRK_RESET_RESUME for several webcams # FS#26528 patch -Np1 -i "${srcdir}/usb-add-reset-resume-quirk-for-several-webcams.patch" @@ -301,3 +300,14 @@ package_linux-libre-docs() { # remove a file already in linux package rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" } +<<<<<<< HEAD +======= +md5sums=('27c641c4f6785fc647cdd3e44963a55c' + 'eb37c323f6993d6cc963c61a1f482956' + '4e9be096386838d247672963f9af9ea8' + 'a8a3843046926eb7ab81312cd438c5c5' + '04b21c79df0a952c22d681dd4f4562df' + '9d3c56a4b999c8bfbd4018089a62f662' + '263725f20c0b9eb9c353040792d644e5' + '52d41fa61e80277ace2b994412a0c856') +>>>>>>> ddf6b4309b9f9816e75828359a2d60a23a0ca68c |