From a1cb74821a3d4ccb708280ad1ed8297c67c4a54b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 15 Mar 2014 22:16:11 +0100 Subject: fix kernel build on Darwin for x86 targets relocs tool uses some kind of regular expression, which does not work with the provided one. Use pcre in this case. Rework KERNEL_MAKE_OPTS while here. Use it in kernel-header, too. --- target/config/Config.in.tools | 5 +++++ target/linux/config/Config.in.audio | 15 ++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) (limited to 'target') diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index c4dcdace4..c2dee7e19 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -38,6 +38,11 @@ config ADK_HOST_NEED_CCACHE boolean default n +config ADK_HOST_NEED_PCRE + boolean + default y if ADK_HOST_DARWIN + default n + config ADK_TOOLS_ADDPATTERN_ARGS string default "-p W54G -v v4.20.6" if ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54G diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index d3a15d602..cc84914d2 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -13,14 +13,14 @@ config ADK_KERNEL_SND_USB config ADK_KERNEL_SND_PXA2XX_AC97 boolean -config ADK_KERNEL_SND_TIMER +config ADK_KPACKAGE_KMOD_SND_TIMER boolean -config ADK_KERNEL_SND_PCM +config ADK_KPACKAGE_KMOD_SND_PCM boolean -config ADK_KERNEL_SND_HWDEP - boolean +config ADK_KPACKAGE_KMOD_SND_HWDEP + tristate config ADK_KPACKAGE_KMOD_SOUND tristate @@ -40,14 +40,15 @@ config ADK_KPACKAGE_KMOD_SND_COMPRESS config ADK_KPACKAGE_KMOD_SND tristate select ADK_KPACKAGE_KMOD_SOUND - select ADK_KERNEL_SND_TIMER - select ADK_KERNEL_SND_PCM - select ADK_KERNEL_SND_HWDEP + select ADK_KPACKAGE_KMOD_SND_PCM + select ADK_KPACKAGE_KMOD_SND_TIMER + select ADK_KPACKAGE_KMOD_SND_HWDEP default n config ADK_KPACKAGE_KMOD_SND_INTEL8X0 prompt "kmod-snd-intel8x0............. Intel AC97 driver" tristate + select ADK_KERNEL_SND_PCI select ADK_KPACKAGE_KMOD_SND_AC97_CODEC select ADK_KPACKAGE_KMOD_SND default y if ADK_TARGET_SYSTEM_IBM_X40 -- cgit v1.2.3