Skip to content

Commit

Permalink
finalize the update_patchfiles.sh helper script for automatically
Browse files Browse the repository at this point in the history 
updating all patchable orig files with the ones from OCCU and ensuring
or fixing the proper patch hierarchy with increasing patch number. This
should fix recent patch failures with buildroot 2024.08 which allows
patches with fuzz 0 only, thus was breaking for our OCCU patches.
  • Loading branch information
@jens-maus
jens-maus committed Sep 12, 2024
1 parent c653b66 commit 5cc94d7
Show file tree
Hide file tree
Showing 971 changed files with 1,369,295 additions and 474,905 deletions.
24 changes: 12 additions & 12 deletions buildroot-external/patches/occu/0001-RaspberryMatic.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,23 +114,23 @@
table_row {class="CLASS20902 j_noForcedUpdate j_fwUpdateOnly"} {
--- occu/WebUI/www/config/cp_network.cgi.orig
+++ occu/WebUI/www/config/cp_network.cgi
@@ -322,6 +322,7 @@
@@ -225,6 +225,7 @@
cgi_text hostname=$hostname {id="text_hostname"}
}
}
+ if {[get_platform] != "oci"} {
table_row {
set checked ""
if {! $dhcp} { set checked "checked=true" }
@@ -412,6 +413,7 @@
@@ -315,6 +316,7 @@
}

}
+ }
}
}
table_data {class="CLASS21113"} {align="left"} {
@@ -604,12 +606,21 @@
@@ -440,12 +442,21 @@
OnOK = function() {
var pb = "action=save_settings";
pb += "&hostname="+document.getElementById("text_hostname").value;
Expand All @@ -152,7 +152,7 @@

var opts = {
postBody: pb,
@@ -710,7 +721,9 @@
@@ -546,7 +557,9 @@
},timeDelay);
};
}
Expand Down Expand Up @@ -626,7 +626,7 @@

<link rel="stylesheet" type="text/css" href="/webui/css/extern/nfs_datepicker.css" />
<link rel="stylesheet" type="text/css" href="/webui/css/extern/jquery.powertip.css" />
@@ -69,7 +69,8 @@
@@ -72,7 +72,8 @@
/*########################################################################*/

PLATFORM = "Central";
Expand All @@ -636,7 +636,7 @@

