From 6086da2496a70377628e5a09925ed2703224e2a0 Mon Sep 17 00:00:00 2001 From: Cecil Date: Tue, 19 Jul 2011 22:48:51 -0700 Subject: kernel26:Bumped. Added AUFS2.1 patch. --- abs/core/kernel26/PKGBUILD | 23 +++++++++++++++++++++-- abs/core/kernel26/config | 25 +++++++++++++++++++------ 2 files changed, 40 insertions(+), 8 deletions(-) diff --git a/abs/core/kernel26/PKGBUILD b/abs/core/kernel26/PKGBUILD index fd7f05d..310e9ed 100644 --- a/abs/core/kernel26/PKGBUILD +++ b/abs/core/kernel26/PKGBUILD @@ -8,7 +8,7 @@ pkgname=('kernel26' 'kernel26-headers' 'kernel26-docs') # Build stock -ARCH kern _kernelname=${pkgname#kernel26} _basekernel=2.6.39 pkgver=${_basekernel}.3 -pkgrel=3 +pkgrel=4 depends=('module-init-tools>=3.16') makedepends=('xmlto' 'docbook-xsl') _archpatch=1 @@ -20,6 +20,12 @@ _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" +_aufs3="aufs2-standalone-39-20110704.patch" +_aufs4="aufs2.1-standalone.tree-39-20110704.patch.bz2" +_aufs5="aufs2.1-standalone.tree-39-20110704.patch" #_patchname="patch-${pkgver}-1-ARCH" arch=(i686 x86_64) license=('GPL2') @@ -36,6 +42,10 @@ source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2 fix_ck2.patch logo_linux_clut224.ppm lh.patch + {_aufspath}/${_aufs1} + {_aufspath}/${_aufs2} + {_aufspath}/${_aufs3} + {_aufspath}/${_aufs4} # the main kernel config files config config.x86_64 # standard config files for mkinitcpio ramdisk @@ -51,6 +61,11 @@ build() { patch -Np1 -i ${srcdir}/${_fbpatchname} patch -Np1 -i ${srcdir}/${_ckpatchname} patch -Np1 -i ${srcdir}/lh.patch + patch -Np1 -i ${srcdir}/${_aufs1} + patch -Np1 -i ${srcdir}/${_aufs2} + patch -Np1 -i ${srcdir}/${_aufs3} + patch -Np1 -i ${srcdir}/${_aufs5} + # Let's leave these out for now... #patch -Np1 -i ${srcdir}/${_bfqpatch1} #patch -Np1 -i ${srcdir}/${_bfqpatch2} @@ -261,6 +276,10 @@ md5sums=('1aab7a741abe08d42e8eccf20de61e05' '0ab7720f0d80d142a280cfe35b9a8730' '57d5f9aedb2e52ef76bab244cd2645cf' '23f6df0ea11870513c7b6a02d9e6ed07' - '1f2b4ac021459a2ad87e3e30c22b7d22' + '964034dd2716e930b72e59a7231471db' + '351469fd75d3fa848398728360c6ffa4' + '3b4a1df8e1f584446918f76cfca66e9b' + '93d83faea1144a5dbd6df0f42148fb7f' + '77568228f1352d1f1b95700209fb53de' '8be1f60e54eb505b7e67d39fd2233103' '25584700a0a679542929c4bed31433b6') diff --git a/abs/core/kernel26/config b/abs/core/kernel26/config index 853a100..349f527 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-ck2 Kernel Configuration -# Fri Jul 15 06:22:28 2011 +# Linux/i386 2.6.39 Kernel Configuration +# Wed Jul 20 05:42:40 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -519,10 +519,6 @@ CONFIG_APM_DO_ENABLE=y # CPU Frequency scaling # # CONFIG_CPU_FREQ is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_INTEL_IDLE=y @@ -5198,6 +5194,23 @@ CONFIG_UFS_FS=m # CONFIG_UFS_DEBUG is not set CONFIG_EXOFS_FS=m # CONFIG_EXOFS_DEBUG is not set +CONFIG_AUFS_FS=m +CONFIG_AUFS_BRANCH_MAX_127=y +# CONFIG_AUFS_BRANCH_MAX_511 is not set +# CONFIG_AUFS_BRANCH_MAX_1023 is not set +# CONFIG_AUFS_BRANCH_MAX_32767 is not set +CONFIG_AUFS_SBILIST=y +# CONFIG_AUFS_HNOTIFY is not set +# CONFIG_AUFS_EXPORT is not set +# CONFIG_AUFS_RDU is not set +# CONFIG_AUFS_PROC_MAP is not set +# CONFIG_AUFS_SP_IATTR is not set +# CONFIG_AUFS_SHWH is not set +# CONFIG_AUFS_BR_RAMFS is not set +# CONFIG_AUFS_BR_FUSE is not set +CONFIG_AUFS_BR_HFSPLUS=y +CONFIG_AUFS_BDEV_LOOP=y +# CONFIG_AUFS_DEBUG is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m CONFIG_NFS_V3=y -- cgit v0.12