From 3cb6e4ad50c7d3935da161273c093992534b5a0e Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 18 Jul 2006 16:17:19 +0000 Subject: move some of the kernel module packaging to package/kernel/ git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4146 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/Makefile | 87 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 package/kernel/Makefile (limited to 'package/kernel/Makefile') diff --git a/package/kernel/Makefile b/package/kernel/Makefile new file mode 100644 index 000000000..580bf1937 --- /dev/null +++ b/package/kernel/Makefile @@ -0,0 +1,87 @@ +# +# Copyright (C) 2006 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:=1 + +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/packages + +include $(INCLUDE_DIR)/package.mk +ifeq ($(DUMP),) +-include $(LINUX_DIR)/.config +include $(INCLUDE_DIR)/netfilter.mk +endif + +define Build/Prepare + mkdir -p $(PKG_BUILD_DIR) +endef + +define Build/Compile +endef + +define KernelPackage/Defaults +FILES:= +KCONFIG:= +AUTOLOAD:= +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; \ + } +endef + + +define KernelPackage + NAME:=$(1) + $(eval $(call KernelPackage/Defaults)) + $(eval $(call KernelPackage/$(1))) + $(eval $(call KernelPackage/$(1)/$(KERNEL))) + + ifneq ($(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))) +endef + +define AutoLoad +add_module $(1) "$(2)"; +endef + +include ./modules.mk + -- cgit v1.2.3 From 857a320b7228d9ac69e9b31d71ecd0db95288303 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 18 Jul 2006 16:22:01 +0000 Subject: allow multiple kernel config dependencies git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4148 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/kernel/Makefile') diff --git a/package/kernel/Makefile b/package/kernel/Makefile index 580bf1937..f3a9a287e 100644 --- a/package/kernel/Makefile +++ b/package/kernel/Makefile @@ -59,7 +59,7 @@ define KernelPackage $(eval $(call KernelPackage/$(1))) $(eval $(call KernelPackage/$(1)/$(KERNEL))) - ifneq ($(KCONFIG),m) + ifneq ($(findstring m,$(KCONFIG)),m) CONFIG_PACKAGE_kmod-$(1):= endif -- cgit v1.2.3 From 07651c7915851113e8deb1195af84446f6d3d475 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 18 Jul 2006 16:35:03 +0000 Subject: move the cryptoapi kmod to package/kernel git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4149 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/kernel/Makefile') diff --git a/package/kernel/Makefile b/package/kernel/Makefile index f3a9a287e..0a26cd6cf 100644 --- a/package/kernel/Makefile +++ b/package/kernel/Makefile @@ -42,14 +42,14 @@ define ModuleAutoLoad modules="$$$$$$$${modules:+$$$$$$$$modules }$$$$$$$$1-$(1)"; \ }; \ $(3) \ - [ -n "$$$$$$$$modules" ] && { \ + if [ -n "$$$$$$$$modules" ]; then \ 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; \ - } + fi endef -- cgit v1.2.3 From 40224d8b95396392e47e96e37a15734c54fe4ac7 Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 21 Jul 2006 22:51:02 +0000 Subject: fix kernel module defaults git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4201 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'package/kernel/Makefile') diff --git a/package/kernel/Makefile b/package/kernel/Makefile index 0a26cd6cf..14fcda288 100644 --- a/package/kernel/Makefile +++ b/package/kernel/Makefile @@ -30,7 +30,7 @@ endef define KernelPackage/Defaults FILES:= -KCONFIG:= +KCONFIG:=m AUTOLOAD:= endef @@ -67,8 +67,11 @@ define KernelPackage TITLE:=$(TITLE) SECTION:=kernel CATEGORY:=Kernel modules + DEFAULT:=m DESCRIPTION:=$(DESCRIPTION) EXTRA_DEPENDS:='kernel (=$(PKG_VERSION))' + $(call KernelPackage/$(1)) + $(call KernelPackage/$(1)/$(KERNEL)) endef define Package/kmod-$(1)/install -- cgit v1.2.3 From 95a463ce0f08f0fec00a044c725f525b801d4443 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 22 Jul 2006 12:33:28 +0000 Subject: port over the netfilter module packaging to the new system and fix iptables dependencies git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4206 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'package/kernel/Makefile') diff --git a/package/kernel/Makefile b/package/kernel/Makefile index 14fcda288..39978ab9f 100644 --- a/package/kernel/Makefile +++ b/package/kernel/Makefile @@ -18,6 +18,7 @@ PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/packages include $(INCLUDE_DIR)/package.mk ifeq ($(DUMP),) -include $(LINUX_DIR)/.config +NF_KMOD:=1 include $(INCLUDE_DIR)/netfilter.mk endif -- cgit v1.2.3 From ce1a7b70f98465a879ca43a3a904fb7e1d1381f4 Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 23 Jul 2006 14:21:26 +0000 Subject: bugfixes for the kernel module packaging git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4236 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/Makefile | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'package/kernel/Makefile') diff --git a/package/kernel/Makefile b/package/kernel/Makefile index 39978ab9f..c977501e0 100644 --- a/package/kernel/Makefile +++ b/package/kernel/Makefile @@ -60,10 +60,6 @@ define KernelPackage $(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 @@ -75,11 +71,13 @@ define KernelPackage $(call KernelPackage/$(1)/$(KERNEL)) 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 + ifeq ($(findstring m,$(KCONFIG)),m) + 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 + endif $$(eval $$(call BuildPackage,kmod-$(1))) endef -- cgit v1.2.3 From aaa058cf5cf5dc603edcdf09a75eb08c77709a93 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 25 Jul 2006 14:44:54 +0000 Subject: don't try to create kmod packages that contain no files git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4278 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package/kernel/Makefile') diff --git a/package/kernel/Makefile b/package/kernel/Makefile index c977501e0..b1155f428 100644 --- a/package/kernel/Makefile +++ b/package/kernel/Makefile @@ -72,12 +72,14 @@ define KernelPackage endef ifeq ($(findstring m,$(KCONFIG)),m) + ifneq ($(strip $(FILES)),) 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 endif + endif $$(eval $$(call BuildPackage,kmod-$(1))) endef -- cgit v1.2.3 From 3ca168b4e7354bba338b7484c15d37c877bb126a Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 30 Jul 2006 17:06:02 +0000 Subject: fix kernel postinst scripts git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4336 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/kernel/Makefile') diff --git a/package/kernel/Makefile b/package/kernel/Makefile index b1155f428..e5094ef01 100644 --- a/package/kernel/Makefile +++ b/package/kernel/Makefile @@ -45,8 +45,8 @@ define ModuleAutoLoad $(3) \ if [ -n "$$$$$$$$modules" ]; then \ mkdir -p $(2)/etc/modules.d; \ - echo "#!/bin/sh" >> $(2)/CONTROL/postinst; \ - echo "[ -z \"\$$$$$$$$IPKG_INSTROOT\" ] || exit" >> $(2)/CONTROL/postinst; \ + echo "#!/bin/sh" > $(2)/CONTROL/postinst; \ + echo "[ -z \"\$$$$$$$$IPKG_INSTROOT\" ] || exit 0" >> $(2)/CONTROL/postinst; \ echo ". /etc/functions.sh" >> $(2)/CONTROL/postinst; \ echo "load_modules $$$$$$$$modules" >> $(2)/CONTROL/postinst; \ chmod 0755 $(2)/CONTROL/postinst; \ -- cgit v1.2.3 From c96e803e0c49efdcf0d2391b09405252c311e73e Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 23 Aug 2006 21:05:42 +0000 Subject: fix kernel module dependency problems git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4640 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/kernel/Makefile') diff --git a/package/kernel/Makefile b/package/kernel/Makefile index e5094ef01..b59649dda 100644 --- a/package/kernel/Makefile +++ b/package/kernel/Makefile @@ -66,7 +66,7 @@ define KernelPackage CATEGORY:=Kernel modules DEFAULT:=m DESCRIPTION:=$(DESCRIPTION) - EXTRA_DEPENDS:='kernel (=$(PKG_VERSION))' + EXTRA_DEPENDS:='kernel (=$(PKG_VERSION)-$(PKG_RELEASE))' $(call KernelPackage/$(1)) $(call KernelPackage/$(1)/$(KERNEL)) endef -- cgit v1.2.3 From 55390f2a7b5657a6441b98526b80e5ebb785510e Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 27 Aug 2006 13:08:53 +0000 Subject: fix LINUX_RELEASE and use it for the kmod-* build git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4687 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/kernel/Makefile') diff --git a/package/kernel/Makefile b/package/kernel/Makefile index b59649dda..f43f4fdf6 100644 --- a/package/kernel/Makefile +++ b/package/kernel/Makefile @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=kernel PKG_VERSION:=$(LINUX_VERSION)-$(BOARD) -PKG_RELEASE:=1 +PKG_RELEASE:=$(LINUX_RELEASE) PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/packages -- cgit v1.2.3 From 8afb23270d23db6a033ba8fb77e1cf1a1d925a7c Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 24 Sep 2006 20:49:31 +0000 Subject: new (last?) attempt at standardizing Makefiles git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4855 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/Makefile | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'package/kernel/Makefile') diff --git a/package/kernel/Makefile b/package/kernel/Makefile index f43f4fdf6..bb9fd4f70 100644 --- a/package/kernel/Makefile +++ b/package/kernel/Makefile @@ -17,9 +17,9 @@ PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/packages include $(INCLUDE_DIR)/package.mk ifeq ($(DUMP),) --include $(LINUX_DIR)/.config -NF_KMOD:=1 -include $(INCLUDE_DIR)/netfilter.mk + -include $(LINUX_DIR)/.config + NF_KMOD:=1 + include $(INCLUDE_DIR)/netfilter.mk endif define Build/Prepare @@ -30,9 +30,9 @@ define Build/Compile endef define KernelPackage/Defaults -FILES:= -KCONFIG:=m -AUTOLOAD:= + FILES:= + KCONFIG:=m + AUTOLOAD:= endef define ModuleAutoLoad @@ -72,20 +72,19 @@ define KernelPackage endef ifeq ($(findstring m,$(KCONFIG)),m) - ifneq ($(strip $(FILES)),) - define Package/kmod-$(1)/install + ifneq ($(strip $(FILES)),) + 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 - endif + endef + endif endif $$(eval $$(call BuildPackage,kmod-$(1))) endef define AutoLoad -add_module $(1) "$(2)"; + add_module $(1) "$(2)"; endef include ./modules.mk - -- cgit v1.2.3