/**
* Flags
@@ -193,7 +194,7 @@
@@ -198,7 +199,7 @@
<div id="webuiloader_wrapper">
<div id="webuiloader_background">
<div id="webuiloader">
Expand Down Expand Up @@ -697,15 +697,15 @@
"BidCosRF" : "Homematic Funk",
"BidCosWired" : "Homematic Wired",
"VirtualDevices" : "VirtualDevices",
@@ -460,6 +460,7 @@
@@ -463,6 +463,7 @@
"dialogSettingsCMLblActualSoftwareVersion" : "Aktuelle Software-Version:",
"dialogSettingsCMLblAvailableSoftwareVersion" : "Verf%FCgbare Software-Version:",
"dialogSettingsCMLblPerformSoftwareUpdate" : "Software-Update durchf%FChren",
+ "dialogSettingsCMLblPerformSoftwareUpdateVirt" : "Wenn Sie ein Update der RaspberryMatic Version durchf%FChren wollen, so k%F6nnen Sie dies im Kontext ihrer eingesetzten Virtualisierungsl%F6sung (HomeAssistant, Docker, LXC, etc.) durchf%FChren. Bitte konsultieren Sie hierzu die entsprechende RaspberryMatic Dokumentation.",
"dialogSettingsCMLblPerformSoftwareUpdateStep1" : "Schritt 1: Neue Software herunterladen",
"dialogSettingsCMLblPerformSoftwareUpdateStep2" : "Schritt 2: Heruntergeladene Software ausw%E4hlen",
"dialogSettingsCMLblPerformSoftwareUpdateStep3" : "Schritt 3: Software auf " + HMIdentifier.de.CCUShortName + " laden",
@@ -483,6 +484,7 @@
@@ -486,6 +487,7 @@
"dialogSettingsCMHintSoftwareUpdate3" : "F%FChren Sie vor dem Update eine Datensicherung durch.",
"dialogSettingsCMHintSoftwareUpdate4a" : "Der Ladezustand der Batterien betr%E4gt nur noch ",
"dialogSettingsCMHintSoftwareUpdate4b" : "Um einem Datenverlust durch Ausfall der Stromversorgung vorzubeugen, empfehlen wir, die Batterien vor dem Update zu erneuern.",
Expand Down Expand Up @@ -737,7 +737,7 @@
"dialogSettingsStorageHintUSBStorageP1" : "Storage of data only includes the diagrams.",
"dialogSettingsSecurityTDAuth" : "Authentication",
"dialogSettingsSecurityLblActivateAuthRemoteXML" : "Authentication active: ",
@@ -1038,4 +1038,4 @@
@@ -1073,4 +1073,4 @@
});

langJSON.en.hintActivateDetectorSelfTest += langJSON.en.checkSmokeDetectorSelfTest;
Expand All @@ -757,16 +757,16 @@
+ "CCUShortName" : "RaspMatic",
"BidCosRF" : "Homematic RF",
"BidCosWired" : "BidCos-Wired",
"HmIPRF" : "HmIP-RF",
@@ -454,6 +454,7 @@
"BidCosRF-Filter" : "BidCos-RF",
@@ -462,6 +462,7 @@
"dialogSettingsCMLblActualSoftwareVersion" : "Current software version:",
"dialogSettingsCMLblAvailableSoftwareVersion" : "Available software version:",
"dialogSettingsCMLblPerformSoftwareUpdate" : "Perform software update",
+ "dialogSettingsCMLblPerformSoftwareUpdateVirt" : "If you want to update the RaspberryMatic version, you can do this in the context of the virtualization solution you are using (HomeAssistant, Docker, LXC, etc.). Please consult the corresponding RaspberryMatic documentation.",
"dialogSettingsCMLblPerformSoftwareUpdateStep1" : "Step 1: Download new software",
"dialogSettingsCMLblPerformSoftwareUpdateStep2" : "Step 2: Select downloaded software",
"dialogSettingsCMLblPerformSoftwareUpdateStep3" : "Step 3: Upload software to " + HMIdentifier.en.CCUShortName,
@@ -477,6 +478,7 @@
@@ -485,6 +486,7 @@
"dialogSettingsCMHintSoftwareUpdate3" : "Please perform a data backup before starting the update.",
"dialogSettingsCMHintSoftwareUpdate4a" : "The charging status the batteries is only at ",
"dialogSettingsCMHintSoftwareUpdate4b" : "To prevent from data loss due to power failure, it is recommended to replace the batteries before starting the update.",
Expand Down
192 changes: 10 additions & 182 deletions buildroot-external/patches/occu/0001-RaspberryMatic/occu/WebUI/www/config/cp_network.cgi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,87 +7,6 @@ sourceOnce common.tcl
load tclrpc.so
load tclrega.so

set REMOTE_CERT_SCRIPT "http://www.homematic.com/sslcert/ssl.php"

proc action_get_cert {} {
global env REMOTE_CERT_SCRIPT sid

}

proc action_cert_update_confirm {} {
global env

http_head
division {class="popupTitle"} {
#puts "Netzwerk-Sicherheit"
puts "\${dialogSettingsNetworkMessageCertificateTitle}"
}
division {class="CLASS21100"} {
table {class="popupTable"} {border="0"} {
table_row {
table_data {
table {class="CLASS21106"} {
table_row {
table_data {colspan="2"} {
puts "\${dialogSettingsNetworkMessageCertificateUploadSucceed}"
}
}
table_row {
table_data {
#puts "Schritt 4: Zentrale neu starten"
puts "\${dialogSettingsNetworkCertificateLblStep4}"
}
table_data {
division {class="popupControls CLASS21107"} {
table {
table_row {
table_data {
division {class="CLASS21110"} {onClick="UpdateGo();"} {
#puts "Neu starten"
puts "\${btnNewStart}"
}
}
}
}
}
}
}
}
}
}
}
}
division {class="popupControls"} {
table {
table_row {
table_data {class="CLASS21103"} {
division {class="CLASS21104"} {onClick="OnBack();"} {
#puts "Zur&uuml;ck"
puts "\${dialogBack}"
}
}
}
}
}
puts ""
cgi_javascript {
puts "var url = \"$env(SCRIPT_NAME)?sid=\" + SessionId;"
puts {
UpdateGo = function() {
dlgPopup.hide();
dlgPopup.setWidth(400);
dlgPopup.LoadFromFile(url, "action=cert_update_go");
}
OnBack = function() {
dlgPopup.hide();
dlgPopup.setWidth(800);
dlgPopup.LoadFromFile(url);
}
}
puts "translatePage('#messagebox');"
}
}

proc action_cert_update_failed {} {
global env

Expand Down Expand Up @@ -139,34 +58,18 @@ proc action_cert_update_failed {} {
}
}


proc action_reboot {} {
exec /sbin/reboot
}

proc action_cert_update_go {} {
global env

http_head

put_message "\${dialogSettingsNetworkMessageCertificateTitle}" "\${dialogSettingsNetworkMessageCertificateCCURestart}" {\${btnNewLogin} "window.location.href='/';"}

#save DOM
rega system.Save()

puts ""
cgi_javascript {
puts "var url = \"$env(SCRIPT_NAME)?sid=\" + SessionId;"
puts {
var pb = "action=reboot";
var opts = {
postBody: pb,
sendXML: false
};
new Ajax.Request(url, opts);
homematic("User.restartLighttpd", {}, function(){
MessageBox.show(translateKey("dialogRestartWebserverTitle"),translateKey("dialogRestartWebserverContent"));
window.setTimeout(function() {window.location.protocol = "http";},2000);
});
}
puts "translatePage('#messagebox');"
}
}
}


Expand Down Expand Up @@ -265,7 +168,7 @@ proc action_cert_upload {} {
puts {
parent.top.dlgPopup.hide();
parent.top.dlgPopup.setWidth(600);
parent.top.dlgPopup.LoadFromFile(url, "action=cert_update_confirm");
parent.top.dlgPopup.LoadFromFile(url, "action=cert_update_go");
}
}
} else {
Expand All @@ -286,7 +189,7 @@ proc action_update_start {} {


proc action_put_page {} {
global env REMOTE_CERT_SCRIPT sid
global env sid

set ip ""
set mask ""
Expand Down Expand Up @@ -431,56 +334,7 @@ proc action_put_page {} {
table_data {class="CLASS21113"} {width="400"} {
table {class="CLASS21111"} {
set email [get_user_email]
table_row {
table_data {width="20"} {}
table_data {colspan="2" align="left"} {
#puts "Schritt 1: Daten eingeben"
puts "\${dialogSettingsNetworkCertificateLblStep1}"
}
}
table_row {
table_data {width="20"} {}
table_data {align="left"} {
#puts "Hostname:"
puts "\${dialogSettingsNetworkCertificateLblHostname}"
}
table_data {align="right"} {
cgi_text url=$env(HTTP_HOST) {size="35"} {id="text_url"} {type="text"}
}

table_data {id="text_url_hint"} {class="attention hidden"} {
puts "\${invalidIP}"
}

}
table_row {
table_data {width="20"} {}
table_data {align="left"} {
#puts "E-Mail Adresse:"
puts "\${dialogSettingsNetworkCertificateLblEMail}"
}
table_data {align="right"} {
cgi_text mail=$email {size="35"} {id="text_mail"} {type="text"}
}
}
table_row {
table_data {width="20"} {}
table_data {colspan="2" align="left"} {
#puts "Land (DE, UK, etc.):"
puts "\${dialogSettingsNetworkCertificateLblCountry}"
cgi_text country=DE {size="2"} {id="text_country"} {type="text"}
}
}
table_row {
table_data {align="right"} {class="CLASS21112"} {colspan="3"} {
division {class="popupControls CLASS21107"} {
division {class="CLASS21117"} {onClick="OnGetCert()"} {
#puts "Zertifikat erstellen"
puts "\${dialogSettingsNetworkCertificateBtnCreateCert}"
}
}
}
}
table_row {
table_data {width="20"} {}
table_data {colspan="2" align="left"} {
Expand Down Expand Up @@ -519,13 +373,6 @@ proc action_put_page {} {
}
}
}
table_row {
table_data {width="20"} {}
table_data {colspan="2" align="left"} {class="CLASS21118"} {
#puts "Schritt 4: Zentrale neu starten"
puts "\${dialogSettingsNetworkCertificateLblStep4}"
}
}

table_row {name="deleteCertificate"} {class="hidden"} {
table_data {colspan="4"} {
Expand Down Expand Up @@ -562,19 +409,8 @@ proc action_put_page {} {
}
table_data {class="CLASS21113"} {align="left"} {
p {${dialogSettingsNetworkHintCertificateP1}}

p {
${dialogSettingsNetworkHintCertificateP2}
<ol>
<li>${dialogSettingsNetworkHintCertificateP2a}</li>
<li>${dialogSettingsNetworkHintCertificateP2b}</li>
<li>${dialogSettingsNetworkHintCertificateP2c}</li>
<li>${dialogSettingsNetworkHintCertificateP2d}</li>
</ol>
}
p {${dialogSettingsNetworkHintCertificateP2}}
p {${dialogSettingsNetworkHintCertificateP3}}


}
}
}
Expand Down Expand Up @@ -729,18 +565,10 @@ proc action_put_page {} {
}
set serial [get_serial]
cgi_javascript {
puts "var cert_url = \"$REMOTE_CERT_SCRIPT?serial=$serial\";"
puts {
OnGetCert = function() {
cert_url += "&country="+document.getElementById("text_country").value;
cert_url += "&url="+document.getElementById("text_url").value;
cert_url += "&mail="+document.getElementById("text_mail").value;
window.location.href=cert_url;
};


deleteCert = function() {
var textA = "<div>" + translateKey('confirmCertificationPurgeA') + "<br/><br/></div>" +
"<div style=\"text-align:center\">" + translateKey('confirmCertificationPurgeB') + "</div>"
var textA = "<div style=\"text-align:center\">" + translateKey('confirmCertificationPurgeB') + "</div>"

var textB = "<div>" + translateKey('certificationFileDeletedA') + "<br/><br/></div>" +
"<div style=\"text-align:center\">" + translateKey('certificationFileDeletedB') + "</div>"
Expand Down
Loading

0 comments on commit 5cc94d7

Please sign in to comment.