Calibration box service setup
...and also syncing of the dep tree.
The catch was that the previous versions hardcoded the `-clearfog`
suffix into the appliance name in the systemd unit template. However,
there was really no place with the same `clearfog` string was defined.
The closest one was the "compatible HW" identifier within RAUC which is
*exactly* what I would have wanted to use, but the catch is that the
clearfog builds used `czechlight-clearfog` in there (aaargh), and
there's just no way of changing it now as that would prevent me from
updating via RAUC. Meh, meh, meh.
Just changing the systemd unit and renaming the appliance within
cla-sysrepo look like a reasonable option, IMHO. We will have to change
this for future model which are HW-incompatible on the schematic side...
Change-Id: Ic447cb38e813aa3f3aba581c0d4d23a3621d6211
Depends-on: https://cesnet-gerrit-czechlight/c/CzechLight/cla-sysrepo/+/2156
Depends-on: https://gerrit.cesnet.cz/c/CzechLight/cla-sysrepo/+/2156
diff --git a/board/czechlight/beaglebone/calibration-bbb.dts b/board/czechlight/beaglebone/calibration-box-bbb.dts
similarity index 100%
rename from board/czechlight/beaglebone/calibration-bbb.dts
rename to board/czechlight/beaglebone/calibration-box-bbb.dts
diff --git a/configs/czechlight_beaglebone_defconfig b/configs/czechlight_beaglebone_defconfig
index 9ede638..d893b57 100644
--- a/configs/czechlight_beaglebone_defconfig
+++ b/configs/czechlight_beaglebone_defconfig
@@ -26,7 +26,7 @@
BR2_LINUX_KERNEL_DEFCONFIG="omap2plus"
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/common/linux.fragment $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/beaglebone/linux.fragment"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/beaglebone/czechlight-bbb.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/beaglebone/calibration-bbb.dts"
+BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/beaglebone/czechlight-bbb.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/beaglebone/calibration-box-bbb.dts"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_PACKAGE_LINUX_TOOLS_GPIO=y
BR2_PACKAGE_LINUX_TOOLS_PERF=y
diff --git a/package/cla-sysrepo/cla-appliance.service.in b/package/cla-sysrepo/cla-appliance.service.in
index c48bce3..82d01d2 100644
--- a/package/cla-sysrepo/cla-appliance.service.in
+++ b/package/cla-sysrepo/cla-appliance.service.in
@@ -9,7 +9,7 @@
[Service]
Type=simple
-ExecStart=/usr/bin/cla-sysrepod --io-log-level=5 --properties-log-level=5 --sr-bridge-log-level=5 --sysrepo-log-level=3 --appliance=__MODEL__-clearfog
+ExecStart=/usr/bin/cla-sysrepod --io-log-level=5 --properties-log-level=5 --sr-bridge-log-level=5 --sysrepo-log-level=3 --appliance=__MODEL__
PrivateTmp=yes
PrivateDevices=no
ProtectSystem=yes
diff --git a/package/cla-sysrepo/cla-sysrepo.mk b/package/cla-sysrepo/cla-sysrepo.mk
index 0a6243b..e506310 100644
--- a/package/cla-sysrepo/cla-sysrepo.mk
+++ b/package/cla-sysrepo/cla-sysrepo.mk
@@ -46,6 +46,9 @@
$(call CLA_SYSREPO_ONE_MODEL_W_FEATURE,sdn-roadm-line,czechlight-roadm-device,hw-line-9)
$(call CLA_SYSREPO_ONE_MODEL,sdn-roadm-coherent-a-d,czechlight-coherent-add-drop)
$(call CLA_SYSREPO_ONE_MODEL,sdn-inline,czechlight-inline-amp)
+ $(call CLA_SYSREPO_ONE_MODEL,calibration-box,czechlight-calibration-device)
endef
+# FIXME: calibration-box really needs a drop-in file with increased timeout...
+
$(eval $(cmake-package))
diff --git a/submodules/cla-sysrepo b/submodules/cla-sysrepo
index 29dc602..4e5a52e 160000
--- a/submodules/cla-sysrepo
+++ b/submodules/cla-sysrepo
@@ -1 +1 @@
-Subproject commit 29dc6021bf3f393456d52402df01749db983c4aa
+Subproject commit 4e5a52ea55508bcebb94a201bb49375d414cc6d1
diff --git a/submodules/netconf-cli b/submodules/netconf-cli
index 5395e71..b52dc25 160000
--- a/submodules/netconf-cli
+++ b/submodules/netconf-cli
@@ -1 +1 @@
-Subproject commit 5395e715f637d43b429623dc07744cffd0351739
+Subproject commit b52dc25300ff53d3c41bc66d1dc9adea8943bd1e