X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/857a320b7228d9ac69e9b31d71ecd0db95288303..2039ef63e970366e807b06d0256c30b8aa7fc92c:/package/kernel/Makefile?ds=sidebyside

diff --git a/package/kernel/Makefile b/package/kernel/Makefile
index f3a9a287e..da96f43a7 100644
--- a/package/kernel/Makefile
+++ b/package/kernel/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,78 +10,39 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=kernel
-PKG_VERSION:=$(LINUX_VERSION)-$(BOARD)
-PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/packages
+SCAN_DEPS=modules/*.mk
 
 include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
--include $(LINUX_DIR)/.config
-include $(INCLUDE_DIR)/netfilter.mk
+  -include $(LINUX_DIR)/.config
 endif
 
 define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)
 endef
 
-define Build/Compile
-endef
-
-define KernelPackage/Defaults
-FILES:=
-KCONFIG:=
-AUTOLOAD:=
+define Build/Configure
 endef
 
-define ModuleAutoLoad
-	export modules=; \
-	add_module() { \
-		mkdir -p $(2)/etc/modules.d; \
-		echo "$$$$$$$$2" > $(2)/etc/modules.d/$$$$$$$$1-$(1); \
-		modules="$$$$$$$${modules:+$$$$$$$$modules }$$$$$$$$1-$(1)"; \
-	}; \
-	$(3) \
-	[ -n "$$$$$$$$modules" ] && { \
-		mkdir -p $(2)/etc/modules.d; \
-		echo "#!/bin/sh" >> $(2)/CONTROL/postinst; \
-		echo "[ -z \"\$$$$$$$$IPKG_INSTROOT\" ] || exit" >> $(2)/CONTROL/postinst; \
-		echo ". /etc/functions.sh" >> $(2)/CONTROL/postinst; \
-		echo "load_modules $$$$$$$$modules" >> $(2)/CONTROL/postinst; \
-		chmod 0755 $(2)/CONTROL/postinst; \
-	}
+define Build/Compile
 endef
- 
-
-define KernelPackage
-  NAME:=$(1)
-  $(eval $(call KernelPackage/Defaults))
-  $(eval $(call KernelPackage/$(1)))
-  $(eval $(call KernelPackage/$(1)/$(KERNEL)))
-
-  ifneq ($(findstring m,$(KCONFIG)),m)
-    CONFIG_PACKAGE_kmod-$(1):=
-  endif
-
-  define Package/kmod-$(1)
-    TITLE:=$(TITLE)
-    SECTION:=kernel
-    CATEGORY:=Kernel modules
-    DESCRIPTION:=$(DESCRIPTION)
-    EXTRA_DEPENDS:='kernel (=$(PKG_VERSION))'
-  endef
 
-  define Package/kmod-$(1)/install
-	mkdir -p $$(1)/lib/modules/$(LINUX_VERSION)
-	$(CP) $(FILES) $$(1)/lib/modules/$(LINUX_VERSION)/
-	$(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD))
-  endef
-  $$(eval $$(call BuildPackage,kmod-$(1)))
+CONFIG_PACKAGE_kernel=y
+define Package/kernel
+  SECTION:=sys
+  CATEGORY:=Kernel
+  DEFAULT:=y
+  TITLE:=Virtual kernel package
+  VERSION:=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)
 endef
 
-define AutoLoad
-add_module $(1) "$(2)";
+define Package/kernel/install
+  # nothing to do
 endef
 
-include ./modules.mk
+$(eval $(if $(DUMP),,$(call BuildPackage,kernel)))
 
+-include $(TOPDIR)/target/linux/*/modules.mk
+include ./modules/*.mk