From 5d9d0286b1a9502d021e85b25f7f2637c14bd246 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 26 May 2010 19:28:55 +0200 Subject: [PATCH] kernel: use performance governor by default, add -manpages subpkg. --- srcpkgs/kernel/files/i386-dotconfig | 6 +++--- srcpkgs/kernel/files/x86_64-dotconfig | 8 ++++---- srcpkgs/kernel/template | 12 ++++++++++-- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/srcpkgs/kernel/files/i386-dotconfig b/srcpkgs/kernel/files/i386-dotconfig index 987f5ca3c3e..106e68938fa 100644 --- a/srcpkgs/kernel/files/i386-dotconfig +++ b/srcpkgs/kernel/files/i386-dotconfig @@ -480,15 +480,15 @@ CONFIG_CPU_FREQ_TABLE=y # CONFIG_CPU_FREQ_DEBUG is not set CONFIG_CPU_FREQ_STAT=m # CONFIG_CPU_FREQ_STAT_DETAILS is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=m CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # diff --git a/srcpkgs/kernel/files/x86_64-dotconfig b/srcpkgs/kernel/files/x86_64-dotconfig index 765b8780b28..4918ac34e6b 100644 --- a/srcpkgs/kernel/files/x86_64-dotconfig +++ b/srcpkgs/kernel/files/x86_64-dotconfig @@ -468,15 +468,15 @@ CONFIG_CPU_FREQ_TABLE=m # CONFIG_CPU_FREQ_DEBUG is not set CONFIG_CPU_FREQ_STAT=m # CONFIG_CPU_FREQ_STAT_DETAILS is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_GOV_PERFORMANCE=m +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=m CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # diff --git a/srcpkgs/kernel/template b/srcpkgs/kernel/template index de9eaf93c36..e3d2c5942c2 100644 --- a/srcpkgs/kernel/template +++ b/srcpkgs/kernel/template @@ -4,7 +4,7 @@ # ATTENTION: # kernel-headers revision is set here, not on its template! # -revision=1 +revision=2 #_kernel_headers_revision=1 pkgname=kernel @@ -13,7 +13,7 @@ short_desc="The Linux kernel and associated stuff (2.6 branch)" long_desc=" This package provides the linux kernel image and associated modules." -subpackages="kernel-firmware kernel-headers" +subpackages="kernel-manpages kernel-firmware kernel-headers" triggers="initramfs-tools" nostrip=yes preserve=yes @@ -24,6 +24,8 @@ Add_dependency full module-init-tools Add_dependency run initramfs-tools Add_dependency run kernel-firmware ">=${_kernel_ver}" Add_dependency build perl +Add_dependency build libxslt +Add_dependency build docbook-xsl do_build() { @@ -52,6 +54,7 @@ do_build() ${wrksrc}/.config fi # Build + make ${makejobs} mandocs || return 1 make ${makejobs} prepare || return 1 make ${makejobs} bzImage modules || return 1 } @@ -213,4 +216,9 @@ do_install() ia64 m* p* s* um v850 xtensa; do rm -rf ${hdrdest}/arch/${arch} done + + # Install manual pages. + install -d ${DESTDIR}/usr/share/man/man9 + install -m644 ${wrksrc}/Documentation/DocBook/man/*.9.gz \ + ${DESTDIR}/usr/share/man/man9 }