diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2006-11-23 09:11:20 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2006-11-23 09:11:20 +0000 |
| commit | b8d16c3e50907f1c7c5a0940d710f17d351d1a6b (patch) | |
| tree | 272a2d08db9ff7b226209670aac28ad66749edde | |
| parent | fb30e2a5d7bc5e9bccde5c41fa4298c7234c63de (diff) | |
| download | OSELAS.Toolchain-b8d16c3e50907f1c7c5a0940d710f17d351d1a6b.tar.gz OSELAS.Toolchain-b8d16c3e50907f1c7c5a0940d710f17d351d1a6b.tar.xz | |
* rules/kernel-headers.in, rules/kernel-headers.make:
added sanitaeter header option
git-svn-id: https://svn.pengutronix.de/svn/oselas/toolchain/trunks/OSELAS.Toolchain-trunk@1312 f8d472c7-5700-0410-ac5a-87979cec3adf
| -rw-r--r-- | rules/kernel-headers.in | 14 | ||||
| -rw-r--r-- | rules/kernel-headers.make | 17 |
2 files changed, 14 insertions, 17 deletions
diff --git a/rules/kernel-headers.in b/rules/kernel-headers.in index ed1c949..bba7827 100644 --- a/rules/kernel-headers.in +++ b/rules/kernel-headers.in @@ -12,13 +12,13 @@ config KERNEL_HEADERS_VERSION help Specify the kernel version here. -#config KERNEL_HEADERS_SANIZIZED -# depends on KERNEL_HEADERS -# bool -# prompt "use sanitized headers" -# help -# If selected we use the sanitized kernel headers instead of the -# original kernel headers. +config KERNEL_HEADERS_SANIZIZED + depends on KERNEL_HEADERS + bool + prompt "use sanitized headers" + help + If selected we use the sanitized kernel headers instead of the + original kernel headers. config KERNEL_HEADERS_CONFIG depends on KERNEL_HEADERS diff --git a/rules/kernel-headers.make b/rules/kernel-headers.make index ff39802..156df32 100644 --- a/rules/kernel-headers.make +++ b/rules/kernel-headers.make @@ -59,6 +59,7 @@ kernel-headers_prepare: $(STATEDIR)/kernel-headers.prepare KERNEL_HEADERS_PATH := PATH=$(HOST_PATH) KERNEL_HEADERS_ENV := $(HOST_ENV) +KERNEL_HEADERS_MAKEVARS := ARCH=$(PTXCONF_ARCH) $(STATEDIR)/kernel-headers.prepare: $(kernel-headers_prepare_deps_default) @$(call targetinfo, $@) @@ -74,11 +75,8 @@ kernel-headers_compile: $(STATEDIR)/kernel-headers.compile $(STATEDIR)/kernel-headers.compile: $(kernel-headers_compile_deps_default) @$(call targetinfo, $@) - $(MAKE) -C $(KERNEL_HEADERS_DIR) ARCH=$(PTXCONF_ARCH) oldconfig - $(MAKE) -C $(KERNEL_HEADERS_DIR) ARCH=$(PTXCONF_ARCH) include/asm include/linux/version.h -ifdef PTXCONF_ARCH_ARM - $(MAKE) -C $(KERNEL_HEADERS_DIR) ARCH=$(PTXCONF_ARCH) include/asm-$(PTXCONF_ARCH)/.arch -endif + yes "" | $(MAKE) -C $(KERNEL_HEADERS_DIR) $(KERNEL_HEADERS_MAKEVARS) oldconfig + $(MAKE) -C $(KERNEL_HEADERS_DIR) $(KERNEL_HEADERS_MAKEVARS) archprepare @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -90,15 +88,14 @@ kernel-headers_install: $(STATEDIR)/kernel-headers.install $(STATEDIR)/kernel-headers.install: $(kernel-headers_install_deps_default) @$(call targetinfo, $@) - rm -fr $(SYSROOT)/usr/include/asm - rm -fr $(SYSROOT)/usr/include/linux - rm -fr $(SYSROOT)/usr/include/asm-generic - +ifdef PTXCONF_KERNEL_HEADERS_SANIZIZED + $(MAKE) -C $(KERNEL_HEADERS_DIR) $(KERNEL_HEADERS_MAKEVARS) headers_install INSTALL_HDR_PATH=$(SYSROOT)/usr +else mkdir -p $(SYSROOT)/usr/include - cp -r $(KERNEL_HEADERS_DIR)/include/linux $(SYSROOT)/usr/include cp -r $(KERNEL_HEADERS_DIR)/include/asm-$(PTXCONF_ARCH) $(SYSROOT)/usr/include/asm cp -r $(KERNEL_HEADERS_DIR)/include/asm-generic $(SYSROOT)/usr/include/asm-generic +endif @$(call touch, $@) |