diff options
-rw-r--r-- | libre/linux-libre/linux-libre/ChangeLog (renamed from libre-testing/linux-libre/ChangeLog) | 0 | ||||
-rw-r--r-- | libre/linux-libre/linux-libre/Kbuild (renamed from libre-testing/linux-libre/Kbuild) | 0 | ||||
-rw-r--r-- | libre/linux-libre/linux-libre/Kbuild.platforms (renamed from libre-testing/linux-libre/Kbuild.platforms) | 0 | ||||
-rw-r--r-- | libre/linux-libre/linux-libre/PKGBUILD (renamed from libre-testing/linux-libre/PKGBUILD) | 37 | ||||
-rw-r--r-- | libre/linux-libre/linux-libre/boot-logo.patch (renamed from libre-testing/linux-libre/boot-logo.patch) | 0 | ||||
-rw-r--r-- | libre/linux-libre/linux-libre/change-default-console-loglevel.patch (renamed from libre-testing/linux-libre/change-default-console-loglevel.patch) | 0 | ||||
-rw-r--r-- | libre/linux-libre/linux-libre/config.i686 (renamed from libre-testing/linux-libre/config.i686) | 2 | ||||
-rw-r--r-- | libre/linux-libre/linux-libre/config.x86_64 (renamed from libre-testing/linux-libre/config.x86_64) | 2 | ||||
-rw-r--r-- | libre/linux-libre/linux-libre/linux-libre.install (renamed from libre-testing/linux-libre/linux-libre.install) | 2 | ||||
-rw-r--r-- | libre/linux-libre/linux-libre/linux-libre.preset (renamed from libre-testing/linux-libre/linux-libre.preset) | 0 |
10 files changed, 21 insertions, 22 deletions
diff --git a/libre-testing/linux-libre/ChangeLog b/libre/linux-libre/linux-libre/ChangeLog index 12f517b4f..12f517b4f 100644 --- a/libre-testing/linux-libre/ChangeLog +++ b/libre/linux-libre/linux-libre/ChangeLog diff --git a/libre-testing/linux-libre/Kbuild b/libre/linux-libre/linux-libre/Kbuild index 8a9d7dceb..8a9d7dceb 100644 --- a/libre-testing/linux-libre/Kbuild +++ b/libre/linux-libre/linux-libre/Kbuild diff --git a/libre-testing/linux-libre/Kbuild.platforms b/libre/linux-libre/linux-libre/Kbuild.platforms index 90a226888..90a226888 100644 --- a/libre-testing/linux-libre/Kbuild.platforms +++ b/libre/linux-libre/linux-libre/Kbuild.platforms diff --git a/libre-testing/linux-libre/PKGBUILD b/libre/linux-libre/linux-libre/PKGBUILD index 20a2c797f..596cbbf4a 100644 --- a/libre-testing/linux-libre/PKGBUILD +++ b/libre/linux-libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183980 2013-04-30 07:21:06Z tpowa $ +# $Id: PKGBUILD 184768 2013-05-08 09:45:41Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> @@ -10,18 +10,17 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.9 -#_sublevel=10 -#pkgver=${_basekernel}.${_sublevel} -pkgver=${_basekernel} -pkgrel=2 -#_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver +_sublevel=1 +pkgver=${_basekernel}.${_sublevel} +pkgrel=1 +_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') options=('!strip') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" - #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" # the main kernel config files 'config.i686' 'config.x86_64' # standard config files for mkinitcpio ramdisk @@ -29,23 +28,23 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'Kbuild' 'Kbuild.platforms' 'boot-logo.patch' - 'change-default-console-loglevel.patch') - #"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") + 'change-default-console-loglevel.patch' + "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('120df29f88622dabf7015a22c7cc8e25' - #'fd9713a31ee671a9dec8ad0e65996c84' - '800a05fd0073ffefe4ac90f0e7f3b195' - '05f671feaa31746483e57b9893dd30fb' + '72f23e5909202cf5124a2a3bedec3852' + '9684934c48eb2c7bb7179b7e5b2c245f' + 'd9ff747f6c2bd3a6e4a94a2abc4af9ca' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' - 'f3def2cefdcbb954c21d8505d23cc83c') - #'259774469ac9b2b1f41cf2f978743055') -#if [ "$CARCH" != "mips64el" ]; then -# # Don't use the Loongson-specific patches on non-mips64el arches. -# unset source[${#source[@]}-1] -# unset md5sums[${#md5sums[@]}-1] -#fi + 'f3def2cefdcbb954c21d8505d23cc83c' + 'e7efe89395507569550103e0504232f8') +if [ "$CARCH" != "mips64el" ]; then + # Don't use the Loongson-specific patches on non-mips64el arches. + unset source[${#source[@]}-1] + unset md5sums[${#md5sums[@]}-1] +fi _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE diff --git a/libre-testing/linux-libre/boot-logo.patch b/libre/linux-libre/linux-libre/boot-logo.patch index c392928a5..c392928a5 100644 --- a/libre-testing/linux-libre/boot-logo.patch +++ b/libre/linux-libre/linux-libre/boot-logo.patch diff --git a/libre-testing/linux-libre/change-default-console-loglevel.patch b/libre/linux-libre/linux-libre/change-default-console-loglevel.patch index 2685d4d23..2685d4d23 100644 --- a/libre-testing/linux-libre/change-default-console-loglevel.patch +++ b/libre/linux-libre/linux-libre/change-default-console-loglevel.patch diff --git a/libre-testing/linux-libre/config.i686 b/libre/linux-libre/linux-libre/config.i686 index cf5adcd74..ed48ff54b 100644 --- a/libre-testing/linux-libre/config.i686 +++ b/libre/linux-libre/linux-libre/config.i686 @@ -5716,7 +5716,7 @@ CONFIG_NFS_V2=m CONFIG_NFS_V3=m CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=m -# CONFIG_NFS_SWAP is not set +CONFIG_NFS_SWAP=y CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_PNFS_BLOCK=m diff --git a/libre-testing/linux-libre/config.x86_64 b/libre/linux-libre/linux-libre/config.x86_64 index 2e7cd8ec0..faee36762 100644 --- a/libre-testing/linux-libre/config.x86_64 +++ b/libre/linux-libre/linux-libre/config.x86_64 @@ -5505,7 +5505,7 @@ CONFIG_NFS_V2=m CONFIG_NFS_V3=m CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=m -# CONFIG_NFS_SWAP is not set +CONFIG_NFS_SWAP=y CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_PNFS_BLOCK=m diff --git a/libre-testing/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre/linux-libre.install index 2cde0a227..cef317042 100644 --- a/libre-testing/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.9.0-2-LIBRE +KERNEL_VERSION=3.9.1-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' diff --git a/libre-testing/linux-libre/linux-libre.preset b/libre/linux-libre/linux-libre/linux-libre.preset index 0ac59eb14..0ac59eb14 100644 --- a/libre-testing/linux-libre/linux-libre.preset +++ b/libre/linux-libre/linux-libre/linux-libre.preset |