fix problems with new tar versions, closes #628 and #646

[openwrt.git] / toolchain / kernel-headers / Makefile

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 27da1d5..da525d5 100644 (file)
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -1,51 +1,59 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 include $(TOPDIR)/rules.mk
 
-# linux kernel headers for toolchain
+PKG_NAME=kernel-headers
+PKG_VERSION=2.4.32
 
-LINUX_HEADERS_VERSION=2.4.32
-LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c
-LINUX_HEADERS_SITE= \
+PKG_SOURCE=linux-$(PKG_VERSION).tar.bz2
+PKG_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c
+PKG_SOURCE_URL= \
                http://www.de.kernel.org/pub/linux/kernel/v2.4 \
                http://www.fi.kernel.org/pub/linux/kernel/v2.4 \
                http://www.fr.kernel.org/pub/linux/kernel/v2.4 \
-               http://www.kernel.org/pub/linux/kernel/v2.4 \
+               http://www.kernel.org/pub/linux/kernel/v2.4
 
-LINUX_HEADERS_SOURCE=linux-$(LINUX_HEADERS_VERSION).tar.bz2
-LINUX_HEADERS_ARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
-       -e 's/mipseb/mips/' \
+PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/linux-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/host-build.mk
+
+LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
        -e 's/mipsel/mips/' \
+       -e 's/mipseb/mips/' \
        -e 's/powerpc/ppc/' \
        -e 's/sh[234]/sh/' \
-       )
-
-$(DL_DIR)/$(LINUX_HEADERS_SOURCE):
-       -mkdir -p $(DL_DIR)
-       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_HEADERS_SOURCE) $(LINUX_KERNEL_MD5SUM) $(LINUX_HEADERS_SITE)
+       -e 's/armeb/arm/' \
+)
 
-$(LINUX_HEADERS_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE)
+define Build/Prepare
        mkdir -p $(TOOL_BUILD_DIR)
-       bzcat $(DL_DIR)/$(LINUX_HEADERS_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - \
-               linux-$(LINUX_HEADERS_VERSION)/include \
-               linux-$(LINUX_HEADERS_VERSION)/Makefile \
-               linux-$(LINUX_HEADERS_VERSION)/Rules.make \
-               linux-$(LINUX_HEADERS_VERSION)/arch/$(LINUX_HEADERS_ARCH)/Makefile \
-               linux-$(LINUX_HEADERS_VERSION)/scripts \
-               linux-$(LINUX_HEADERS_VERSION)/arch/$(LINUX_HEADERS_ARCH)/config*.in \
-               linux-$(LINUX_HEADERS_VERSION)/*/*/Config.in \
-               linux-$(LINUX_HEADERS_VERSION)/*/Config.in
-       ln -sf $(LINUX_HEADERS_DIR)-$(LINUX_HEADERS_VERSION) $(LINUX_HEADERS_DIR)
-       $(SED) 's/@expr length/@-expr length/' $(LINUX_HEADERS_DIR)/Makefile 
-       touch $(LINUX_HEADERS_DIR)/.unpacked
-
-$(LINUX_HEADERS_DIR)/.configured: $(LINUX_HEADERS_DIR)/.unpacked
-       -$(CP) ./files/config.$(LINUX_HEADERS_ARCH) $(LINUX_HEADERS_DIR)/.config
-       $(MAKE) -C $(LINUX_HEADERS_DIR) ARCH=$(LINUX_HEADERS_ARCH) oldconfig include/linux/version.h
-       touch $(LINUX_HEADERS_DIR)/.configured
-
-source: $(DL_DIR)/$(LINUX_HEADERS_SOURCE)
-prepare: $(LINUX_HEADERS_DIR)/.configured
-compile:
-install:
-clean:
-       rm -rf $(LINUX_HEADERS_DIR)
-
+       bzcat $(DL_DIR)/$(PKG_SOURCE) | tar --wildcards -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - \
+               linux-$(PKG_VERSION)/include \
+               linux-$(PKG_VERSION)/Makefile \
+               linux-$(PKG_VERSION)/Rules.make \
+               linux-$(PKG_VERSION)/arch/$(LINUX_KARCH)/Makefile \
+               linux-$(PKG_VERSION)/scripts \
+               linux-$(PKG_VERSION)/arch/$(LINUX_KARCH)/config*.in \
+               linux-$(PKG_VERSION)/*/*/Config.in \
+               linux-$(PKG_VERSION)/*/Config.in
+       $(PATCH) $(PKG_BUILD_DIR) ./patches
+       $(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile 
+       ln -sf $(PKG_BUILD_DIR) $(LINUX_HEADERS_DIR)
+endef
+
+define Build/Configure
+       -$(CP) ./files/config.$(LINUX_KARCH) $(PKG_BUILD_DIR)/.config
+       $(MAKE) -C $(PKG_BUILD_DIR) ARCH=$(LINUX_KARCH) oldconfig include/linux/version.h
+endef
+
+define Build/Compile
+endef
+
+define Build/Install
+endef
+
+$(eval $(call HostBuild))