diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-09-03 16:10:12 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-09-03 16:10:12 -0300 |
| commit | 037bcb846a6662420bd0f5d1edaad58bda4c86a7 (patch) | |
| tree | 82494884d013c7b2cc9cd5df16c54cae0712d472 /libre/linux-libre | |
| parent | 830afd54d0d990fdb982292bed4c97f577dc195d (diff) | |
| parent | 3aa73e2018f321c9ccff8eca801b1c2fa9f18fa8 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/darkhttpd/PKGBUILD
community/gnome-panel/PKGBUILD
community/gpicview/PKGBUILD
community/iftop/PKGBUILD
community/lazarus/PKGBUILD
community/netsurf/PKGBUILD
community/polkit-gnome/PKGBUILD
community/texvc/PKGBUILD
community/unbound/PKGBUILD
community/xfmedia/PKGBUILD
core/glibc/PKGBUILD
extra/arora/PKGBUILD
extra/cairo/PKGBUILD
extra/graphviz/PKGBUILD
extra/libmng/PKGBUILD
extra/mesa/PKGBUILD
extra/nx/PKGBUILD
extra/qt4/PKGBUILD
extra/qt5/PKGBUILD
extra/sqlite/PKGBUILD
libre/midori-libre/PKGBUILD
~fauno/distccd-zeroconf/PKGBUILD
~fauno/kyotocabinet/PKGBUILD
~fauno/kyototycoon/PKGBUILD
Diffstat (limited to 'libre/linux-libre')
| -rw-r--r-- | libre/linux-libre/PKGBUILD | 10 | ||||
| -rw-r--r-- | libre/linux-libre/config.i686.3.11 | 4 | ||||
| -rw-r--r-- | libre/linux-libre/config.x86_64.3.11 | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 7746b91a1..24c52e954 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193503 2013-08-21 12:43:35Z tpowa $ +# $Id: PKGBUILD 193761 2013-08-30 11:11:43Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -_sublevel=9 +_sublevel=10 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.10 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -33,7 +33,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '3.10.6-logitech-dj.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '312e4b4203d2e74201a14f1a9633482d' + '673ae6d60b4ce8acad930a06f9fe2e3f' '8ec987449e0e42a1c98d8ce92b9019c2' '8efbd1f17f37bdaa8649c8a63761bf07' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -43,7 +43,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' 'f3def2cefdcbb954c21d8505d23cc83c' 'd50c1ac47394e9aec637002ef3392bd1' '3ff40ca684cfe719723e627e2cef7cea' - 'd2fb29339d9ec7978af71f80daa27a12') + '714134bcb52e243898036beacca2e7b7') 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/config.i686.3.11 b/libre/linux-libre/config.i686.3.11 index 2e3c074e7..d8b8f5121 100644 --- a/libre/linux-libre/config.i686.3.11 +++ b/libre/linux-libre/config.i686.3.11 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.11.0-rc5 Kernel Configuration +# Linux/x86 3.11.0-rc7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2504,7 +2504,7 @@ CONFIG_WIL6210_ISR_COR=y CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m # CONFIG_ATH10K_DEBUG is not set -CONFIG_ATH10K_DEBUGFS=y +CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH10K_TRACING is not set CONFIG_B43=m CONFIG_B43_BCMA=y diff --git a/libre/linux-libre/config.x86_64.3.11 b/libre/linux-libre/config.x86_64.3.11 index 3feff6b10..f64f29253 100644 --- a/libre/linux-libre/config.x86_64.3.11 +++ b/libre/linux-libre/config.x86_64.3.11 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.11.0-rc5 Kernel Configuration +# Linux/x86 3.11.0-rc7 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -2419,7 +2419,7 @@ CONFIG_WIL6210_ISR_COR=y CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m # CONFIG_ATH10K_DEBUG is not set -CONFIG_ATH10K_DEBUGFS=y +CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH10K_TRACING is not set CONFIG_B43=m CONFIG_B43_BCMA=y |