X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/4c98f8465d7b207b150b3c67705e35297d7804be..8600b97ee65ecd97461508bf0e67de06707a2e59:/package/kernel/Makefile diff --git a/package/kernel/Makefile b/package/kernel/Makefile index a030ad723..e094c601e 100644 --- a/package/kernel/Makefile +++ b/package/kernel/Makefile @@ -1,25 +1,22 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id$ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=kernel -PKG_VERSION:=$(LINUX_VERSION)-$(BOARD) -PKG_RELEASE:=$(LINUX_RELEASE) +PKG_FLAGS:=hold PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/packages +SCAN_DEPS=modules/*.mk include $(INCLUDE_DIR)/package.mk ifeq ($(DUMP),) -include $(LINUX_DIR)/.config - NF_KMOD:=1 - include $(INCLUDE_DIR)/netfilter.mk endif define Build/Prepare @@ -38,21 +35,15 @@ define Package/kernel CATEGORY:=Kernel DEFAULT:=y TITLE:=Virtual kernel package - DESCRIPTION:=Virtual kernel package - VERSION:=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE) + VERSION:=$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC) + URL:=http://www.kernel.org/ endef define Package/kernel/install # nothing to do endef -# this is more robust than ifdef around eval/call -ifneq ($(DUMP),1) - define BuildKernel - $(call BuildPackage,kernel) - endef -endif -$(eval $(call BuildKernel)) +$(eval $(if $(DUMP),,$(call BuildPackage,kernel))) -include $(TOPDIR)/target/linux/*/modules.mk -include ./modules/*.mk +include $(sort $(wildcard ./modules/*.mk)) +-include $(TOPDIR)/target/linux/*/modules.mk