Makefile: sync with OpenWrt repo

Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>

Author: f00b4r0

Makefile

@@ -6,6 +6,7 @@ PKG_RELEASE:=1
 PKG_LICENSE:=GPL-2.0
 PKG_MAINTAINER:=Thibaut VARÈNE <hacks@slashdirt.org>
 
+CMAKE_SOURCE_SUBDIR:=src
 PKG_BUILD_DEPENDS:=bpf-headers
 
 include $(INCLUDE_DIR)/package.mk
@@ -17,10 +18,10 @@ define Package/uspot
   SECTION:=net
   CATEGORY:=Network
   TITLE:=uspot hotspot daemon
-  EXTRA_DEPENDS:=ucode (>= 2023-11-07)
+  EXTRA_DEPENDS:=ucode (>= 2023.11.07)
   DEPENDS:=+conntrack \
 	   +libblobmsg-json +liblucihttp-ucode +libradcli +libubox +libubus +libuci \
-	   +ratelimit +uspotfilter \
+	   +uspotfilter \
 	   +ucode +ucode-mod-log +ucode-mod-math +ucode-mod-nl80211 +ucode-mod-rtnl +uhttpd-mod-ucode +ucode-mod-uloop \
 	   +ucode-mod-bpf +ucode-mod-struct +kmod-sched-core +kmod-sched-bpf $(BPF_DEPENDS)
 endef
@@ -39,7 +40,6 @@ define Package/uspot/conffiles
 /etc/config/uspot
 endef
 
-
 define Package/uspot-www
   SUBMENU:=Captive Portals
   SECTION:=net
@@ -58,8 +58,8 @@ define Package/uspotfilter
   SECTION:=net
   CATEGORY:=Network
   TITLE:=uspot firewall interface
-  EXTRA_DEPENDS:=ucode (>= 2023-11-07)
-  DEPENDS:=+ucode +ucode-mod-log +ucode-mod-uloop +ucode-mod-rtnl +nftables-json +conntrack
+  EXTRA_DEPENDS:=ucode (>= 2023.11.07)
+  DEPENDS:=+conntrack +nftables-json +ucode +ucode-mod-rtnl +ucode-mod-uloop +ucode-mod-log
   PKGARCH:=all
 endef
 
@@ -79,20 +79,20 @@ define Package/uspot/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uspot-das $(1)/usr/bin/uspot-das
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libuam.so $(1)/usr/lib/ucode/uam.so
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/uspot-bpf.o $(1)/lib/bpf/uspot.o
-	$(INSTALL_CONF) ./files/etc/config/uspot $(1)/etc/config/uspot
-	$(INSTALL_BIN) ./files/etc/init.d/uspot $(1)/etc/init.d/uspot
-	$(CP) ./files/usr/bin $(1)/usr/
-	$(CP) ./files/usr/share/uspot $(1)/usr/share/
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/files/etc/config/uspot $(1)/etc/config/uspot
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/init.d/uspot $(1)/etc/init.d/uspot
+	$(CP) $(PKG_BUILD_DIR)/files/usr/bin $(1)/usr/
+	$(CP) $(PKG_BUILD_DIR)/files/usr/share/uspot $(1)/usr/share/
 endef
 
 define Package/uspot-www/install
-	$(CP) ./files/www-uspot $(1)/
+	$(CP) $(PKG_BUILD_DIR)/files/www-uspot $(1)/
 endef
 
 define Package/uspotfilter/install
 	$(INSTALL_DIR) $(1)/usr/share $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/etc/init.d/uspotfilter $(1)/etc/init.d/uspotfilter
-	$(CP) ./files/usr/share/uspotfilter $(1)/usr/share/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/init.d/uspotfilter $(1)/etc/init.d/uspotfilter
+	$(CP) $(PKG_BUILD_DIR)/files/usr/share/uspotfilter $(1)/usr/share/
 endef
 
 $(eval $(call BuildPackage,uspot))