From 9f0f9cb05ffb57d44cbcd27489ad2cc51c212a70 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 11 Jun 2005 15:36:31 +0000 Subject: 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/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 +- 5 files changed, 13 insertions(+), 14 deletions(-) (limited to 'target/linux/package') 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) -- cgit v1.2.3