X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/1bf9e140d4d50b841f0bbddd39513df39d156990..489f9455f265caba0edd3488fe9580e36418eb32:/openwrt/target/linux/package/switch/Makefile

diff --git a/openwrt/target/linux/package/switch/Makefile b/openwrt/target/linux/package/switch/Makefile
index 0d597b1f5..cecdccca1 100644
--- a/openwrt/target/linux/package/switch/Makefile
+++ b/openwrt/target/linux/package/switch/Makefile
@@ -9,12 +9,7 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,KMOD_SWITCH,$(PKG_NAME),$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE))))
-
-ifeq ($(KERNEL_DIR),)
-KERNEL_DIR:=$(LINUX_DIR)
-endif
-KERNEL_VERSION=$(shell echo "$(LINUX_VERSION)" | cut -d. -f1,2)
+$(eval $(call PKG_template,KMOD_SWITCH,$(PKG_NAME),$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))))
 
 $(PKG_BUILD_DIR)/.prepared:
 	mkdir -p $(PKG_BUILD_DIR)
@@ -25,14 +20,13 @@ $(PKG_BUILD_DIR)/.configured:
 	touch $@
 
 $(PKG_BUILD_DIR)/.built:
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		PATH="$(TARGET_PATH)" \
-		ARCH="$(LINUX_KARCH)" \
+	$(MAKE) -C "$(LINUX_DIR)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
-		KERNEL_VERSION="$(KERNEL_VERSION)" \
-		KERNEL_DIR="$(KERNEL_DIR)" \
+		ARCH="$(LINUX_KARCH)" \
+		PATH="$(TARGET_PATH)" \
+		SUBDIRS="$(PKG_BUILD_DIR)" \
 		EXTRA_CFLAGS="-DBCMGPIO2" \
-		all
+		modules
 	touch $@
 	
 $(IPKG_KMOD_SWITCH):
@@ -40,8 +34,8 @@ $(IPKG_KMOD_SWITCH):
 	install -m0755 -d $(IDIR_KMOD_SWITCH)/etc/modules.d
 	cp -fpR $(PKG_BUILD_DIR)/*.$(LINUX_KMOD_SUFFIX) \
 		$(IDIR_KMOD_SWITCH)/lib/modules/$(LINUX_VERSION)
-	echo "switch-core" > $(IDIR_KMOD_SWITCH)/etc/modules.d/05-switch
-	echo "switch-robo" >> $(IDIR_KMOD_SWITCH)/etc/modules.d/05-switch
-	echo "switch-adm" >> $(IDIR_KMOD_SWITCH)/etc/modules.d/05-switch
+	echo "switch-core" > $(IDIR_KMOD_SWITCH)/etc/modules.d/50-switch
+	echo "switch-robo" >> $(IDIR_KMOD_SWITCH)/etc/modules.d/50-switch
+	echo "switch-adm" >> $(IDIR_KMOD_SWITCH)/etc/modules.d/50-switch
 	$(IPKG_BUILD) $(IDIR_KMOD_SWITCH) $(PACKAGE_DIR)