kernel: don't build with CONFIG_SUNRPC_REGISTER_V4, makes nfsd work.
Also disable some trace/debug options, bump revision. --HG-- extra : convert_revision : 93fb52e21352832e1791bf7b685484c068260dfd
This commit is contained in:
parent
8bb195410d
commit
e0d52c9d11
2 changed files with 34 additions and 21 deletions
|
@ -3857,7 +3857,7 @@ CONFIG_NFS_COMMON=y
|
|||
CONFIG_SUNRPC=m
|
||||
CONFIG_SUNRPC_GSS=m
|
||||
CONFIG_SUNRPC_XPRT_RDMA=m
|
||||
CONFIG_SUNRPC_REGISTER_V4=y
|
||||
CONFIG_SUNRPC_REGISTER_V4=n
|
||||
CONFIG_RPCSEC_GSS_KRB5=m
|
||||
CONFIG_RPCSEC_GSS_SPKM3=m
|
||||
CONFIG_SMB_FS=m
|
||||
|
@ -3966,32 +3966,32 @@ CONFIG_DLM=m
|
|||
#
|
||||
# Kernel hacking
|
||||
#
|
||||
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
|
||||
# CONFIG_TRACE_IRQFLAGS_SUPPORT is not set
|
||||
# CONFIG_PRINTK_TIME is not set
|
||||
# CONFIG_ENABLE_WARN_DEPRECATED is not set
|
||||
# CONFIG_ENABLE_MUST_CHECK is not set
|
||||
CONFIG_FRAME_WARN=2048
|
||||
# CONFIG_MAGIC_SYSRQ is not set
|
||||
# CONFIG_UNUSED_SYMBOLS is not set
|
||||
CONFIG_DEBUG_FS=y
|
||||
# CONFIG_DEBUG_FS is not set
|
||||
# CONFIG_HEADERS_CHECK is not set
|
||||
# CONFIG_DEBUG_KERNEL is not set
|
||||
# CONFIG_SLUB_DEBUG_ON is not set
|
||||
# CONFIG_SLUB_STATS is not set
|
||||
CONFIG_DEBUG_BUGVERBOSE=y
|
||||
CONFIG_DEBUG_MEMORY_INIT=y
|
||||
CONFIG_ARCH_WANT_FRAME_POINTERS=y
|
||||
# CONFIG_DEBUG_BUGVERBOSE is not set
|
||||
# CONFIG_DEBUG_MEMORY_INIT is not set
|
||||
# CONFIG_ARCH_WANT_FRAME_POINTER is not set
|
||||
CONFIG_FRAME_POINTER=y
|
||||
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
|
||||
# CONFIG_LATENCYTOP is not set
|
||||
CONFIG_LATENCYTOP=y
|
||||
# CONFIG_SYSCTL_SYSCALL_CHECK is not set
|
||||
CONFIG_USER_STACKTRACE_SUPPORT=y
|
||||
CONFIG_HAVE_FUNCTION_TRACER=y
|
||||
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
|
||||
CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
|
||||
CONFIG_HAVE_DYNAMIC_FTRACE=y
|
||||
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
|
||||
CONFIG_HAVE_HW_BRANCH_TRACER=y
|
||||
# CONFIG_USER_STACKTRACE_SUPPORT is not set
|
||||
# CONFIG_HAVE_FUNCTION_TRACER is not set
|
||||
# CONFIG_HAVE_FUNCTION_GRAPH_TRACER is not set
|
||||
# CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST is not set
|
||||
# CONFIG_HAVE_DYNAMIC_FTRACE is not set
|
||||
# CONFIG_HAVE_FTRACE_MCOUNT_RECORD is not set
|
||||
# CONFIG_HAVE_HW_BRANCH_TRACER is not set
|
||||
|
||||
#
|
||||
# Tracers
|
||||
|
@ -4009,7 +4009,7 @@ CONFIG_EARLY_PRINTK=y
|
|||
# CONFIG_EARLY_PRINTK_DBGP is not set
|
||||
# CONFIG_4KSTACKS is not set
|
||||
CONFIG_DOUBLEFAULT=y
|
||||
CONFIG_HAVE_MMIOTRACE_SUPPORT=y
|
||||
# CONFIG_HAVE_MMIOTRACE_SUPPORT is not set
|
||||
CONFIG_IO_DELAY_TYPE_0X80=0
|
||||
CONFIG_IO_DELAY_TYPE_0XED=1
|
||||
CONFIG_IO_DELAY_TYPE_UDELAY=2
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
# Template file for 'kernel'
|
||||
pkgname=kernel
|
||||
version=2.6.29
|
||||
revision=1
|
||||
# Vanilla kernel + UnionFS patch.
|
||||
#patch_files="unionfs-2.5.1_for_2.6.29-rc2.diff.gz"
|
||||
#patch_args="-p1"
|
||||
|
@ -9,7 +10,7 @@ distfiles="http://www.kernel.org/pub/linux/kernel/v2.6/linux-$version.tar.bz2"
|
|||
build_style=gnu_makefile
|
||||
make_build_target="bzImage modules"
|
||||
make_install_target="modules_install
|
||||
INSTALL_MOD_PATH=$XBPS_DESTDIR/$pkgname-$version"
|
||||
INSTALL_MOD_PATH=${XBPS_DESTDIR}/${pkgname}-${version}"
|
||||
short_desc="The Linux kernel and associated stuff (2.6 branch)"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
checksum=58a5ea16d499fe06f90fcbf1d687d1235d2cb9bc28bf979867bd3faadf38fc3f
|
||||
|
@ -46,19 +47,31 @@ pre_build()
|
|||
else
|
||||
make menuconfig
|
||||
fi
|
||||
if [ -n "${revision}" ]; then
|
||||
sed -i -e "s|LOCALVERSION=\"\"|LOCALVERSION=\"_${revision}\"|" \
|
||||
${wrksrc}/.config
|
||||
fi
|
||||
}
|
||||
|
||||
post_install()
|
||||
{
|
||||
local lver
|
||||
|
||||
install -d ${DESTDIR}/lib ${DESTDIR}/boot
|
||||
cd $wrksrc || exit 1
|
||||
|
||||
install -m 644 arch/x86/boot/bzImage ${DESTDIR}/boot/vmlinuz-$version
|
||||
install -m 644 System.map ${DESTDIR}/boot/System.map-$version
|
||||
install -m 644 .config ${DESTDIR}/boot/config-$version
|
||||
if [ -n "$revision" ]; then
|
||||
lver="${version}_${revision}"
|
||||
else
|
||||
lver="${version}"
|
||||
fi
|
||||
|
||||
cd ${DESTDIR}/lib/modules/${version} && \
|
||||
install -m 644 arch/x86/boot/bzImage ${DESTDIR}/boot/vmlinuz-${lver}
|
||||
install -m 644 System.map ${DESTDIR}/boot/System.map-${lver}
|
||||
install -m 644 .config ${DESTDIR}/boot/config-${lver}
|
||||
|
||||
cd ${DESTDIR}/lib/modules/${lver} && \
|
||||
rm -f source build && \
|
||||
ln -sf ../../../usr/src/kernel-headers-${version} build && \
|
||||
ln -sf ../../../usr/src/kernel-headers-${lver} build && \
|
||||
ln -sf build source
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue