diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-13 10:18:14 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-13 10:18:14 +0100 |
commit | d27bbcebde95f792e0660af3657878216b2590c3 (patch) | |
tree | ebd693dbaeb22eb25643e06b80facc1e0f073e77 /libre | |
parent | 68dc88e3f45d6cb33a56ca10ec02f7e990636d31 (diff) | |
parent | 0671250710c3e7312a4693ac45ebbaacf471d1dc (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/curl/PKGBUILD
core/lvm2/PKGBUILD
core/openvpn/PKGBUILD
extra/diffstat/PKGBUILD
extra/libxcb/PKGBUILD
extra/xorg-xkbutils/PKGBUILD
extra/xorg-xvinfo/PKGBUILD
Diffstat (limited to 'libre')
-rw-r--r-- | libre/linux-libre-kmod-alx/PKGBUILD | 10 | ||||
-rw-r--r-- | libre/linux-libre-lts-kmod-alx/PKGBUILD | 10 | ||||
-rw-r--r-- | libre/linux-libre-lts/PKGBUILD | 8 | ||||
-rw-r--r-- | libre/linux-libre-lts/linux-libre-lts.install | 2 | ||||
-rw-r--r-- | libre/linux-libre/PKGBUILD | 8 | ||||
-rw-r--r-- | libre/linux-libre/linux-libre.install | 2 |
6 files changed, 20 insertions, 20 deletions
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index f82a250bf..caaad4901 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,11 +1,11 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.7.6 +_kernver=3.7.7 _kernrel=1 pkgname=('linux-libre-kmod-alx') -_version=v3.8-rc5 -_pkgver=3.8-rc5-1-u -pkgver=3.8rc5.1 +_version=v3.8-rc7 +_pkgver=3.8-rc7-1-u +pkgver=3.8rc7.1 pkgrel=1 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ provides=('alx' 'alx-driver' 'dkms-alx') conflicts=('alx' 'alx-driver' 'dkms-alx') source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_version/compat-drivers-$_pkgver.tar.xz) -md5sums=('6ad873fbc6664aa4c15160e3ad7cb4c1') +md5sums=('3a1c7f870ff2fb96534b0d69245a4dab') build() { diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 61b978fdc..0840667de 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,11 +1,11 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.0.62 +_kernver=3.0.63 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') -_version=v3.8-rc5 -_pkgver=3.8-rc5-1-u -pkgver=3.8rc5.1 +_version=v3.8-rc7 +_pkgver=3.8-rc7-1-u +pkgver=3.8rc7.1 pkgrel=1 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ provides=('alx' 'alx-driver' 'dkms-alx') conflicts=('alx' 'alx-driver' 'dkms-alx') source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_version/compat-drivers-$_pkgver.tar.xz) -md5sums=('6ad873fbc6664aa4c15160e3ad7cb4c1') +md5sums=('3a1c7f870ff2fb96534b0d69245a4dab') build() { diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 4a4972307..f17cf91f5 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=62 +_sublevel=63 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.61 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.62 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '90b2c4b9a05b108219bd44ac4804db84' + '5e4e976cce788a37cd17ea469dea7e6e' '99f9c408b64393aceb2482c9a3e329ee' 'fba95bf1857ce6bf863e13a1ab73f584' 'c072b17032e80debc6a8626299245d46' @@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '8436bee363b959651d12eeb21bf0ec23') + '00c97c232129ecd16c739b0da0de87ce') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index dc9b9e2d1..df16319ea 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.62-1-LIBRE-LTS +KERNEL_VERSION=3.0.63-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index ed451ff6e..c7a84459e 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.7 -_sublevel=6 +_sublevel=7 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'fat-3.6.x.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('06bf9601d859531e7378eb43d4ca7dd3' - '90b2c4b9a05b108219bd44ac4804db84' + '6645c512b49498f17183298ab1ae98f2' '53c782740eb3ddf875ad98c31c1bf213' '71a6f703cb0bee098a76ea42d5836d06' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -41,7 +41,7 @@ md5sums=('06bf9601d859531e7378eb43d4ca7dd3' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '88d501404f172dac6fcb248978251560' - '22056cd3540f16d19a4adfc83e055b1f') + '7e1f0776614380b36038a2baa1b0f54b') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index d31ca0b7c..10833c845 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.7.6-1-LIBRE +KERNEL_VERSION=3.7.7-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' |