diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-07 00:46:34 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-07 00:46:34 -0400 |
commit | 619b8d955269f2fe74386e98fac07675c8b55352 (patch) | |
tree | f3e2610a39c99a7e43bc2b345280b04e398b986a /libre/linux-libre-lts | |
parent | 2b04539ac9310541a4e563460aed0cb7715770d2 (diff) | |
parent | 7d4e98b2d6f2fd4d42ebb55105bab8a05e34ab94 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/linux-libre-lts')
-rw-r--r-- | libre/linux-libre-lts/PKGBUILD | 16 | ||||
-rw-r--r-- | libre/linux-libre-lts/change-default-console-loglevel.patch | 2 | ||||
-rw-r--r-- | libre/linux-libre-lts/config.i686 | 4 | ||||
-rw-r--r-- | libre/linux-libre-lts/config.x86_64 | 4 | ||||
-rw-r--r-- | libre/linux-libre-lts/linux-libre-lts.install | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 2b0f22b42..3d56fdaa6 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 130991 2011-07-09 12:23:51Z thomas $ +# $Id: PKGBUILD 180979 2013-03-29 10:54:31Z andyrtr $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -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=58 +_sublevel=71 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.57 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.70 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,19 +32,19 @@ 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' - 'b26d37a0fa9cf5024810996f3117361c' - 'a5d98603d79d3ab7f979af49b2970f26' - '0ed396b368d8cdf8845f7ef2f62fc93c' + 'a2ae6b2117cd99fef375764947302435' + '99f9c408b64393aceb2482c9a3e329ee' + 'fba95bf1857ce6bf863e13a1ab73f584' 'c072b17032e80debc6a8626299245d46' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' - '9d3c56a4b999c8bfbd4018089a62f662' + 'f3def2cefdcbb954c21d8505d23cc83c' '263725f20c0b9eb9c353040792d644e5' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '21f93138b6d4410b095cc9998f89e47d') + '864cfb1ffa4023f9794d5c0270ca4aa5') 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/change-default-console-loglevel.patch b/libre/linux-libre-lts/change-default-console-loglevel.patch index 63435d84f..2685d4d23 100644 --- a/libre/linux-libre-lts/change-default-console-loglevel.patch +++ b/libre/linux-libre-lts/change-default-console-loglevel.patch @@ -6,7 +6,7 @@ diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c /* We show everything that is MORE important than this.. */ #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ -#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */ -+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */ ++#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_WARNING */ DECLARE_WAIT_QUEUE_HEAD(log_wait); diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index bb9308500..f903b2114 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -469,7 +469,7 @@ CONFIG_PM_DEBUG=y CONFIG_PM_ADVANCED_DEBUG=y # CONFIG_PM_TEST_SUSPEND is not set CONFIG_CAN_PM_TRACE=y -# CONFIG_PM_TRACE_RTC is not set +CONFIG_PM_TRACE_RTC=y CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y CONFIG_ACPI_PROCFS=y @@ -4920,7 +4920,7 @@ CONFIG_CLKSRC_I8253=y CONFIG_EDD=m # CONFIG_EDD_OFF is not set CONFIG_FIRMWARE_MEMMAP=y -CONFIG_EFI_VARS=m +CONFIG_EFI_VARS=y CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64 index 5c1e98f9c..c369e1b5b 100644 --- a/libre/linux-libre-lts/config.x86_64 +++ b/libre/linux-libre-lts/config.x86_64 @@ -457,7 +457,7 @@ CONFIG_PM_DEBUG=y CONFIG_PM_ADVANCED_DEBUG=y # CONFIG_PM_TEST_SUSPEND is not set CONFIG_CAN_PM_TRACE=y -# CONFIG_PM_TRACE_RTC is not set +CONFIG_PM_TRACE_RTC=y CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y CONFIG_ACPI_PROCFS=y @@ -4678,7 +4678,7 @@ CONFIG_INTEL_OAKTRAIL=m CONFIG_EDD=m # CONFIG_EDD_OFF is not set CONFIG_FIRMWARE_MEMMAP=y -CONFIG_EFI_VARS=m +CONFIG_EFI_VARS=y CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 7af5d70e7..4dbbe33d3 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.58-1-LIBRE-LTS +KERNEL_VERSION=3.0.71-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' |