Changeset 150

Timestamp:

01/16/11 14:28:41 (2 years ago)

Author:

amain

Message:

debwrt-kernel-headers: instead of doing a find for include files, lets make headers_install do that job..probably more correctly. However, we might now miss some OpenWrt added headers.

File:

• debwrt/trunk/openwrt/openwrt-deliver.mk (modified) (1 diff)

debwrt/trunk/openwrt/openwrt-deliver.mk

@@ -81 +81 @@
 
 openwrt/deliver/kernel-headers: openwrt/deliver/prepare
+        rm -rf $(INSTALL_DIR_OPENWRT_HEADERS)
         mkdir -p $(INSTALL_DIR_OPENWRT_HEADERS)
         mkdir -p $(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-${OPENWRT_LINUX_VERSION}
-        cd $(OPENWRT_LINUX_DIR) && find . -path './include/*' -prune \
-                -o -path './scripts/*' -prune -o -type f \
-                \( -name 'Makefile*' -o -name 'Kconfig*' -o -name 'Kbuild*' -o \
-                -name '*.sh' -o -name '*.pl' -o -name '*.lds' -o -name '*.symvers' \) \
-                -print | grep -v -e "^./.pc" -v -e "^./.svn" | cpio -pd --preserve-modification-time $(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-${OPENWRT_LINUX_VERSION}
-        cd $(OPENWRT_LINUX_DIR) && cp -a drivers/media/dvb/dvb-core/*.h $(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-${OPENWRT_LINUX_VERSION}/drivers/media/dvb/dvb-core
-        cd $(OPENWRT_LINUX_DIR) && cp -a drivers/media/video/*.h $(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-${OPENWRT_LINUX_VERSION}/drivers/media/video
-        cd $(OPENWRT_LINUX_DIR) && cp -a drivers/media/dvb/frontends/*.h $(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-${OPENWRT_LINUX_VERSION}/drivers/media/dvb/frontends
-        cd $(OPENWRT_LINUX_DIR) && cp -a scripts include $(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-${OPENWRT_LINUX_VERSION}
-        cd $(OPENWRT_LINUX_DIR) && (find arch -name include -type d -print | \
-                xargs -n1 -i: find : -type f) | \
-                cpio -pd --preserve-modification-time $(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-${OPENWRT_LINUX_VERSION}
+        cd $(OPENWRT_LINUX_DIR) && make headers_install ARCH=$(TARGET_ARCH) INSTALL_HDR_PATH=$(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-${OPENWRT_LINUX_VERSION}
+        # some overrides which are not cleanly installed by make headers_install
+        cp $(OPENWRT_LINUX_DIR)/include/linux/switch.h $(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-${OPENWRT_LINUX_VERSION}/include/linux/switch.h
         cp ${OPENWRT_LINUX_DIR}/.config $(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-${OPENWRT_LINUX_VERSION}
         tar czf $(INSTALL_DIR)/$(HEADERS_TAR_GZ) -C $(INSTALL_DIR_OPENWRT_HEADERS) .