collect/sentinel/sentinel-firewall/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sentinel-firewall
 PKG_VERSION:=0.1.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
 

collect/sentinel/sentinel-firewall/files/functions.sh

-. /lib/functions.sh
+#!/bin/sh
+## sentinel-firewall.sh
+#
+# set of firewall rules handling functions intended to be sourced and reused
+# in sentinel-related scripts
+
+# source OpenWrt functions if not sourced yet
+command -v config_load > /dev/null || . /lib/functions.sh
+
 
 # This function enables given option on firewall zone wan unless it is already set
 # to some value.

collect/sentinel/sentinel-proxy/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sentinel-proxy
 PKG_VERSION:=1.3
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/sentinel/proxy.git

collect/sentinel/sentinel-proxy/files/sentinel.sh

 #!/bin/sh
+## sentinel.sh
+#
+# set of common functions intended to be sourced and reused in
+# sentinel-related scripts
+
+# source OpenWrt functions if not sourced yet
+command -v config_load > /dev/null || . /lib/functions.sh
+
 
 allowed_to_run() {
 	local component_name="$1";

hardware/mox/mox-support/Makefile

@@ -71,7 +71,7 @@ define Package/mox-support/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/init $(1)/etc/init.d/mox_autosetup
 	$(INSTALL_DIR) $(1)/lib/firmware/mrvl/
-	$(INSTALL_DATA) ./files/sd*.bin $(1)/lib/firmware/mrvl
+	$(INSTALL_DATA) ./files/sdsd8997_combo_v4.bin $(1)/lib/firmware/mrvl
 	ln -s sdsd8997_combo_v4.bin $(1)/lib/firmware/mrvl/sd8997_uapsta.bin
 endef