libre/kernel26-libre-2.6.39.1-1

4 files changed, 37 insertions, 24 deletions

diff --git a/libre/kernel26-libre/PKGBUILD b/libre/kernel26-libre/PKGBUILD
index 736bb1c9b..621a30245 100644
--- a/libre/kernel26-libre/PKGBUILD
+++ b/libre/kernel26-libre/PKGBUILD
@@ -9,8 +9,7 @@ _basekernel=2.6.39
 pkgver=${_basekernel}.1
 pkgrel=1
 makedepends=('xmlto' 'docbook-xsl')
-#_patchname="patch-${pkgver}-${pkgrel}-LIBRE"
-_patchname="patch-2.6.39-1-LIBRE"
+_patchname="patch-${pkgver}-${pkgrel}-LIBRE"
 arch=(i686 x86_64)
 license=('GPL2')
 url="http://linux-libre.fsfla.org/"
@@ -241,8 +240,8 @@ find $pkgdir -type d -exec chmod 755 {} \;
 rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile
 }
 md5sums=('923210b0c4190733bf314e48f588c112'
-         'abad63eab1f9485f6b1af76f5109f1e4'
-         '5d40a23419b48f5b49f1f10be0e733c3'
-         'af5937ac06a78907ceb499351bdff7ab'
+         '252cbddfd9a8bb97181c087fdd5e2377'
+         'd5c6c675662d98011513f6cbc81d66db'
+         '00e8553b44dac65fc093db60a1cde842'
          '25584700a0a679542929c4bed31433b6'
-         'ba583747f515e51ec0f16d535e4be6e0')
+         'fdfed5e8b46f289617ee6def01978090')
diff --git a/libre/kernel26-libre/config.i686 b/libre/kernel26-libre/config.i686
index 0d9636f62..e31c29f87 100644
--- a/libre/kernel26-libre/config.i686
+++ b/libre/kernel26-libre/config.i686
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux/i386 2.6.39 Kernel Configuration
-# Thu May 19 19:49:50 2011
+# Mon Jun  6 20:12:12 2011
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -1094,7 +1094,8 @@ CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_DCB is not set
 CONFIG_DNS_RESOLVER=y
-# CONFIG_BATMAN_ADV is not set
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_DEBUG is not set
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
@@ -5417,6 +5418,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
 # CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FTRACE_NMI_ENTER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
@@ -5425,7 +5427,9 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACER_MAX_TRACE=y
 CONFIG_RING_BUFFER=y
+CONFIG_FTRACE_NMI_ENTER=y
 CONFIG_EVENT_TRACING=y
 CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
@@ -5434,20 +5438,24 @@ CONFIG_TRACING=y
 CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
 CONFIG_FTRACE=y
-# CONFIG_FUNCTION_TRACER is not set
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_PREEMPT_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
+CONFIG_SCHED_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
 # CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_STACK_TRACER is not set
+CONFIG_STACK_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_FUNCTION_PROFILER=y
+CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_FTRACE_STARTUP_TEST is not set
 CONFIG_MMIOTRACE=y
 # CONFIG_MMIOTRACE_TEST is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
+CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
 # CONFIG_DYNAMIC_DEBUG is not set
@@ -5458,7 +5466,6 @@ CONFIG_ASYNC_RAID6_TEST=m
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 CONFIG_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_KMEMCHECK is not set
 CONFIG_TEST_KSTRTOX=m
 CONFIG_STRICT_DEVMEM=y
 CONFIG_X86_VERBOSE_BOOTUP=y
diff --git a/libre/kernel26-libre/config.x86_64 b/libre/kernel26-libre/config.x86_64
index 5f6e24386..a373f420b 100644
--- a/libre/kernel26-libre/config.x86_64
+++ b/libre/kernel26-libre/config.x86_64
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux/x86_64 2.6.39 Kernel Configuration
-# Thu May 19 21:49:53 2011
+# Mon Jun  6 22:07:19 2011
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -1061,7 +1061,8 @@ CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_DCB is not set
 CONFIG_DNS_RESOLVER=y
-# CONFIG_BATMAN_ADV is not set
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_DEBUG is not set
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
@@ -5161,6 +5162,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
 # CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FTRACE_NMI_ENTER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
@@ -5169,7 +5171,9 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACER_MAX_TRACE=y
 CONFIG_RING_BUFFER=y
+CONFIG_FTRACE_NMI_ENTER=y
 CONFIG_EVENT_TRACING=y
 CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
@@ -5178,20 +5182,24 @@ CONFIG_TRACING=y
 CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
 CONFIG_FTRACE=y
-# CONFIG_FUNCTION_TRACER is not set
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_PREEMPT_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
+CONFIG_SCHED_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
 # CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_STACK_TRACER is not set
+CONFIG_STACK_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_FUNCTION_PROFILER=y
+CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_FTRACE_STARTUP_TEST is not set
 CONFIG_MMIOTRACE=y
 # CONFIG_MMIOTRACE_TEST is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
+CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
 # CONFIG_DYNAMIC_DEBUG is not set
@@ -5202,7 +5210,6 @@ CONFIG_ASYNC_RAID6_TEST=m
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 CONFIG_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_KMEMCHECK is not set
 CONFIG_TEST_KSTRTOX=m
 CONFIG_STRICT_DEVMEM=y
 CONFIG_X86_VERBOSE_BOOTUP=y
diff --git a/libre/kernel26-libre/kernel26.install b/libre/kernel26-libre/kernel26.install
index 0a7bc7772..8c0c80c85 100644
--- a/libre/kernel26-libre/kernel26.install
+++ b/libre/kernel26-libre/kernel26.install
@@ -7,7 +7,7 @@ KERNEL_VERSION=2.6.39-LIBRE
 post_install () {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  depmod $KERNEL_VERSION 
+  /sbin/depmod $KERNEL_VERSION 
   # generate init ramdisks
   echo ">>> MKINITCPIO SETUP"
   echo ">>> ----------------"
@@ -84,7 +84,7 @@ post_upgrade() {
   fi
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  depmod $KERNEL_VERSION
+  /sbin/depmod $KERNEL_VERSION
   echo ">>> MKINITCPIO SETUP"
   echo ">>> ----------------"
   if [ "`vercmp $2 2.6.18`" -lt 0 ]; then