summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMárcio Alexandre Silva Delgado <coadde@lavabit.com>2013-08-21 17:22:05 -0300
committerMárcio Alexandre Silva Delgado <coadde@lavabit.com>2013-08-21 17:22:05 -0300
commit9a386f912e3d7934280849b7ba45b56797ea3c44 (patch)
treed418157456ebaf76f811b4935b8a46832a333b30
parent114fb7278eab9dbcf3b8be9a2b12416f328ca389 (diff)
parentbd8e1594ecbba294317f2fddcb86164aaa3945ad (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
-rw-r--r--kernels/linux-libre-pae/PKGBUILD17
-rw-r--r--kernels/linux-libre-xen/PKGBUILD17
2 files changed, 12 insertions, 22 deletions
diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index 91832cc42..a2e8a5627 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192495 2013-08-13 09:26:23Z tpowa $
+# $Id: PKGBUILD 193106 2013-08-16 10:56:45Z 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.10
-pkgver=${_basekernel}.6
-pkgrel=2
+pkgver=${_basekernel}.7
+pkgrel=1
arch=('i686')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -22,17 +22,15 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'boot-logo.patch'
'change-default-console-loglevel.patch'
'criu-no-expert.patch'
- '3.10.6-logitech-dj.patch'
- '3.10.6-reset-superseed-xhci-hcd.patch')
+ '3.10.6-logitech-dj.patch')
md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
- 'f4810ea4bd977321d76edcde8dc756c9'
+ '8d05dec5772b17c4c21c00b93da42bd8'
'7dc48829b6bcb5db3779d558c705ab63'
'f302c931bd85309da9d9792b4cc96467'
'04b21c79df0a952c22d681dd4f4562df'
'f3def2cefdcbb954c21d8505d23cc83c'
'd50c1ac47394e9aec637002ef3392bd1'
- '3ff40ca684cfe719723e627e2cef7cea'
- 'e751378a3e94532bfe85fb82c80e26c0')
+ '3ff40ca684cfe719723e627e2cef7cea')
_kernelname=${pkgbase#linux-libre}
_localversionname=-LIBRE-PAE
@@ -59,9 +57,6 @@ prepare() {
# fix https://bugs.archlinux.org/task/35991 - [linux] 3.10.x renders Logitech Unified Receivers useless
patch -Np1 -i "${srcdir}/3.10.6-logitech-dj.patch"
- # fix https://bugs.archlinux.org/task/36296 - [linux] 3.10.3 reset SuperSpeed USB using xhci_hcd
- patch -Np1 -i "${srcdir}/3.10.6-reset-superseed-xhci-hcd.patch"
-
cat "${srcdir}/config" > ./.config # simpler
if [ "${_kernelname}" != "" ]; then
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index b9aa01f1e..227a66426 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192495 2013-08-13 09:26:23Z tpowa $
+# $Id: PKGBUILD 193106 2013-08-16 10:56:45Z 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-xen # Build stock -LIBRE-XEN kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.10
-pkgver=${_basekernel}.6
-pkgrel=2
+pkgver=${_basekernel}.7
+pkgrel=1
arch=('i686')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -22,17 +22,15 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'boot-logo.patch'
'change-default-console-loglevel.patch'
'criu-no-expert.patch'
- '3.10.6-logitech-dj.patch'
- '3.10.6-reset-superseed-xhci-hcd.patch')
+ '3.10.6-logitech-dj.patch')
md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
- '63a1c2aba22871f8e8dacdb4968d9a1f'
+ '8d05dec5772b17c4c21c00b93da42bd8'
'f104314d8db864b1702c50ea97134be3'
'b7c2805bb287a644c0a303bf7721e534'
'04b21c79df0a952c22d681dd4f4562df'
'f3def2cefdcbb954c21d8505d23cc83c'
'd50c1ac47394e9aec637002ef3392bd1'
- '3ff40ca684cfe719723e627e2cef7cea'
- 'e751378a3e94532bfe85fb82c80e26c0')
+ '3ff40ca684cfe719723e627e2cef7cea')
_kernelname=${pkgbase#linux-libre}
_localversionname=-LIBRE-XEN
@@ -59,9 +57,6 @@ prepare() {
# fix https://bugs.archlinux.org/task/35991 - [linux] 3.10.x renders Logitech Unified Receivers useless
patch -Np1 -i "${srcdir}/3.10.6-logitech-dj.patch"
- # fix https://bugs.archlinux.org/task/36296 - [linux] 3.10.3 reset SuperSpeed USB using xhci_hcd
- patch -Np1 -i "${srcdir}/3.10.6-reset-superseed-xhci-hcd.patch"
-
cat "${srcdir}/config" > ./.config # simpler
if [ "${_kernelname}" != "" ]; then