From 859a3e3e90a687e99d2d56e74c8ec432c4bd3408 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Fri, 10 Dec 2010 11:03:15 +0100 Subject: [PATCH 1/1] Use 2.6.36.2 kernel at glab --- kernel/build/glab-2.6.36/.config | 35 +++++++++++++--------------- kernel/build/glab-2.6.36/GNUmakefile | 7 ++++-- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/kernel/build/glab-2.6.36/.config b/kernel/build/glab-2.6.36/.config index 7d0068e..494c52a 100644 --- a/kernel/build/glab-2.6.36/.config +++ b/kernel/build/glab-2.6.36/.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.36.1 -# Sat Dec 4 13:19:00 2010 +# Linux kernel version: 2.6.36.2 +# Fri Dec 10 08:52:57 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -69,7 +69,7 @@ CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_LOCALVERSION_AUTO=y CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y @@ -102,8 +102,7 @@ CONFIG_RCU_FANOUT=32 CONFIG_LOG_BUF_SHIFT=15 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y # CONFIG_CGROUPS is not set -CONFIG_SYSFS_DEPRECATED=y -CONFIG_SYSFS_DEPRECATED_V2=y +# CONFIG_SYSFS_DEPRECATED_V2 is not set # CONFIG_RELAY is not set CONFIG_NAMESPACES=y # CONFIG_UTS_NS is not set @@ -154,8 +153,7 @@ CONFIG_SLAB=y # CONFIG_SLUB is not set CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y -CONFIG_OPROFILE=m -# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set +# CONFIG_OPROFILE is not set CONFIG_HAVE_OPROFILE=y # CONFIG_KPROBES is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y @@ -312,7 +310,7 @@ CONFIG_X86_IO_APIC=y # CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set CONFIG_X86_MCE=y CONFIG_X86_MCE_INTEL=y -CONFIG_X86_MCE_AMD=y +# CONFIG_X86_MCE_AMD is not set # CONFIG_X86_ANCIENT_MCE is not set CONFIG_X86_MCE_THRESHOLD=y # CONFIG_X86_MCE_INJECT is not set @@ -792,6 +790,7 @@ CONFIG_NET_PKTGEN=m CONFIG_CAN=m CONFIG_CAN_RAW=m CONFIG_CAN_BCM=m +# CONFIG_CAN_GW is not set # # CAN Device Drivers @@ -1490,8 +1489,8 @@ CONFIG_SLHC=m CONFIG_SLIP_SMART=y CONFIG_SLIP_MODE_SLIP6=y CONFIG_NET_FC=y -CONFIG_NETCONSOLE=m -# CONFIG_NETCONSOLE_DYNAMIC is not set +CONFIG_NETCONSOLE=y +CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETPOLL=y # CONFIG_NETPOLL_TRAP is not set CONFIG_NET_POLL_CONTROLLER=y @@ -2553,7 +2552,7 @@ CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y # CONFIG_HUGETLBFS is not set # CONFIG_HUGETLB_PAGE is not set -CONFIG_CONFIGFS_FS=m +CONFIG_CONFIGFS_FS=y CONFIG_MISC_FILESYSTEMS=y # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set @@ -2673,13 +2672,13 @@ CONFIG_DLM_DEBUG=y # Kernel hacking # CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set +CONFIG_PRINTK_TIME=y CONFIG_ENABLE_WARN_DEPRECATED=y CONFIG_ENABLE_MUST_CHECK=y CONFIG_FRAME_WARN=1024 CONFIG_MAGIC_SYSRQ=y # CONFIG_STRIP_ASM_SYMS is not set -CONFIG_UNUSED_SYMBOLS=y +# CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set CONFIG_DEBUG_KERNEL=y @@ -2691,13 +2690,13 @@ CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1 CONFIG_DETECT_HUNG_TASK=y CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=1 -CONFIG_SCHED_DEBUG=y +# CONFIG_SCHED_DEBUG is not set # CONFIG_SCHEDSTATS is not set -CONFIG_TIMER_STATS=y +# CONFIG_TIMER_STATS is not set # CONFIG_DEBUG_OBJECTS is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_KMEMLEAK is not set -CONFIG_DEBUG_PREEMPT=y +# CONFIG_DEBUG_PREEMPT is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set @@ -2724,8 +2723,7 @@ CONFIG_ARCH_WANT_FRAME_POINTERS=y CONFIG_FRAME_POINTER=y # CONFIG_BOOT_PRINTK_DELAY is not set # CONFIG_RCU_TORTURE_TEST is not set -CONFIG_RCU_CPU_STALL_DETECTOR=y -CONFIG_RCU_CPU_STALL_VERBOSE=y +# CONFIG_RCU_CPU_STALL_DETECTOR is not set # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set @@ -2749,7 +2747,6 @@ CONFIG_RING_BUFFER=y CONFIG_FTRACE_NMI_ENTER=y CONFIG_EVENT_TRACING=y CONFIG_CONTEXT_SWITCH_TRACER=y -CONFIG_RING_BUFFER_ALLOW_SWAP=y CONFIG_TRACING=y CONFIG_GENERIC_TRACER=y CONFIG_TRACING_SUPPORT=y diff --git a/kernel/build/glab-2.6.36/GNUmakefile b/kernel/build/glab-2.6.36/GNUmakefile index 48e0a51..d0c3269 100644 --- a/kernel/build/glab-2.6.36/GNUmakefile +++ b/kernel/build/glab-2.6.36/GNUmakefile @@ -15,11 +15,14 @@ MAKEFLAGS += --no-print-directory all := $(filter-out all Makefile,$(MAKECMDGOALS)) +KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) + + all: $(MAKE) $(MAKEARGS) $(all) ARCH=i386 ifeq ($(all),targz-pkg) - scp linux-2.6.36.1.tar.gz root@glab: - ssh root@glab 'tar -C / -xf linux-2.6.36.1.tar.gz; depmod 2.6.36.1' + scp linux-$(KERNELRELEASE).tar.gz root@glab: + ssh root@glab 'tar -C / -xf linux-$(KERNELRELEASE).tar.gz; depmod $(KERNELRELEASE)' endif -- 2.39.2