From 9f0f9cb05ffb57d44cbcd27489ad2cc51c212a70 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 11 Jun 2005 15:36:31 +0000 Subject: [PATCH] add board tag to kernel module version and add versioned depend (does not work with current ipkg yet) git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1202 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/control/kmod-ip6tables.control | 1 - target/linux/control/kmod-usb-ohci.control | 1 - target/linux/control/kmod-usb-uhci.control | 1 - target/linux/control/kmod-usb2.control | 1 - target/linux/linux-2.4/Makefile | 22 +++++++++++---------- target/linux/package/Makefile | 19 +++++++++--------- target/linux/package/fuse/Makefile | 2 +- target/linux/package/openswan/Makefile | 2 +- target/linux/package/shfs/Makefile | 2 +- target/linux/package/wlcompat/Makefile | 2 +- target/linux/rules.mk | 12 +++++++++-- 11 files changed, 35 insertions(+), 30 deletions(-) diff --git a/target/linux/control/kmod-ip6tables.control b/target/linux/control/kmod-ip6tables.control index 32a72aa65..777ab14bc 100644 --- a/target/linux/control/kmod-ip6tables.control +++ b/target/linux/control/kmod-ip6tables.control @@ -4,4 +4,3 @@ Section: net Maintainer: Felix Fietkau Source: buildroot internal Description: Kernel modules for ip6tables -Depends: kmod-ipv6 diff --git a/target/linux/control/kmod-usb-ohci.control b/target/linux/control/kmod-usb-ohci.control index cc87fa8da..adb6e2763 100644 --- a/target/linux/control/kmod-usb-ohci.control +++ b/target/linux/control/kmod-usb-ohci.control @@ -3,5 +3,4 @@ Priority: optional Section: sys Maintainer: Felix Fietkau Source: buildroot internal -Depends: kmod-usb-core Description: Kernel driver for OHCI USB controllers diff --git a/target/linux/control/kmod-usb-uhci.control b/target/linux/control/kmod-usb-uhci.control index 53a07d892..c7e678f18 100644 --- a/target/linux/control/kmod-usb-uhci.control +++ b/target/linux/control/kmod-usb-uhci.control @@ -3,5 +3,4 @@ Priority: optional Section: sys Maintainer: Felix Fietkau Source: buildroot internal -Depends: kmod-usb-core Description: Kernel driver for UHCI USB controllers diff --git a/target/linux/control/kmod-usb2.control b/target/linux/control/kmod-usb2.control index 8fef6cd4b..48da3a6fc 100644 --- a/target/linux/control/kmod-usb2.control +++ b/target/linux/control/kmod-usb2.control @@ -3,5 +3,4 @@ Priority: optional Section: sys Maintainer: Felix Fietkau Source: buildroot internal -Depends: kmod-usb-core Description: Kernel driver for USB2 controllers diff --git a/target/linux/linux-2.4/Makefile b/target/linux/linux-2.4/Makefile index db7d71c16..e8ce928e8 100644 --- a/target/linux/linux-2.4/Makefile +++ b/target/linux/linux-2.4/Makefile @@ -40,7 +40,10 @@ MODULES_DIR := $(LINUX_BUILD_DIR)/modules/$(MODULES_SUBDIR) TARGET_MODULES_DIR := $(TARGET_DIR)/lib/modules/$(LINUX_VERSION) IPKG_KERNEL:=IPKG_TMP=$(BUILD_DIR)/tmp IPKG_INSTROOT=$(LINUX_TARGET_DIR) IPKG_CONF_DIR=$(LINUX_BUILD_DIR) $(SCRIPT_DIR)/ipkg -force-defaults -force-depends -KERNEL_IPKG:=$(LINUX_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)_$(ARCH).ipk +PKG_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules +PKG_RELEASE := 1 + +KERNEL_IPKG:=$(LINUX_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)_$(ARCH).ipk KERNEL_IDIR:=$(LINUX_BUILD_DIR)/kernel-ipkg include $(LINUX_KCONFIG) @@ -48,9 +51,6 @@ ifeq ($(BOARD),brcm) include ./broadcom.mk endif -PKG_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules -PKG_RELEASE := 1 - TARGETS := INSTALL_TARGETS := $(KERNEL_IPKG) @@ -77,7 +77,7 @@ $(eval $(call KMOD_template,IPTABLES_V4_EXTRA,iptables-extra,\ )) $(eval $(call KMOD_template,IPTABLES_V6,ip6tables,\ $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip*.o \ -,CONFIG_IP6_NF_IPTABLES)) +,CONFIG_IP6_NF_IPTABLES,kmod-ipv6)) $(eval $(call KMOD_template,IPV6,ipv6,\ $(MODULES_DIR)/kernel/net/ipv6/ipv6.o \ ,CONFIG_IPV6)) @@ -94,13 +94,13 @@ $(eval $(call KMOD_template,USB,usb-core,\ ,CONFIG_USB)) $(eval $(call KMOD_template,USB_UHCI,usb-uhci,\ $(MODULES_DIR)/kernel/drivers/usb/host/uhci.o \ -,CONFIG_USB_UHCI_ALT)) +,CONFIG_USB_UHCI_ALT,kmod-usb-core)) $(eval $(call KMOD_template,USB_OHCI,usb-ohci,\ $(MODULES_DIR)/kernel/drivers/usb/host/usb-ohci.o \ -,CONFIG_USB_OHCI)) +,CONFIG_USB_OHCI,kmod-usb-core)) $(eval $(call KMOD_template,USB2,usb2,\ $(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd.o \ -,CONFIG_USB_EHCI_HCD)) +,CONFIG_USB_EHCI_HCD,kmod-usb-core)) $(eval $(call KMOD_template,USB_STORAGE,usb-storage,\ $(MODULES_DIR)/kernel/drivers/scsi/*.o \ $(MODULES_DIR)/kernel/drivers/usb/storage/*.o \ @@ -216,7 +216,7 @@ $(TARGET_MODULES_DIR): $(KERNEL_IPKG): rm -rf $(KERNEL_IDIR) mkdir -p $(KERNEL_IDIR)/etc - $(SCRIPT_DIR)/make-ipkg-dir.sh $(KERNEL_IDIR) ../control/kernel.control $(LINUX_VERSION)-$(BOARD) $(ARCH) + $(SCRIPT_DIR)/make-ipkg-dir.sh $(KERNEL_IDIR) ../control/kernel.control $(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE) $(ARCH) if [ -f ./config/$(BOARD).modules ]; then \ cp ./config/$(BOARD).modules $(KERNEL_IDIR)/etc/modules; \ fi @@ -227,10 +227,12 @@ prepare: $(LINUX_DIR)/.configured compile: $(LINUX_DIR)/.modules_done $(TARGETS) ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(LINUX_DIR) $(MAKE) -C $(TOPDIR)/target/linux/package \ + BOARD="$(BOARD)" \ TARGET_DIR="$(LINUX_TARGET_DIR)" \ BUILD_DIR="$(LINUX_BUILD_DIR)" \ KERNEL_DIR="$(LINUX_SOURCE_DIR)" \ - LINUX_VERSION="$(LINUX_VERSION)" + LINUX_VERSION="$(LINUX_VERSION)" \ + KERNEL_RELEASE="$(PKG_RELEASE)" install: compile $(TARGET_MODULES_DIR) $(KERNEL_IPKG) rm -rf $(LINUX_BUILD_DIR)/root* diff --git a/target/linux/package/Makefile b/target/linux/package/Makefile index 055bd2ffe..fd66e5a97 100644 --- a/target/linux/package/Makefile +++ b/target/linux/package/Makefile @@ -13,28 +13,27 @@ clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m)) compile: $(patsubst %,%-compile,$(package-y) $(package-m)) install: $(patsubst %,%-install,$(package-y)) -%-prepare: - $(MAKE) -C $(patsubst %-prepare,%,$@) \ +MAKEOPTS:= BOARD="$(BOARD)" \ TARGET_DIR="$(TARGET_DIR)" \ BUILD_DIR="$(BUILD_DIR)" \ KERNEL_DIR="$(KERNEL_DIR)" \ LINUX_VERSION="$(LINUX_VERSION)" \ + KERNEL_RELEASE="$(KERNEL_RELEASE)" + + +%-prepare: + $(MAKE) -C $(patsubst %-prepare,%,$@) \ + $(MAKEOPTS) \ prepare %-compile: %-prepare $(MAKE) -C $(patsubst %-compile,%,$@) \ - TARGET_DIR="$(TARGET_DIR)" \ - BUILD_DIR="$(BUILD_DIR)" \ - KERNEL_DIR="$(KERNEL_DIR)" \ - LINUX_VERSION="$(LINUX_VERSION)" \ + $(MAKEOPTS) \ compile %-install: %-compile $(MAKE) -C $(patsubst %-install,%,$@) \ - TARGET_DIR="$(TARGET_DIR)" \ - BUILD_DIR="$(BUILD_DIR)" \ - KERNEL_DIR="$(KERNEL_DIR)" \ - LINUX_VERSION="$(LINUX_VERSION)" \ + $(MAKEOPTS) \ install %-clean: diff --git a/target/linux/package/fuse/Makefile b/target/linux/package/fuse/Makefile index 9db629598..8b997d6b4 100644 --- a/target/linux/package/fuse/Makefile +++ b/target/linux/package/fuse/Makefile @@ -20,7 +20,7 @@ endif include $(TOPDIR)/package/rules.mk -$(eval $(call PKG_template,KMOD_FUSE,kmod-fuse,$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,KMOD_FUSE,kmod-fuse,$(LINUX_VERSION)$(BOARD)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE)))) $(PKG_BUILD_DIR)/.configured: (cd $(PKG_BUILD_DIR); \ diff --git a/target/linux/package/openswan/Makefile b/target/linux/package/openswan/Makefile index 5ebb8702d..a105a1f54 100644 --- a/target/linux/package/openswan/Makefile +++ b/target/linux/package/openswan/Makefile @@ -18,7 +18,7 @@ ifeq ($(KERNEL_DIR),) KERNEL_DIR:=$(LINUX_DIR) endif -$(eval $(call PKG_template,KMOD_OPENSWAN,kmod-openswan,$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,KMOD_OPENSWAN,kmod-openswan,$(LINUX_VERSION)$(BOARD)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE)))) FLAGS := $(TARGET_CFLAGS) -I$(PKG_BUILD_DIR)/linux/include -L$(STAGING_DIR)/usr/lib -I$(STAGING_DIR)/usr/include diff --git a/target/linux/package/shfs/Makefile b/target/linux/package/shfs/Makefile index a329bbffc..36046065f 100644 --- a/target/linux/package/shfs/Makefile +++ b/target/linux/package/shfs/Makefile @@ -20,7 +20,7 @@ endif include $(TOPDIR)/package/rules.mk -$(eval $(call PKG_template,KMOD_SHFS,kmod-shfs,$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,KMOD_SHFS,kmod-shfs,$(LINUX_VERSION)$(BOARD)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE)))) $(PKG_BUILD_DIR)/.configured: touch $@ diff --git a/target/linux/package/wlcompat/Makefile b/target/linux/package/wlcompat/Makefile index da905527c..706948e8e 100644 --- a/target/linux/package/wlcompat/Makefile +++ b/target/linux/package/wlcompat/Makefile @@ -8,7 +8,7 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) include $(TOPDIR)/package/rules.mk -$(eval $(call PKG_template,KMOD_WLCOMPAT,$(PKG_NAME),$(LINUX_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,KMOD_WLCOMPAT,$(PKG_NAME),$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE)))) ifeq ($(KERNEL_DIR),) KERNEL_DIR:=$(LINUX_DIR) diff --git a/target/linux/rules.mk b/target/linux/rules.mk index 451ec26e4..9446c343f 100644 --- a/target/linux/rules.mk +++ b/target/linux/rules.mk @@ -5,7 +5,13 @@ else KDEPEND_$(1):=$($(4)) endif -PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(LINUX_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk +ifeq ($$(strip $(5)),) +IDEPEND_$(1):=kernel ($(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)) +else +IDEPEND_$(1):=kernel ($(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)), $(5) +endif + +PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)_$(ARCH).ipk I_$(1) := $(PKG_BUILD_DIR)/ipkg/$(2) ifeq ($$(KDEPEND_$(1)),m) @@ -18,8 +24,10 @@ endif endif $$(PKG_$(1)): $(LINUX_DIR)/.modules_done + rm -rf $$(I_$(1)) mkdir -p $$(I_$(1))/lib/modules/$(LINUX_VERSION) - $(SCRIPT_DIR)/make-ipkg-dir.sh $$(I_$(1)) ../control/kmod-$(2).control $(LINUX_VERSION)-$(PKG_RELEASE) $(ARCH) + $(SCRIPT_DIR)/make-ipkg-dir.sh $$(I_$(1)) ../control/kmod-$(2).control $(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE) $(ARCH) + echo "Depends: $$(IDEPEND_$(1))" >> $$(I_$(1))/CONTROL/control cp $(3) $$(I_$(1))/lib/modules/$(LINUX_VERSION) $(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR) -- 2.35.1