update alsa, fix compile

[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 cb1e1ad..dcd5b91 100644 (file)
--- a/openwrt/target/linux/package/mini_fo/Makefile
+++ b/openwrt/target/linux/package/mini_fo/Makefile
@@ -15,14 +15,9 @@ PKG_CAT := bzcat
 PKG_BUILD_DIR := $(BUILD_DIR)/mini_fo-0-6-2-pre1
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-ifeq ($(KERNEL_DIR),)
-KERNEL_DIR:=$(LINUX_DIR)
-endif
-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)+$(PKG_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)-$(LINUX_RELEASE))))
 
 $(PKG_BUILD_DIR)/.configured:
        touch $@
@@ -32,15 +27,15 @@ $(PKG_BUILD_DIR)/.built:
                PATH="$(TARGET_PATH)" \
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
-               KERNELVERSION="$(KERNEL_VERSION)" \
-               KERNEL_SRC="$(KERNEL_DIR)" \
+               KERNELVERSION="$(KERNEL)" \
+               KERNEL_SRC="$(LINUX_DIR)" \
                all
        touch $@
 
 $(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.$(LINUX_KMOD_SUFFIX) \
+       $(CP) $(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
        $(IPKG_BUILD) $(IDIR_KMOD_MINI_FO) $(PACKAGE_DIR)