summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-10-21 11:13:53 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-10-21 11:13:53 -0300
commit0fc81a2f2d55fa67c0c719ec87371f0cce0dc344 (patch)
treef615e5bac43a9f0977a687dffc56a866624fddf3 /libre
parent65d9286f54bc65d71cf50737006c9d4c08512070 (diff)
parent1b21445a8e9097b0bb0542ed847fbb1eb832848f (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/haskell-hslogger/PKGBUILD
Diffstat (limited to 'libre')
-rw-r--r--libre/linux-libre/PKGBUILD19
-rw-r--r--libre/linux-libre/config.i6868
-rw-r--r--libre/linux-libre/config.x86_6412
3 files changed, 15 insertions, 24 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index e5f40701e..f77102426 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -
# pkgname=linux-custom # Build kernel with a different name
_kernelname=${pkgname#linux-libre}
_basekernel=3.0
-pkgver=${_basekernel}.6
+pkgver=${_basekernel}.7
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
@@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li
build() {
cd "${srcdir}/linux-${_basekernel}"
- patch -Np0 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre"
+ patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre"
# Add freedo as boot logo
patch -Np1 -i "${srcdir}/boot-logo.patch"
@@ -327,19 +327,10 @@ package_linux-libre-docs() {
# remove a file already in linux package
rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
}
-
-md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
- '8dc6d7d1a0728af0a59d5ba7197c390b'
- 'bb679e0e61c53a8f1a22b8d46f89f47e'
- '68d2fc73ce1d9057678f91235f6e22c6'
- 'a8a3843046926eb7ab81312cd438c5c5'
- '04b21c79df0a952c22d681dd4f4562df'
- '263725f20c0b9eb9c353040792d644e5'
- '9d3c56a4b999c8bfbd4018089a62f662')
md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
- '8dc6d7d1a0728af0a59d5ba7197c390b'
- 'f50e2627816daaae346394512fa3bda5'
- 'b24eadd33ae95e3c9e14d84e39109976'
+ '8840c46301f6eb425b9ab456d1ca7b7f'
+ '8089b63fdecf93735f178eb2907ce61e'
+ '4cc90e12cab492c1d61183c47683bd52'
'a8a3843046926eb7ab81312cd438c5c5'
'04b21c79df0a952c22d681dd4f4562df'
'263725f20c0b9eb9c353040792d644e5'
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 6f572b0d2..4cc6d10cc 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 3.0.0 Kernel Configuration
+# Linux/i386 3.0 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -514,14 +514,14 @@ CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_TABLE=y
CONFIG_CPU_FREQ_STAT=m
CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=m
CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
#
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 37e2475d3..de4d3a424 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 3.0.0 Kernel Configuration
+# Linux/x86_64 3.0 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -69,7 +69,7 @@ CONFIG_HAVE_KERNEL_BZIP2=y
CONFIG_HAVE_KERNEL_LZMA=y
CONFIG_HAVE_KERNEL_XZ=y
CONFIG_HAVE_KERNEL_LZO=y
- CONFIG_KERNEL_GZIP=y
+CONFIG_KERNEL_GZIP=y
# CONFIG_KERNEL_BZIP2 is not set
# CONFIG_KERNEL_LZMA is not set
# CONFIG_KERNEL_XZ is not set
@@ -497,14 +497,14 @@ CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_TABLE=m
CONFIG_CPU_FREQ_STAT=m
CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=m
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=m
CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
#