From 9a94bc1a2068fc5ec166d10818b6b2349184f204 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 20 Jun 2009 17:06:27 +0200 Subject: [PATCH] kernel: disable securityfs related support. Bump revision. --HG-- extra : convert_revision : 04d2c3bca9ebfa4eb36d73febc331e04dabdab7c --- templates/kernel/i386-dotconfig | 30 ++++++------------------------ templates/kernel/template | 6 +----- 2 files changed, 7 insertions(+), 29 deletions(-) diff --git a/templates/kernel/i386-dotconfig b/templates/kernel/i386-dotconfig index 919cf77f3e0..fb98b368709 100644 --- a/templates/kernel/i386-dotconfig +++ b/templates/kernel/i386-dotconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.30 -# Fri Jun 19 04:09:50 2009 +# Sat Jun 20 14:07:21 2009 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -607,7 +607,6 @@ CONFIG_IPV6_NDISC_NODETYPE=y CONFIG_IPV6_TUNNEL=m # CONFIG_IPV6_MULTIPLE_TABLES is not set # CONFIG_IPV6_MROUTE is not set -CONFIG_NETLABEL=y CONFIG_NETWORK_SECMARK=y CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set @@ -4122,27 +4121,10 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0 # CONFIG_KEYS=y CONFIG_KEYS_DEBUG_PROC_KEYS=y -CONFIG_SECURITY=y +# CONFIG_SECURITY is not set CONFIG_SECURITYFS=y -CONFIG_SECURITY_NETWORK=y -CONFIG_SECURITY_NETWORK_XFRM=y -CONFIG_SECURITY_PATH=y CONFIG_SECURITY_FILE_CAPABILITIES=y -CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536 -CONFIG_SECURITY_SELINUX=y -CONFIG_SECURITY_SELINUX_BOOTPARAM=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 -CONFIG_SECURITY_SELINUX_DISABLE=y -CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 -# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set -CONFIG_SECURITY_SMACK=y -CONFIG_SECURITY_TOMOYO=y -CONFIG_IMA=y -CONFIG_IMA_MEASURE_PCR_IDX=10 -CONFIG_IMA_AUDIT=y -CONFIG_IMA_LSM_RULES=y +# CONFIG_IMA is not set CONFIG_XOR_BLOCKS=m CONFIG_ASYNC_CORE=m CONFIG_ASYNC_MEMCPY=m @@ -4164,7 +4146,7 @@ CONFIG_CRYPTO_HASH2=y CONFIG_CRYPTO_RNG=m CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_PCOMP=y -CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER=m CONFIG_CRYPTO_MANAGER2=y CONFIG_CRYPTO_GF128MUL=m CONFIG_CRYPTO_NULL=m @@ -4194,7 +4176,7 @@ CONFIG_CRYPTO_XTS=m # # Hash modes # -CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_HMAC=m CONFIG_CRYPTO_XCBC=m # @@ -4209,7 +4191,7 @@ CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD256=m CONFIG_CRYPTO_RMD320=m -CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA1=m CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_TGR192=m diff --git a/templates/kernel/template b/templates/kernel/template index f3babbb8603..3b3b43418c7 100644 --- a/templates/kernel/template +++ b/templates/kernel/template @@ -1,6 +1,7 @@ # Template file for 'kernel' pkgname=kernel version=2.6.30 +revision=1 wrksrc="linux-$version" distfiles="${KERNEL_SITE}/kernel/v2.6/linux-$version.tar.bz2" build_style=gnu_makefile @@ -70,9 +71,4 @@ post_install() rm -f source build && \ ln -sf ../../../usr/src/kernel-headers-${lver} build && \ ln -sf build source - - if [ -n "$revision" ]; then - mkdir -p ${DESTDIR}/lib/firmware/${lver} - mv ${DESTDIR}/lib/firmware/* ${DESTDIR}/lib/firmware/${lver} - fi }