X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fkernel-build.mk;h=6aefe0b891d8d914a0c2350055f1199fdd5f55fd;hb=40a70cf67835e23625f4743650278ff9357ac3de;hp=6fae4acc535839a9436f6c17b60f09f906050042;hpb=02cdebbb91a33d8e24da1c94a9d93ac39be168a7;p=openwrt-10.03%2F.git

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 6fae4acc5..6aefe0b89 100644
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -17,10 +17,16 @@ KERNEL_IPKG:=$(KERNEL_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEAS
 TARGETS += $(KERNEL_IPKG)
 INSTALL_TARGETS += $(KERNEL_IPKG)
 
-$(TARGETS): $(PACKAGE_DIR)
+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/' \
+	-e 's/armeb/arm/' \
+)
 
-$(LINUX_DIR):
-	mkdir -p $@
+
+$(TARGETS): $(PACKAGE_DIR)
 
 $(PACKAGE_DIR):
 	mkdir -p $@
@@ -36,11 +42,8 @@ $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
 
 ifeq ($(KERNEL),2.4)
 $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
-	$(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" \
-	  $(LINUX_DIR)/Makefile  \
-	  $(LINUX_DIR)/arch/*/Makefile
 	$(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile
-	$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h
+	$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h
 	touch $@
 
 $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured
@@ -50,7 +53,7 @@ $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured
 $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.depend_done
 else
 $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
-	$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts
+	$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts
 	touch $@
 endif
 
@@ -68,26 +71,26 @@ else
 	echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config
 endif
 
-$(LINUX_DIR)/vmlinux: $(STAMP_DIR)/.linux-compile pkg-install ramdisk-config
-	$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH)
+$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config
+	$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) $(KERNELNAME)
 
 $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
-	$(TARGET_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@
+	$(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@
 	touch -c $(LINUX_KERNEL)
 
 $(LINUX_DIR)/.modules_done:
 	rm -rf $(KERNEL_BUILD_DIR)/modules
-	$(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" modules
-	$(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
+	$(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) modules
+	$(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
 	touch $(LINUX_DIR)/.modules_done
 
 modules: $(LINUX_DIR)/.modules_done
 packages: $(TARGETS)
 
-$(STAMP_DIR)/.linux-compile:
-	@$(MAKE) modules
-	@$(MAKE) packages
+$(LINUX_DIR)/.linux-compile:
+	@rm -f $(BUILD_DIR)/linux
 	ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux
+	@$(MAKE) modules
 	touch $@
 
 $(KERNEL_IPKG):
@@ -99,24 +102,29 @@ $(KERNEL_IPKG):
 	fi
 	$(IPKG_BUILD) $(KERNEL_IDIR) $(KERNEL_BUILD_DIR)
 
-$(TOPDIR)/.kernel.mk:
-	echo "BOARD:=$(BOARD)" > $@
-	echo "LINUX_VERSION:=$(LINUX_VERSION)" >> $@
-	echo "LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@
+$(TOPDIR)/.kernel.mk: $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)/Makefile
+	echo "CONFIG_BOARD:=$(BOARD)" > $@
+	echo "CONFIG_KERNEL:=$(KERNEL)" >> $@
+	echo "CONFIG_LINUX_VERSION:=$(LINUX_VERSION)" >> $@
+	echo "CONFIG_LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@
+	echo "CONFIG_LINUX_KARCH:=$(LINUX_KARCH)" >> $@
 
 pkg-install: FORCE
-	@{ [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG) install $(INSTALL_TARGETS) || true; }
+	@for pkg in $(INSTALL_TARGETS); do \
+		$(IPKG) install $$pkg || echo; \
+	done
 
-source: $(DL_DIR)/$(LINUX_SOURCE)
+download: $(DL_DIR)/$(LINUX_SOURCE)
 prepare: $(LINUX_DIR)/.configured
-	@mkdir -p $(STAMP_DIR) $(PACKAGE_DIR)
+	@mkdir -p $(LINUX_DIR) $(PACKAGE_DIR)
 
-compile: prepare $(STAMP_DIR)/.linux-compile
+compile: prepare $(LINUX_DIR)/.linux-compile
+	@$(MAKE) packages
 
 install: compile $(LINUX_KERNEL)
 
 mostlyclean: FORCE
-	rm -f $(STAMP_DIR)/.linux-compile
+	rm -f $(LINUX_DIR)/.linux-compile
 	rm -f $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/.modules_done
 	rm -f $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/.drivers-unpacked
 	$(MAKE) -C $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) clean
@@ -134,92 +142,3 @@ clean: FORCE
 	rm -rf $(KERNEL_BUILD_DIR)
 	rm -f $(TARGETS)
 
-
-define AutoLoad
-add_module $(1) "$(2)";
-endef
-
-define KernelPackage/Defaults
-  VERSION:=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)
-  DEPENDS:=
-  MAINTAINER:=OpenWrt Developers Team <openwrt-devel@openwrt.org>
-  SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd})
-  PKGARCH:=$(ARCH)
-  PRIORITY:=optional
-  KCONFIG:=
-  FILES:=
-  BUILD:=
-  MODULES:=
-  TITLE:=
-  DESCRIPTION:=
-endef
-
-define KernelPackage
-  NAME:=$(1)
-  $(eval $(call KernelPackage/Defaults))
-  $(eval $(call KernelPackage/$(1)))
-  $(eval $(call KernelPackage/$(1)/$(KERNEL)))
-  
-  PKG_$(1) := $(PACKAGE_DIR)/kmod-$(1)_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_$(ARCH).ipk
-  I_$(1) := $(KMOD_BUILD_DIR)/ipkg/$(1)
-  
-  IDEPEND_$(1):='kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))' $(DEPENDS)
-  
-  ifeq ($$(strip $(KCONFIG)),)
-    KDEPEND_$(1):=m
-  else
-    KDEPEND_$(1):=$($(KCONFIG))
-  endif
-  ifeq ($$(KDEPEND_$(1)),m)
-    ifneq ($(CONFIG_PACKAGE_kmod-$(1)),)
-      packages: $$(PKG_$(1))
-    endif
-    ifeq ($(CONFIG_PACKAGE_kmod-$(1)),y)
-      install-kmod-$(1): FORCE
-		$(IPKG) install $$(PKG_$(1))
-      pkg-install: install-kmod-$(1)
-    endif
-  endif
-
-  $$(PKG_$(1)): $(LINUX_DIR)/.modules_done
-	rm -rf $$(I_$(1))
-	install -d -m0755 $$(I_$(1))/CONTROL
-	echo "Package: kmod-$(1)" > $$(I_$(1))/CONTROL/control
-	echo "Version: $(VERSION)" >> $$(I_$(1))/CONTROL/control
-	( \
-		DEPENDS=; \
-		for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \
-			DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \
-		done; \
-		echo "Depends: $$$$DEPENDS" >> $$(I_$(1))/CONTROL/control; \
-	)
-	echo "Source: $(SOURCE)" >> $$(I_$(1))/CONTROL/control
-	echo "Section: kernel" >> $$(I_$(1))/CONTROL/control
-	echo "Priority: $(PRIORITY)" >> $$(I_$(1))/CONTROL/control
-	echo "Maintainer: $(MAINTAINER)" >> $$(I_$(1))/CONTROL/control
-	echo "Architecture: $(PKGARCH)" >> $$(I_$(1))/CONTROL/control
-	echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(I_$(1))/CONTROL/control
-  ifneq ($(strip $(FILES)),)
-	mkdir -p $$(I_$(1))/lib/modules/$(LINUX_VERSION)
-	$(CP) $(FILES) $$(I_$(1))/lib/modules/$(LINUX_VERSION)/
-  endif
-  ifneq ($(MODULES),)
-	export modules=; \
-	add_module() { \
-		mkdir -p $$(I_$(1))/etc/modules.d; \
-		echo "$$$$2" > $$(I_$(1))/etc/modules.d/$$$$1-$(1); \
-		modules="$$$${modules:+$$$$modules }$$$$1-$(1)"; \
-	}; \
-	$(MODULES) \
-	mkdir -p $$(I_$(1))/etc/modules.d; \
-	echo "#!/bin/sh" >> $$(I_$(1))/CONTROL/postinst; \
-	echo "[ -z \"\$$$$IPKG_INSTROOT\" ] || exit" >> $$(I_$(1))/CONTROL/postinst; \
-	echo ". /etc/functions.sh" >> $$(I_$(1))/CONTROL/postinst; \
-	echo "load_modules $$$$modules" >> $$(I_$(1))/CONTROL/postinst; \
-	chmod 0755 $$(I_$(1))/CONTROL/postinst;
-  endif
-	$(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR)
-endef
-
--include $(INCLUDE_DIR)/modules.mk
-