mirror of
https://github.com/openwrt/packages.git
synced 2025-12-21 19:14:30 +04:00
openzwave: update to 1.6.1965, disable downloads
The project is abandoned but until we get the ZWave-JS-UI node.js montrosity running in OpenWrt, we need to keep using it. Update to the last available version. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
@@ -9,10 +9,11 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=openzwave
|
PKG_NAME:=openzwave
|
||||||
PKG_VERSION:=1.6.1149
|
PKG_VERSION:=1.6.1965
|
||||||
PKG_RELEASE:=4
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
# Last available tarball; apply update patch from git
|
||||||
|
PKG_SOURCE:=$(PKG_NAME)-1.6.1149.tar.gz
|
||||||
PKG_SOURCE_URL:=http://old.openzwave.com/downloads
|
PKG_SOURCE_URL:=http://old.openzwave.com/downloads
|
||||||
PKG_HASH:=dc747c24cae11e4aa121252cc38ea92d1fbc587dc514737dd0e2b24191521c48
|
PKG_HASH:=dc747c24cae11e4aa121252cc38ea92d1fbc587dc514737dd0e2b24191521c48
|
||||||
PKG_INSTALL:=1
|
PKG_INSTALL:=1
|
||||||
@@ -51,6 +52,8 @@ $(call Package/openzwave/default)
|
|||||||
TITLE:=Open-ZWave Device Configs
|
TITLE:=Open-ZWave Device Configs
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) --strip-components=1
|
||||||
|
|
||||||
TARGET_CPPFLAGS+=-Wno-format -Wno-format-security
|
TARGET_CPPFLAGS+=-Wno-format -Wno-format-security
|
||||||
|
|
||||||
MAKE_FLAGS += \
|
MAKE_FLAGS += \
|
||||||
|
|||||||
27716
utils/openzwave/patches/001-v1.6-1965-g3fff11d2.patch
Normal file
27716
utils/openzwave/patches/001-v1.6-1965-g3fff11d2.patch
Normal file
File diff suppressed because one or more lines are too long
11
utils/openzwave/patches/002-no-auto-update.patch
Normal file
11
utils/openzwave/patches/002-no-auto-update.patch
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
--- a/config/options.xml
|
||||||
|
+++ b/config/options.xml
|
||||||
|
@@ -63,7 +63,7 @@
|
||||||
|
<!-- <Option name="EnforceSecureReception" value="false" /> -->
|
||||||
|
|
||||||
|
<!-- Should OZW automatically download new Config File Versions. Default is true -->
|
||||||
|
- <!-- <Option name="AutoUpdateConfigFile" value="false" /> -->
|
||||||
|
+ <Option name="AutoUpdateConfigFile" value="false" />
|
||||||
|
|
||||||
|
<!-- When we have a new config file for a device, This determine when a device is reloaded
|
||||||
|
so the new connfig file is affected on the device -->
|
||||||
67
utils/openzwave/patches/003-disable-downloads.patch
Normal file
67
utils/openzwave/patches/003-disable-downloads.patch
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
--- a/cpp/src/Driver.cpp
|
||||||
|
+++ b/cpp/src/Driver.cpp
|
||||||
|
@@ -6981,6 +6981,8 @@ bool Driver::setHttpClient(Internal::i_H
|
||||||
|
|
||||||
|
bool Driver::startConfigDownload(uint16 _manufacturerId, uint16 _productType, uint16 _productId, string configfile, uint8 node)
|
||||||
|
{
|
||||||
|
+ // Download server no longer exists - project unmaintained
|
||||||
|
+ return false;
|
||||||
|
Internal::HttpDownload *download = new Internal::HttpDownload();
|
||||||
|
std::stringstream ss;
|
||||||
|
ss << std::hex << std::setw(4) << std::setfill('0') << _productId << ".";
|
||||||
|
@@ -6997,6 +6999,8 @@ bool Driver::startConfigDownload(uint16
|
||||||
|
|
||||||
|
bool Driver::startMFSDownload(string configfile)
|
||||||
|
{
|
||||||
|
+ // Download server no longer exists - project unmaintained
|
||||||
|
+ return false;
|
||||||
|
Internal::HttpDownload *download = new Internal::HttpDownload();
|
||||||
|
download->url = "http://download.db.openzwave.com/mfs.xml";
|
||||||
|
download->filename = configfile;
|
||||||
|
@@ -7009,6 +7013,8 @@ bool Driver::startMFSDownload(string con
|
||||||
|
|
||||||
|
bool Driver::startDownload(string target, string file)
|
||||||
|
{
|
||||||
|
+ // Download server no longer exists - project unmaintained
|
||||||
|
+ return false;
|
||||||
|
Internal::HttpDownload *download = new Internal::HttpDownload();
|
||||||
|
download->url = "http://download.db.openzwave.com/" + file;
|
||||||
|
download->filename = target;
|
||||||
|
--- a/cpp/src/ManufacturerSpecificDB.cpp
|
||||||
|
+++ b/cpp/src/ManufacturerSpecificDB.cpp
|
||||||
|
@@ -330,10 +330,7 @@ namespace OpenZWave
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
- Log::Write(LogLevel_Warning, "Can't download file %s", path.c_str());
|
||||||
|
- Notification* notification = new Notification(Notification::Type_UserAlerts);
|
||||||
|
- notification->SetUserAlertNotification(Notification::Alert_ConfigFileDownloadFailed);
|
||||||
|
- driver->QueueNotification(notification);
|
||||||
|
+ // Silently ignore - download server no longer exists
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (iter != m_downloading.end())
|
||||||
|
@@ -510,10 +507,7 @@ namespace OpenZWave
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
- Log::Write(LogLevel_Warning, "Can't download Config file %s", node->getConfigPath().c_str());
|
||||||
|
- Notification* notification = new Notification(Notification::Type_UserAlerts);
|
||||||
|
- notification->SetUserAlertNotification(Notification::Alert_ConfigFileDownloadFailed);
|
||||||
|
- driver->QueueNotification(notification);
|
||||||
|
+ // Silently ignore - download server no longer exists
|
||||||
|
}
|
||||||
|
checkInitialized();
|
||||||
|
return ret;
|
||||||
|
@@ -532,10 +526,7 @@ namespace OpenZWave
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
- Log::Write(LogLevel_Warning, "Can't download ManufacturerSpecifix.xml Config file");
|
||||||
|
- Notification* notification = new Notification(Notification::Type_UserAlerts);
|
||||||
|
- notification->SetUserAlertNotification(Notification::Alert_ConfigFileDownloadFailed);
|
||||||
|
- driver->QueueNotification(notification);
|
||||||
|
+ // Silently ignore - download server no longer exists
|
||||||
|
}
|
||||||
|
|
||||||
|
checkInitialized();
|
||||||
Reference in New Issue
Block a user