X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/24dc1f527d33afc44998f5b35a8de368c165f51d..0c86647fe03297fbfa494533ea1fce336bd4bb74:/openwrt/target/linux/package/fuse/Makefile diff --git a/openwrt/target/linux/package/fuse/Makefile b/openwrt/target/linux/package/fuse/Makefile index 39f5f38bc..b9a57d002 100644 --- a/openwrt/target/linux/package/fuse/Makefile +++ b/openwrt/target/linux/package/fuse/Makefile @@ -15,13 +15,9 @@ PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -ifeq ($(KERNEL_DIR),) -KERNEL_DIR:=$(LINUX_DIR) -endif - include $(TOPDIR)/package/rules.mk -$(eval $(call PKG_template,KMOD_FUSE,kmod-fuse,$(LINUX_VERSION)$(BOARD)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE)))) +$(eval $(call PKG_template,KMOD_FUSE,kmod-fuse,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)))) $(PKG_BUILD_DIR)/.configured: (cd $(PKG_BUILD_DIR); \ @@ -60,7 +56,7 @@ $(PKG_BUILD_DIR)/.configured: --disable-util \ --disable-example \ --disable-auto-modprobe \ - --with-kernel=$(KERNEL_DIR) \ + --with-kernel=$(LINUX_DIR) \ --disable-mtab \ ); touch $@ @@ -69,6 +65,7 @@ $(PKG_BUILD_DIR)/.built: mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ ARCH="$(LINUX_KARCH)" \ + CROSS_COMPILE="$(TARGET_CROSS)" \ PATH="$(TARGET_PATH)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ SUBDIRS="kernel" \ @@ -77,7 +74,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_FUSE): mkdir -p $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION) - cp -fpR $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) \ + $(CP) $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION)/ $(IPKG_BUILD) $(IDIR_KMOD_FUSE) $(PACKAGE_DIR)