From 9c123aaf65a69c79605c62fa4d1064def7019bfd Mon Sep 17 00:00:00 2001 From: Cecil Date: Tue, 16 Aug 2011 21:38:33 -0700 Subject: kernel26:Bumped to 2.6.39.4. Removed ck patchset. --- abs/core/kernel26/PKGBUILD | 38 ++++++++++++++++++++------------------ abs/core/kernel26/config | 25 +++++++++---------------- abs/core/kernel26/lh.patch | 23 +++++++++++------------ 3 files changed, 40 insertions(+), 46 deletions(-) diff --git a/abs/core/kernel26/PKGBUILD b/abs/core/kernel26/PKGBUILD index 3340474..1b0efcd 100644 --- a/abs/core/kernel26/PKGBUILD +++ b/abs/core/kernel26/PKGBUILD @@ -5,18 +5,19 @@ pkgname=('kernel26' 'kernel26-headers' 'kernel26-docs') # Build stock -ARCH kern # pkgname=kernel26-custom # Build kernel with a different name _kernelname=${pkgname#kernel26} _basekernel=2.6.39 -pkgver=${_basekernel}.3 -pkgrel=9 +pkgver=${_basekernel}.4 +pkgrel=2 makedepends=('xmlto' 'docbook-xsl') _archpatch=1 -_patchname="patch-${pkgver}-${_archpatch}-ARCH" +_patchname="patch-${_basekernel}-1-ARCH" _fbpatchname="fbcondecor-0.9.6-3.0-rc2.patch" -_ckpatchversion=2 -_ckpatchname="patch-${_basekernel}-ck${_ckpatchversion}" -_bfqpatch1="0001-block-prepare-I-O-context-code-for-BFQ-v2-for-2.6.39.patch" -_bfqpath="http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.39" -_bfqpatch2="0002-block-cgroups-kconfig-build-bits-for-BFQ-v2-2.6.39.patch" -_bfqpatch3="0003-block-introduce-the-BFQ-v2-I-O-sched-for-2.6.39.patch" +_kernelpatch="patch-${pkgver}" +#_ckpatchversion=2 +#_ckpatchname="patch-${_basekernel}-ck${_ckpatchversion}" +#_bfqpatch1="0001-block-prepare-I-O-context-code-for-BFQ-v2-for-2.6.39.patch" +#_bfqpath="http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.39" +#_bfqpatch2="0002-block-cgroups-kconfig-build-bits-for-BFQ-v2-2.6.39.patch" +#_bfqpatch3="0003-block-introduce-the-BFQ-v2-I-O-sched-for-2.6.39.patch" _aufspath="http://chakra-project.org/sources/kernel26/patches/39/aufs2.1/" _aufs1="aufs2-base-39-20110704.patch" _aufs2="aufs2-kbuild-39-20110704.patch" @@ -29,14 +30,15 @@ license=('GPL2') url="http://www.kernel.org" options=(!strip) source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2 + http://www.kernel.org/pub/linux/kernel/v2.6/$_kernelpatch.bz2 ftp://ftp.archlinux.org/other/kernel26/${_patchname}.bz2 http://dev.gentoo.org/~spock/projects/fbcondecor/archive/${_fbpatchname} - http://www.kernel.org/pub/linux/kernel/people/ck/patches/2.6/${_basekernel}/${_basekernel}-ck${_ckpatchversion}/${_ckpatchname}.bz2 + #http://www.kernel.org/pub/linux/kernel/people/ck/patches/2.6/${_basekernel}/${_basekernel}-ck${_ckpatchversion}/${_ckpatchname}.bz2 # Let's leave these out for now... #${_bfqpath}/${_bfqpatch1} #${_bfqpath}/${_bfqpatch2} #${_bfqpath}/${_bfqpatch3} - fix_ck2.patch + #fix_ck2.patch logo_linux_clut224.ppm lh.patch ${_aufspath}/${_aufs1} @@ -49,14 +51,15 @@ source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2 kernel26.preset) build() { - patch -N -i ${srcdir}/fix_ck2.patch + # patch -N -i ${srcdir}/fix_ck2.patch cd ${srcdir}/linux-$_basekernel # Add -ARCH patches # See http://projects.archlinux.org/linux-2.6-ARCH.git/ + patch -Np1 -i ${srcdir}/${_kernelpatch} patch -Np1 -i ${srcdir}/${_patchname} # Add -LinHES patches patch -Np1 -i ${srcdir}/${_fbpatchname} - patch -Np1 -i ${srcdir}/${_ckpatchname} + # patch -Np1 -i ${srcdir}/${_ckpatchname} patch -Np1 -i ${srcdir}/lh.patch patch -Np1 -i ${srcdir}/${_aufs1} patch -Np1 -i ${srcdir}/${_aufs2} @@ -268,16 +271,15 @@ find $pkgdir -type d -exec chmod 755 {} \; rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile } md5sums=('1aab7a741abe08d42e8eccf20de61e05' - 'b23d7def30e57242cfe088f4d8ca8baa' + 'ff5eb7323c054a128d2922bde3297ed5' + '25bb870bed3865d3771b5e40d6dbfd50' '865216ca79342c67dc3aa43c18245694' - 'ffa0384d5a243d17ca47c9bd0e2217e7' - '0ab7720f0d80d142a280cfe35b9a8730' '57d5f9aedb2e52ef76bab244cd2645cf' - '23f6df0ea11870513c7b6a02d9e6ed07' + '577f8e94d2525c7e6933f8a14dcda984' '964034dd2716e930b72e59a7231471db' '351469fd75d3fa848398728360c6ffa4' '3b4a1df8e1f584446918f76cfca66e9b' '93d83faea1144a5dbd6df0f42148fb7f' - 'c4c29a94610354288183ad0ee23e7ec3' + '7b90f6fcd433ddba40337b1e1158b789' '8be1f60e54eb505b7e67d39fd2233103' '25584700a0a679542929c4bed31433b6') diff --git a/abs/core/kernel26/config b/abs/core/kernel26/config index 90e0e1b..da92112 100644 --- a/abs/core/kernel26/config +++ b/abs/core/kernel26/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.39 Kernel Configuration -# Fri Jul 22 06:53:20 2011 +# Linux/i386 2.6.39.4 Kernel Configuration +# Wed Aug 17 01:29:19 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -60,7 +60,6 @@ CONFIG_IRQ_WORK=y # # General setup # -CONFIG_SCHED_BFS=y CONFIG_EXPERIMENTAL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" @@ -125,11 +124,15 @@ CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_DEVICE=y CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y +# CONFIG_CGROUP_CPUACCT is not set CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y # CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set # CONFIG_CGROUP_PERF is not set +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +# CONFIG_RT_GROUP_SCHED is not set CONFIG_BLK_CGROUP=y # CONFIG_DEBUG_BLK_CGROUP is not set CONFIG_NAMESPACES=y @@ -138,6 +141,7 @@ CONFIG_IPC_NS=y CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y +CONFIG_SCHED_AUTOGROUP=y CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y @@ -382,11 +386,6 @@ CONFIG_X86_CPUID=m # CONFIG_NOHIGHMEM is not set CONFIG_HIGHMEM4G=y # CONFIG_HIGHMEM64G is not set -CONFIG_VMSPLIT_3G=y -# CONFIG_VMSPLIT_3G_OPT is not set -# CONFIG_VMSPLIT_2G is not set -# CONFIG_VMSPLIT_2G_OPT is not set -# CONFIG_VMSPLIT_1G is not set CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_HIGHMEM=y # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set @@ -434,16 +433,9 @@ CONFIG_EFI=y CONFIG_SECCOMP=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_HZ_100 is not set -# CONFIG_HZ_250_NODEFAULT is not set +# CONFIG_HZ_250 is not set # CONFIG_HZ_300 is not set CONFIG_HZ_1000=y -# CONFIG_HZ_1500 is not set -# CONFIG_HZ_2000 is not set -# CONFIG_HZ_3000 is not set -# CONFIG_HZ_4000 is not set -# CONFIG_HZ_5000 is not set -# CONFIG_HZ_7500 is not set -# CONFIG_HZ_10000 is not set CONFIG_HZ=1000 CONFIG_SCHED_HRTICK=y CONFIG_KEXEC=y @@ -5427,6 +5419,7 @@ CONFIG_DEBUG_MEMORY_INIT=y CONFIG_ARCH_WANT_FRAME_POINTERS=y CONFIG_FRAME_POINTER=y # CONFIG_BOOT_PRINTK_DELAY is not set +CONFIG_RCU_TORTURE_TEST=m # CONFIG_RCU_CPU_STALL_DETECTOR is not set # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set diff --git a/abs/core/kernel26/lh.patch b/abs/core/kernel26/lh.patch index 025d094..9532b8a 100644 --- a/abs/core/kernel26/lh.patch +++ b/abs/core/kernel26/lh.patch @@ -1,13 +1,12 @@ -diff -Nur linux-2.6.39.orig/Makefile linux-2.6.39/Makefile ---- linux-2.6.39.orig/Makefile 2011-07-15 05:54:11.000000000 +0000 -+++ linux-2.6.39/Makefile 2011-07-15 06:28:23.000000000 +0000 -@@ -10,9 +10,9 @@ - # Comments in this file are targeted only to the developer, do not - # expect to learn how to build the kernel reading this file. +diff -ruaN linux-2.6.39.orig//Makefile linux-2.6.39/Makefile +--- linux-2.6.39.orig//Makefile 2011-08-17 03:55:56.000000000 +0000 ++++ linux-2.6.39/Makefile 2011-08-17 03:57:49.000000000 +0000 +@@ -1,7 +1,7 @@ + VERSION = 2 + PATCHLEVEL = 6 + SUBLEVEL = 39 +-EXTRAVERSION = .4 ++EXTRAVERSION = + NAME = Flesh-Eating Bats with Fangs --CKVERSION = -ck2 --CKNAME = BFS Powered --EXTRAVERSION := $(EXTRAVERSION)$(CKVERSION) -+#CKVERSION = -ck2 -+#CKNAME = BFS Powered -+#EXTRAVERSION := $(EXTRAVERSION)$(CKVERSION) + # *DOCUMENTATION* -- cgit v0.12