diff options
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Config.in | 11 | ||||
| -rw-r--r-- | linux/Config.tools.in | 6 | ||||
| -rw-r--r-- | linux/linux-tool-cpupower.mk | 4 |
3 files changed, 14 insertions, 7 deletions
diff --git a/linux/Config.in b/linux/Config.in index ebcafcc0ee..43d63c0cd0 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -18,16 +18,15 @@ config BR2_LINUX_NEEDS_MODULES # Version selection. We provide the choice between: # # 1. A single fairly recent stable kernel version -# 2. In case an internal toolchain has been built, the same kernel -# version as the kernel headers -# 3. A custom stable version -# 4. A custom tarball +# 2. A custom stable version +# 3. A custom tarball +# 4. A set of custom repository locations # choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.7)" + bool "Latest version (4.7.2)" config BR2_LINUX_KERNEL_CUSTOM_VERSION bool "Custom version" @@ -98,7 +97,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.7" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.7.2" if BR2_LINUX_KERNEL_LATEST_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL diff --git a/linux/Config.tools.in b/linux/Config.tools.in index 09bcfabf15..5ada98d9e8 100644 --- a/linux/Config.tools.in +++ b/linux/Config.tools.in @@ -3,11 +3,17 @@ menu "Linux Kernel Tools" config BR2_LINUX_KERNEL_TOOL_CPUPOWER bool "cpupower" depends on !BR2_bfin # pciutils + depends on BR2_USE_WCHAR || !BR2_NEEDS_GETTEXT # gettext select BR2_PACKAGE_PCIUTILS + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT help cpupower is a collection of tools to examine and tune power saving related features of your processor. +comment "cpupower needs a toolchain w/ wchar" + depends on !BR2_bfin + depends on !BR2_USE_WCHAR && BR2_NEEDS_GETTEXT + config BR2_LINUX_KERNEL_TOOL_PERF bool "perf" help diff --git a/linux/linux-tool-cpupower.mk b/linux/linux-tool-cpupower.mk index 4551cda1f1..095a5efad1 100644 --- a/linux/linux-tool-cpupower.mk +++ b/linux/linux-tool-cpupower.mk @@ -6,10 +6,12 @@ LINUX_TOOLS += cpupower -CPUPOWER_DEPENDENCIES = pciutils +CPUPOWER_DEPENDENCIES = pciutils $(if $(BR2_NEEDS_GETTEXT),gettext) CPUPOWER_MAKE_OPTS = CROSS=$(TARGET_CROSS) \ CPUFREQ_BENCH=false \ + NLS=false \ + $(if $(BR2_NEEDS_GETTEXT),LDFLAGS=-lintl) \ DEBUG=false define CPUPOWER_BUILD_CMDS |
