Skip to content

Commit

Permalink
Fixed ARM64 Builds, optimized WebUI compatibility to CCU3
Browse files Browse the repository at this point in the history
  • Loading branch information
alexreinert committed Jun 17, 2019
1 parent d4530c0 commit a7fa919
Show file tree
Hide file tree
Showing 5 changed files with 115 additions and 26,261 deletions.
5 changes: 4 additions & 1 deletion README.md
Expand Up @@ -25,7 +25,7 @@ Die Entwicklung von debmatic ist sehr kostenintensiv, z.B. werden viele verschie

### Vorraussetzung
* Debian basiertes System (Debian, Ubuntu, Raspbian, Armbian)
* Mindestens Kernel 4.9
* Mindestens Kernel 4.9 (Bei ARM64 mind. Kernel 4.14)

### Vorraussetzung für HM-MOD-RPI-PCB und RPI-RF-MOD
* Unterstützter Single Board Computer
Expand All @@ -45,6 +45,9 @@ Die Entwicklung von debmatic ist sehr kostenintensiv, z.B. werden viele verschie
:warning: WARNING: Die Stromversorgung muss über den NanoPC erfolgen auch wenn ein RPI-RF-MOD verwendet wird. Dieses darf dann nicht an ein Netzteil angeschlossen werden.
* NanoPi M4 mit Armbian und Dev kernel (Experimental)
* Rock64 mit Armbian und Dev kernel (Experimental) (LEDs vom RPI-RF-MOD werden hardwaremäßig nicht unterstützt)
* RockPro64 mit Armbian und Dev kernel (Experimental)

