summaryrefslogtreecommitdiff
path: root/libre/linux-libre
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-07-23 18:13:37 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-07-23 18:13:37 +0200
commitcc565b7309a5708f2375b5f6926d173fd122119d (patch)
treec1d4adcda7f0b767537620aea02633158e17218a /libre/linux-libre
parentc25ed1401d3fa3dd6827c33bc11b660dcd425f23 (diff)
parenta65eb6fe2ea0ffa22c65de34506c88aeeb3c88ee (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community-testing/electricsheep/PKGBUILD community/bitcoin/PKGBUILD community/gnash/PKGBUILD community/mongodb/PKGBUILD community/xmlrpc-c/PKGBUILD community/xmoto/PKGBUILD core/kbd/PKGBUILD extra/elfutils/PKGBUILD extra/gtk2/PKGBUILD extra/hddtemp/PKGBUILD extra/libpst/PKGBUILD extra/mkvtoolnix/PKGBUILD extra/php-apc/PKGBUILD extra/pulseaudio/PKGBUILD extra/pyqt/PKGBUILD extra/quota-tools/PKGBUILD extra/rhythmbox/PKGBUILD extra/virtuoso/PKGBUILD extra/vlc/PKGBUILD extra/xf86-video-siliconmotion/PKGBUILD kde-unstable/soprano/PKGBUILD libre/epdfview-libre/PKGBUILD libre/pacman/PKGBUILD multilib/lib32-libpulse/PKGBUILD multilib/wine/PKGBUILD multilib/zsnes/PKGBUILD testing/bash/PKGBUILD testing/bison/PKGBUILD testing/dbus-core/PKGBUILD testing/dbus/PKGBUILD testing/readline/PKGBUILD testing/systemd/PKGBUILD
Diffstat (limited to 'libre/linux-libre')
-rw-r--r--libre/linux-libre/PKGBUILD8
-rw-r--r--libre/linux-libre/linux-libre.install2
2 files changed, 5 insertions, 5 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 5ad9a3772..df33e5f8c 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -12,9 +12,9 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -
# pkgname=linux-custom # Build kernel with a different name
_kernelname=-LIBRE
_basekernel=3.4
-_sublevel=5
+_sublevel=6
pkgver=${_basekernel}.${_sublevel}
-_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
@@ -35,7 +35,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'3.4.4-fix-backlight-regression.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
- '0882e254b12df2c8d73df29de85223a7'
+ 'fe16da96e942fcfc195fc53ff93e3864'
'669c3f9d5c6a2109bad8e511287826c3'
'454231e14419e56a5281eb7bc6fde83e'
'e49ac236dfeef709f91a3d993ea7b62c'
@@ -45,7 +45,7 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
'9d3c56a4b999c8bfbd4018089a62f662'
'263725f20c0b9eb9c353040792d644e5'
'80a46681386bb87813989faeb92bdd9a'
- '86910efeadb5d1e5d5416ff1a9dacb33')
+ 'a9338d11a2b23fe0cd43cc4fee5aed42')
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 7d7e7a1db..38394ad7b 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.4.5-1-LIBRE
+KERNEL_VERSION=3.4.6-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'