use the same versioning scheme for kernel and modules

[openwrt.git] / openwrt / target / linux / package / mini_fo / Makefile

diff --git a/openwrt/target/linux/package/mini_fo/Makefile b/openwrt/target/linux/package/mini_fo/Makefile
index 45c1b41..5b9b2a8 100644 (file)
--- a/openwrt/target/linux/package/mini_fo/Makefile
+++ b/openwrt/target/linux/package/mini_fo/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 include ../../rules.mk
 
 PKG_NAME := mini_fo
-PKG_VERSION := 0.6.1-pre1
+PKG_VERSION := 0.6.1pre1
 PKG_RELEASE := 1
 PKG_MD5SUM := 7e192e01b08023c7f3e63bf1c796bc14
 
@@ -22,14 +22,16 @@ KERNEL_VERSION=$(shell echo "$(LINUX_VERSION)" | cut -d. -f1,2)
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,KMOD_MINI_FO,kmod-mini-fo,$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE))))
+$(eval $(call PKG_template,KMOD_MINI_FO,kmod-mini-fo,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE))))
 
 $(PKG_BUILD_DIR)/.configured:
        touch $@
 
 $(PKG_BUILD_DIR)/.built: 
        $(MAKE) -C $(PKG_BUILD_DIR) \
+               PATH="$(TARGET_PATH)" \
                ARCH="$(LINUX_KARCH)" \
+               CROSS_COMPILE="$(TARGET_CROSS)" \
                KERNELVERSION="$(KERNEL_VERSION)" \
                KERNEL_SRC="$(KERNEL_DIR)" \
                all
@@ -38,9 +40,8 @@ $(PKG_BUILD_DIR)/.built:
 $(IPKG_KMOD_MINI_FO):
        install -m0755 -d $(IDIR_KMOD_MINI_FO)/lib/modules/$(LINUX_VERSION)
        install -m0755 -d $(IDIR_KMOD_MINI_FO)/etc/modules.d
-       cp -fpR $(PKG_BUILD_DIR)/mini_fo.o \
+       cp -fpR $(PKG_BUILD_DIR)/mini_fo.$(LINUX_KMOD_SUFFIX) \
         $(IDIR_KMOD_MINI_FO)/lib/modules/$(LINUX_VERSION)/
        echo "mini_fo" > $(IDIR_KMOD_MINI_FO)/etc/modules.d/15-mini-fo
-       $(RSTRIP_KMOD) $(IDIR_KMOD_MINI_FO)
        $(IPKG_BUILD) $(IDIR_KMOD_MINI_FO) $(PACKAGE_DIR)