:warning: WARNING: Die Stromversorgung muss über den RockPro64 erfolgen auch wenn ein RPI-RF-MOD verwendet wird. Dieses darf dann nicht an ein Netzteil angeschlossen werden.
* Nutzung auf anderen Systemen (auch x64 Systeme) kann per USB mit der Platine [HB-RF-USB](https://github.com/alexreinert/PCB/tree/master/HB-RF-USB) erfolgen.

### Vorbereite Images
Expand Down
90 changes: 56 additions & 34 deletions create_debmatic.sh
Expand Up @@ -6,6 +6,9 @@ ARCHIVE_TAG="$CCU_VERSION"

OCCU_DOWNLOAD_URL="https://github.com/eq-3/occu/archive/$ARCHIVE_TAG.tar.gz"

CCU_DOWNLOAD_SPLASH_URL="http://www.eq-3.de/service/downloads.html?id=307"
CCU_DOWNLOAD_URL="https://www.eq-3.de/Downloads/Software/CCU3-Firmware/CCU3-$CCU_VERSION/ccu3-$CCU_VERSION.tgz"

PKG_BUILD=26

CURRENT_DIR=$(pwd)
Expand All @@ -19,51 +22,70 @@ wget -O occu.tar.gz $OCCU_DOWNLOAD_URL
tar xzf occu.tar.gz
mv occu-$ARCHIVE_TAG repo

cd repo
patch -l -p1 < $CURRENT_DIR/occu-ccu.patch
cd $WORK_DIR/repo
patch -l -p1 < $CURRENT_DIR/occu.patch
mv $WORK_DIR/firmware/HmIP-RFUSB/hmip_coprocessor_update.eq3 $WORK_DIR/firmware/HmIP-RFUSB/hmip_coprocessor_update-2.8.6.eq3

wget -O /dev/null --save-cookies=cookies.txt --keep-session-cookies $CCU_DOWNLOAD_SPLASH_URL
wget -O ccu3.tar.gz --load-cookies=cookies.txt --referer=$CCU_DOWNLOAD_SPLASH_URL $CCU_DOWNLOAD_URL

tar xzf ccu3.tar.gz

gunzip rootfs.ext4.gz

mkdir $WORK_DIR/image
mount -t ext4 -o loop,ro rootfs.ext4 $WORK_DIR/image

mkdir $WORK_DIR/ccu
cp -pR $WORK_DIR/image/* $WORK_DIR/ccu/

umount $WORK_DIR/image

cd $WORK_DIR/ccu
patch -l -p1 < $CURRENT_DIR/debmatic.patch

cd $WORK_DIR

declare -A architectures=(["armhf"]="arm-gnueabihf" ["arm64"]="arm-gnueabihf" ["amd64"]="X86_32_Debian_Wheezy")
declare -A architectures=(["armhf"]="arm-gnueabihf" ["arm64"]="arm-gnueabihf" ["i386"]="X86_32_Debian_Wheezy" ["amd64"]="X86_32_Debian_Wheezy")
for ARCH in "${!architectures[@]}"
do
ARCH_SOURCE_DIR=${architectures[$ARCH]}

TARGET_DIR=$WORK_DIR/debmatic-$PKG_VERSION-$ARCH

mkdir -p $TARGET_DIR/bin
cp -pR repo/WebUI/bin/* $TARGET_DIR/bin/
cp -pR repo/$ARCH_SOURCE_DIR/packages-eQ-3/HS485D/bin/* $TARGET_DIR/bin/
cp -pR repo/$ARCH_SOURCE_DIR/packages-eQ-3/RFD/bin/* $TARGET_DIR/bin/
cp -pR repo/$ARCH_SOURCE_DIR/packages-eQ-3/WebUI/bin/* $TARGET_DIR/bin/
cp -pR repo/$ARCH_SOURCE_DIR/packages-eQ-3/LinuxBasis/bin/* $TARGET_DIR/bin/

mkdir -p $TARGET_DIR/lib/
cp -pR repo/$ARCH_SOURCE_DIR/packages-eQ-3/HS485D/lib/* $TARGET_DIR/lib/
cp -pR repo/$ARCH_SOURCE_DIR/packages-eQ-3/RFD/lib/* $TARGET_DIR/lib/
cp -pR repo/$ARCH_SOURCE_DIR/packages-eQ-3/WebUI/lib/* $TARGET_DIR/lib/
cp -pR repo/$ARCH_SOURCE_DIR/packages-eQ-3/LinuxBasis/lib/* $TARGET_DIR/lib/

mkdir -p $TARGET_DIR/firmware
cp -pR repo/firmware/* $TARGET_DIR/firmware/
mv $TARGET_DIR/firmware/HmIP-RFUSB/hmip_coprocessor_update.eq3 $TARGET_DIR/firmware/HmIP-RFUSB/hmip_coprocessor_update-2.8.6.eq3

mkdir -p $TARGET_DIR/opt/HMServer
cp -pR repo/HMserver/opt/HMServer/* $TARGET_DIR/opt/HMServer/

mkdir -p $TARGET_DIR/opt/HmIP
cp -pR repo/HMserver/opt/HmIP/* $TARGET_DIR/opt/HmIP/

mkdir -p $TARGET_DIR/www
cp -pR repo/WebUI/www/* $TARGET_DIR/www/
cp -pR repo/$ARCH_SOURCE_DIR/packages-eQ-3/RFD/www/config/* $TARGET_DIR/www/config/

for file in `find $TARGET_DIR/www -type l`; do
target=`readlink $file | sed 's/^\/opt\/hm//g'`
rm $file
ln -s $target $file
done
cp -pR $WORK_DIR/ccu/bin/hm_* $TARGET_DIR/bin/
cp -pR $WORK_DIR/repo/$ARCH_SOURCE_DIR/packages-eQ-3/HS485D/bin/* $TARGET_DIR/bin/
cp -pR $WORK_DIR/repo/$ARCH_SOURCE_DIR/packages-eQ-3/RFD/bin/* $TARGET_DIR/bin/
cp -pR $WORK_DIR/repo/$ARCH_SOURCE_DIR/packages-eQ-3/WebUI/bin/* $TARGET_DIR/bin/
cp -pR $WORK_DIR/repo/$ARCH_SOURCE_DIR/packages-eQ-3/LinuxBasis/bin/* $TARGET_DIR/bin/

mkdir -p $TARGET_DIR/lib/debmatic
cp -pR $WORK_DIR/repo/$ARCH_SOURCE_DIR/packages-eQ-3/HS485D/lib/* $TARGET_DIR/lib/
cp -pR $WORK_DIR/repo/$ARCH_SOURCE_DIR/packages-eQ-3/RFD/lib/* $TARGET_DIR/lib/
cp -pR $WORK_DIR/repo/$ARCH_SOURCE_DIR/packages-eQ-3/WebUI/lib/* $TARGET_DIR/lib/
cp -pR $WORK_DIR/repo/$ARCH_SOURCE_DIR/packages-eQ-3/LinuxBasis/lib/* $TARGET_DIR/lib/

if [ "$ARCH" == "arm64" ]; then
for file in avrprog crypttool eq3configcmd eq3configd eq3-uds-services hs485d hs485dLoader hss_led multimacd ReGaHss.community ReGaHss.normal rfd SetInterfaceClock ssdpd tclsh; do
cp $WORK_DIR/ccu/bin/$file $TARGET_DIR/bin/
done

for file in ld-linux-armhf.so.3 libelvutils.so libeq3config.so libeq3udss.so libhsscomm.so libLanDeviceUtils.so libtcl8.2.so libUnifiedLanComm.so libxmlparser.so libXmlRpc.so tclrega.so tclrpc.so tclticks.so libc.so.6 libdl.so.2 libgcc_s.so.1 libm.so.6 libpthread.so.0 librt.so.1 libstdc++.so.6; do
cp $WORK_DIR/ccu/lib/$file $TARGET_DIR/lib/ || cp $WORK_DIR/ccu/usr/lib/$file $TARGET_DIR/lib/
done
fi

cp -pR $WORK_DIR/ccu/firmware $TARGET_DIR/
cp -pR $WORK_DIR/repo/firmware/HM-MOD-UART $TARGET_DIR/firmware/
cp -pR $WORK_DIR/repo/firmware/HmIP-RFUSB $TARGET_DIR/firmware/

mkdir -p $TARGET_DIR/opt
cp -pR $WORK_DIR/ccu/opt/HMServer $TARGET_DIR/opt/
cp -p $WORK_DIR/repo/HMserver/opt/HMServer/HMServer.jar $TARGET_DIR/opt/HMServer/
cp -pR $WORK_DIR/ccu/opt/HmIP $TARGET_DIR/opt/

cp -pR $WORK_DIR/ccu/www $TARGET_DIR/

# mkdir -p $TARGET_DIR/usr/share/debmatic/bin/lighttpd/lib
# cp -p repo/$ARCH_SOURCE_DIR/packages/lighttpd/bin/* $TARGET_DIR/usr/share/debmatic/bin/lighttpd
Expand Down
88 changes: 33 additions & 55 deletions debmatic.patch
@@ -1,28 +1,6 @@
diff -ruN occu-3.45.7.ccu-patched/firmware/HmIP-RFUSB/fwmap occu-3.45.7.patched/firmware/HmIP-RFUSB/fwmap
--- occu-3.45.7.ccu-patched/firmware/HmIP-RFUSB/fwmap 2019-04-19 09:56:36.000000000 +0200
+++ occu-3.45.7.patched/firmware/HmIP-RFUSB/fwmap 2019-04-20 22:14:08.474450312 +0200
@@ -1,4 +1,4 @@
#Type Filename Version

#Coprozessor
-CCU2 hmip_coprocessor_update.eq3 2.8.4 # HmIP Only CoProzessor RPI-RF-MOD
+CCU2 hmip_coprocessor_update.eq3 2.8.6 # HmIP Only CoProzessor RPI-RF-MOD
diff -ruN occu-3.45.7.ccu-patched/firmware/HM-MOD-UART/fwmap occu-3.45.7.patched/firmware/HM-MOD-UART/fwmap
--- occu-3.45.7.ccu-patched/firmware/HM-MOD-UART/fwmap 2019-04-19 09:56:36.000000000 +0200
+++ occu-3.45.7.patched/firmware/HM-MOD-UART/fwmap 2019-04-20 22:14:08.478450338 +0200
@@ -1,7 +1,7 @@
#Type Filename Version

#Coprozessor
-CCU2 coprocessor_update.eq3 1.4.1 # CoProzessor HM-MOD-UART
+#CCU2 coprocessor_update.eq3 1.4.1 # CoProzessor HM-MOD-UART

-#CCU2 dualcopro_si1002_update_blhm.eq3 2.8.6 # Dual CoProzessor HM-MOD-UART
+CCU2 dualcopro_si1002_update_blhm.eq3 2.8.6 # Dual CoProzessor HM-MOD-UART

diff -ruN occu-3.45.7.ccu-patched/WebUI/www/api/methods/user/restarthmipserver.tcl occu-3.45.7.patched/WebUI/www/api/methods/user/restarthmipserver.tcl
--- occu-3.45.7.ccu-patched/WebUI/www/api/methods/user/restarthmipserver.tcl 2019-04-19 09:56:36.000000000 +0200
+++ occu-3.45.7.patched/WebUI/www/api/methods/user/restarthmipserver.tcl 2019-04-20 22:14:08.478450338 +0200
diff -ruN --no-dereference fw.3.45.7.orig/www/api/methods/user/restarthmipserver.tcl fw.3.45.7.debmatic/www/api/methods/user/restarthmipserver.tcl
--- fw.3.45.7.orig/www/api/methods/user/restarthmipserver.tcl 2019-04-02 14:39:54.000000000 +0200
+++ fw.3.45.7.debmatic/www/api/methods/user/restarthmipserver.tcl 2019-06-17 09:57:18.948948563 +0200
@@ -7,6 +7,5 @@
#
# Rückgabewert: true
Expand All @@ -31,9 +9,9 @@ diff -ruN occu-3.45.7.ccu-patched/WebUI/www/api/methods/user/restarthmipserver.t
-exec -- /usr/bin/nohup /etc/init.d/S62HMServer restart >/dev/null &
+exec systemctl restart debmatic-hmserver.service
jsonrpc_response true
diff -ruN occu-3.45.7.ccu-patched/WebUI/www/api/methods/user/restartlighttpd.tcl occu-3.45.7.patched/WebUI/www/api/methods/user/restartlighttpd.tcl
--- occu-3.45.7.ccu-patched/WebUI/www/api/methods/user/restartlighttpd.tcl 2019-04-19 09:56:36.000000000 +0200
+++ occu-3.45.7.patched/WebUI/www/api/methods/user/restartlighttpd.tcl 2019-04-20 22:14:08.478450338 +0200
diff -ruN --no-dereference fw.3.45.7.orig/www/api/methods/user/restartlighttpd.tcl fw.3.45.7.debmatic/www/api/methods/user/restartlighttpd.tcl
--- fw.3.45.7.orig/www/api/methods/user/restartlighttpd.tcl 2019-04-02 14:39:54.000000000 +0200
+++ fw.3.45.7.debmatic/www/api/methods/user/restartlighttpd.tcl 2019-06-17 09:57:18.952948591 +0200
@@ -7,8 +7,7 @@
#
# Rückgabewert: true
Expand All @@ -45,9 +23,9 @@ diff -ruN occu-3.45.7.ccu-patched/WebUI/www/api/methods/user/restartlighttpd.tcl
+exec systemctl restart debmatic-lighttpd.service

jsonrpc_response true
diff -ruN occu-3.45.7.ccu-patched/WebUI/www/config/control_panel.cgi occu-3.45.7.patched/WebUI/www/config/control_panel.cgi
--- occu-3.45.7.ccu-patched/WebUI/www/config/control_panel.cgi 2019-04-20 22:07:02.659631092 +0200
+++ occu-3.45.7.patched/WebUI/www/config/control_panel.cgi 2019-04-20 22:14:08.478450338 +0200
diff -ruN --no-dereference fw.3.45.7.orig/www/config/control_panel.cgi fw.3.45.7.debmatic/www/config/control_panel.cgi
--- fw.3.45.7.orig/www/config/control_panel.cgi 2019-04-02 14:39:51.000000000 +0200
+++ fw.3.45.7.debmatic/www/config/control_panel.cgi 2019-06-17 09:57:18.984948810 +0200
@@ -102,16 +102,6 @@
}
}
Expand Down Expand Up @@ -113,9 +91,9 @@ diff -ruN occu-3.45.7.ccu-patched/WebUI/www/config/control_panel.cgi occu-3.45.7

puts {
<!-- Kopplungen -->
diff -ruN occu-3.45.7.ccu-patched/WebUI/www/config/cp_maintenance.cgi occu-3.45.7.patched/WebUI/www/config/cp_maintenance.cgi
--- occu-3.45.7.ccu-patched/WebUI/www/config/cp_maintenance.cgi 2019-04-20 22:07:02.659631092 +0200
+++ occu-3.45.7.patched/WebUI/www/config/cp_maintenance.cgi 2019-04-20 22:14:08.486450390 +0200
diff -ruN --no-dereference fw.3.45.7.orig/www/config/cp_maintenance.cgi fw.3.45.7.debmatic/www/config/cp_maintenance.cgi
--- fw.3.45.7.orig/www/config/cp_maintenance.cgi 2019-04-02 14:39:54.000000000 +0200
+++ fw.3.45.7.debmatic/www/config/cp_maintenance.cgi 2019-06-17 09:57:18.984948810 +0200
@@ -389,151 +389,10 @@
# The available version will be set further down with "jQuery('#availableSWVersion').html(homematic.com.getLatestVersion());"
}
Expand Down Expand Up @@ -316,9 +294,9 @@ diff -ruN occu-3.45.7.ccu-patched/WebUI/www/config/cp_maintenance.cgi occu-3.45.

puts "Content-Type:application/x-download"
puts "Content-Disposition:attachment;filename=[set HOSTNAME]-$year-$month-$day.log\n"
diff -ruN occu-3.45.7.ccu-patched/WebUI/www/config/cp_security.cgi occu-3.45.7.patched/WebUI/www/config/cp_security.cgi
--- occu-3.45.7.ccu-patched/WebUI/www/config/cp_security.cgi 2019-04-19 09:56:36.000000000 +0200
+++ occu-3.45.7.patched/WebUI/www/config/cp_security.cgi 2019-04-20 22:14:08.486450390 +0200
diff -ruN --no-dereference fw.3.45.7.orig/www/config/cp_security.cgi fw.3.45.7.debmatic/www/config/cp_security.cgi
--- fw.3.45.7.orig/www/config/cp_security.cgi 2019-04-02 14:39:54.000000000 +0200
+++ fw.3.45.7.debmatic/www/config/cp_security.cgi 2019-06-17 09:57:18.984948810 +0200
@@ -296,7 +296,6 @@
} else {
exec touch /usr/local/.doFactoryReset
Expand Down Expand Up @@ -527,9 +505,9 @@ diff -ruN occu-3.45.7.ccu-patched/WebUI/www/config/cp_security.cgi occu-3.45.7.p
}

proc _version_compare { v1 v2 } {
diff -ruN occu-3.45.7.ccu-patched/WebUI/www/config/cp_time.cgi occu-3.45.7.patched/WebUI/www/config/cp_time.cgi
--- occu-3.45.7.ccu-patched/WebUI/www/config/cp_time.cgi 2019-04-19 09:56:36.000000000 +0200
+++ occu-3.45.7.patched/WebUI/www/config/cp_time.cgi 2019-04-20 22:14:08.490450417 +0200
diff -ruN --no-dereference fw.3.45.7.orig/www/config/cp_time.cgi fw.3.45.7.debmatic/www/config/cp_time.cgi
--- fw.3.45.7.orig/www/config/cp_time.cgi 2019-04-02 14:39:54.000000000 +0200
+++ fw.3.45.7.debmatic/www/config/cp_time.cgi 2019-06-17 09:57:18.984948810 +0200
@@ -144,7 +144,7 @@
global env LOCATIONS TIMEZONES

Expand Down Expand Up @@ -640,9 +618,9 @@ diff -ruN occu-3.45.7.ccu-patched/WebUI/www/config/cp_time.cgi occu-3.45.7.patch
set country ""
foreach location $LOCATIONS {
if { [lindex $location 0] == "-" } {
diff -ruN occu-3.45.7.ccu-patched/WebUI/www/config/help.cgi occu-3.45.7.patched/WebUI/www/config/help.cgi
--- occu-3.45.7.ccu-patched/WebUI/www/config/help.cgi 2019-04-19 09:56:36.000000000 +0200
+++ occu-3.45.7.patched/WebUI/www/config/help.cgi 2019-04-20 22:14:08.494450443 +0200
diff -ruN --no-dereference fw.3.45.7.orig/www/config/help.cgi fw.3.45.7.debmatic/www/config/help.cgi
--- fw.3.45.7.orig/www/config/help.cgi 2019-04-02 14:39:51.000000000 +0200
+++ fw.3.45.7.debmatic/www/config/help.cgi 2019-06-17 09:57:19.056949299 +0200
@@ -3,8 +3,8 @@
source common.tcl
load tclrega.so
Expand All @@ -662,9 +640,9 @@ diff -ruN occu-3.45.7.ccu-patched/WebUI/www/config/help.cgi occu-3.45.7.patched/
puts "<li><a target='_blank' href='/licenseinfo.htm'>\${lblLicenseInformation}</a></li>"
puts "</ul>"
puts "</td>"
diff -ruN occu-3.45.7.ccu-patched/WebUI/www/rega/pages/index.htm occu-3.45.7.patched/WebUI/www/rega/pages/index.htm
--- occu-3.45.7.ccu-patched/WebUI/www/rega/pages/index.htm 2019-04-20 22:07:02.883632574 +0200
+++ occu-3.45.7.patched/WebUI/www/rega/pages/index.htm 2019-04-20 22:18:22.928136178 +0200
diff -ruN --no-dereference fw.3.45.7.orig/www/rega/pages/index.htm fw.3.45.7.debmatic/www/rega/pages/index.htm
--- fw.3.45.7.orig/www/rega/pages/index.htm 2019-04-02 14:43:28.000000000 +0200
+++ fw.3.45.7.debmatic/www/rega/pages/index.htm 2019-06-17 09:57:19.068949382 +0200
@@ -71,7 +71,7 @@
/*########################################################################*/

Expand All @@ -674,9 +652,9 @@ diff -ruN occu-3.45.7.ccu-patched/WebUI/www/rega/pages/index.htm occu-3.45.7.pat

/**
* Flags
diff -ruN occu-3.45.7.ccu-patched/WebUI/www/webui/js/lang/de/translate.lang.js occu-3.45.7.patched/WebUI/www/webui/js/lang/de/translate.lang.js
--- occu-3.45.7.ccu-patched/WebUI/www/webui/js/lang/de/translate.lang.js 2019-04-19 09:56:36.000000000 +0200
+++ occu-3.45.7.patched/WebUI/www/webui/js/lang/de/translate.lang.js 2019-04-20 22:14:08.494450443 +0200
diff -ruN --no-dereference fw.3.45.7.orig/www/webui/js/lang/de/translate.lang.js fw.3.45.7.debmatic/www/webui/js/lang/de/translate.lang.js
--- fw.3.45.7.orig/www/webui/js/lang/de/translate.lang.js 2019-04-02 14:39:54.000000000 +0200
+++ fw.3.45.7.debmatic/www/webui/js/lang/de/translate.lang.js 2019-06-17 09:57:19.068949382 +0200
@@ -458,6 +458,7 @@
"dialogSettingsCMTDCCUSafeMode" : "Abgesicherter<br/>Modus",
"dialogSettingsCMTDErrorProtocol" : "Fehler-<br/>protokoll",
Expand All @@ -685,9 +663,9 @@ diff -ruN occu-3.45.7.ccu-patched/WebUI/www/webui/js/lang/de/translate.lang.js o
"dialogSettingsCMLblAvailableSoftwareVersion" : "Verf%FCgbare Software-Version:",
"dialogSettingsCMLblPerformSoftwareUpdate" : "Software-Update durchf%FChren",
"dialogSettingsCMLblPerformSoftwareUpdateStep1" : "Schritt 1: Neue Software herunterladen",
diff -ruN occu-3.45.7.ccu-patched/WebUI/www/webui/js/lang/en/translate.lang.js occu-3.45.7.patched/WebUI/www/webui/js/lang/en/translate.lang.js
--- occu-3.45.7.ccu-patched/WebUI/www/webui/js/lang/en/translate.lang.js 2019-04-19 09:56:36.000000000 +0200
+++ occu-3.45.7.patched/WebUI/www/webui/js/lang/en/translate.lang.js 2019-04-20 22:14:08.494450443 +0200
diff -ruN --no-dereference fw.3.45.7.orig/www/webui/js/lang/en/translate.lang.js fw.3.45.7.debmatic/www/webui/js/lang/en/translate.lang.js
--- fw.3.45.7.orig/www/webui/js/lang/en/translate.lang.js 2019-04-02 14:39:54.000000000 +0200
+++ fw.3.45.7.debmatic/www/webui/js/lang/en/translate.lang.js 2019-06-17 09:57:19.068949382 +0200
@@ -457,6 +457,7 @@
"dialogSettingsCMTDCCUSafeMode" : "Safe<br/>mode",
"dialogSettingsCMTDErrorProtocol" : "Error<br/>log",
Expand All @@ -696,9 +674,9 @@ diff -ruN occu-3.45.7.ccu-patched/WebUI/www/webui/js/lang/en/translate.lang.js o
"dialogSettingsCMLblAvailableSoftwareVersion" : "Available software version:",
"dialogSettingsCMLblPerformSoftwareUpdate" : "Perform software update",
"dialogSettingsCMLblPerformSoftwareUpdateStep1" : "Step 1: Download new software",
diff -ruN occu-3.45.7.ccu-patched/WebUI/www/webui/webui.js occu-3.45.7.patched/WebUI/www/webui/webui.js
--- occu-3.45.7.ccu-patched/WebUI/www/webui/webui.js 2019-04-20 22:07:02.979633209 +0200
+++ occu-3.45.7.patched/WebUI/www/webui/webui.js 2019-04-20 22:14:08.502450495 +0200
diff -ruN --no-dereference fw.3.45.7.orig/www/webui/webui.js fw.3.45.7.debmatic/www/webui/webui.js
--- fw.3.45.7.orig/www/webui/webui.js 2019-04-02 14:39:55.000000000 +0200
+++ fw.3.45.7.debmatic/www/webui/webui.js 2019-06-17 09:57:19.076949438 +0200
@@ -6105,12 +6105,7 @@
WebUI.resize();
jQuery(".Layer0").show();
Expand Down

0 comments on commit a7fa919

Please sign in to comment.