domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

toolchain/kernel-headers: simplify linux headers installation (remove legacy hacks, cleanup)

Browse Source 
SVN-Revision: 21567
This commit is contained in:
Nicolas Thill
2010-05-24 20:38:36 +00:00
parent 46e2eea1ef
commit 7ca97b03d9
1 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
toolchain/kernel-headers/Makefile
View File

@@ -35,36 +35,29 @@ ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.18)),1)
LINUX_HAS_HEADERS_INSTALL:=y LINUX_HAS_HEADERS_INSTALL:=y
endif endif
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.33)),1)
LINUX_ASM_INCLUDES:=arch/$(LINUX_KARCH)/include/asm
else
LINUX_ASM_INCLUDES:=include/asm
endif
KMAKE := $(MAKE) -C $(HOST_BUILD_DIR) \ KMAKE := $(MAKE) -C $(HOST_BUILD_DIR) \
ARCH=$(LINUX_KARCH) \ ARCH=$(LINUX_KARCH) \
CC="$(KERNEL_CC)" \
CFLAGS="$(TARGET_CFLAGS)" \
CROSS_COMPILE=$(TARGET_CROSS) \
KBUILD_HAVE_NLS=no \ KBUILD_HAVE_NLS=no \
CONFIG_SHELL=$(BASH) CONFIG_SHELL=$(BASH)
define Host/Prepare/pre/powerpc
if [ -d $(HOST_BUILD_DIR)/include/asm-ppc ]; then \
mkdir -p $(PKG_BUILD_DIR)/include/asm-powerpc/; \
$(CP) $(HOST_BUILD_DIR)/include/asm-ppc/* $(HOST_BUILD_DIR)/include/asm-powerpc/; \
rm -rf $(HOST_BUILD_DIR)/include/asm-ppc; \
ln -s $(HOST_BUILD_DIR)/include/asm-powerpc $(HOST_BUILD_DIR)/include/asm-ppc; \
fi
endef
ifneq ($(LINUX_HAS_HEADERS_INSTALL),) ifneq ($(LINUX_HAS_HEADERS_INSTALL),)
define Host/Prepare/all define Host/Prepare/all
mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr
$(KMAKE) \ $(KMAKE) \
CROSS_COMPILE=$(TARGET_CROSS) \
INSTALL_HDR_PATH="$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/" \ INSTALL_HDR_PATH="$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/" \
headers_install headers_install
if [ -d $(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm ]; then \
$(CP) \
$(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm/. \
$(HOST_BUILD_DIR)/include/asm-$(LINUX_KARCH)/; \
fi
endef endef
else else
define Host/Prepare/all define Host/Prepare/all
$(KMAKE) include/linux/version.h include/asm
mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include
cp -pLR $(HOST_BUILD_DIR)/include/asm $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/ cp -pLR $(HOST_BUILD_DIR)/include/asm $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/
cp -pLR $(HOST_BUILD_DIR)/include/asm-generic $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/ cp -pLR $(HOST_BUILD_DIR)/include/asm-generic $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/
@@ -84,7 +77,6 @@ endef
define Host/Prepare/post/cris define Host/Prepare/post/cris
$(CP) \ $(CP) \
$(HOST_BUILD_DIR)/include/linux/user.h \ $(HOST_BUILD_DIR)/include/linux/user.h \
$(HOST_BUILD_DIR)/include/linux/autoconf.h \
$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/linux/ $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/linux/
ln -snf $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/arch-v10/arch \ ln -snf $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/arch-v10/arch \
$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/arch $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/arch
@@ -113,13 +105,6 @@ define Host/Prepare
ln -sf linux-$(LINUX_VERSION) $(BUILD_DIR_TOOLCHAIN)/linux ln -sf linux-$(LINUX_VERSION) $(BUILD_DIR_TOOLCHAIN)/linux
$(SED) 's/@expr length/@-expr length/' $(HOST_BUILD_DIR)/Makefile $(SED) 's/@expr length/@-expr length/' $(HOST_BUILD_DIR)/Makefile
yes '' | $(KMAKE) oldconfig yes '' | $(KMAKE) oldconfig
$(KMAKE) include/linux/version.h $(LINUX_ASM_INCLUDES)
if [ -d $(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm ]; then \
$(CP) \
$(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm/. \
$(HOST_BUILD_DIR)/include/asm-$(LINUX_KARCH)/; \
fi
$(call Host/Prepare/pre/$(ARCH))
$(call Host/Prepare/all) $(call Host/Prepare/all)
$(call Host/Prepare/post/$(ARCH)) $(call Host/Prepare/post/$(ARCH))
endef endef