Remove lldp-systemd-networkd-sysrepo package and update velia
The package is deprecated in favour of velia which offers the same
functionality now.
Change-Id: I3a8210d3324a11cddbb691c6f5b03facd86015d1
diff --git a/package/Config.in b/package/Config.in
index 95d41c6..0ef80ea 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -4,7 +4,6 @@
source "$BR2_EXTERNAL_CZECHLIGHT_PATH/package/czechlight-rauc/Config.in"
source "$BR2_EXTERNAL_CZECHLIGHT_PATH/package/czechlight-separate-boot/Config.in"
source "$BR2_EXTERNAL_CZECHLIGHT_PATH/package/gammarus/Config.in"
-source "$BR2_EXTERNAL_CZECHLIGHT_PATH/package/lldp-systemd-networkd-sysrepo/Config.in"
source "$BR2_EXTERNAL_CZECHLIGHT_PATH/package/velia/Config.in"
source "$BR2_EXTERNAL_CZECHLIGHT_PATH/package/grub2-tools/Config.in"
source "$BR2_EXTERNAL_CZECHLIGHT_PATH/package/reset-sysrepo/Config.in"
diff --git a/package/cla-sysrepo/czechlight-install-yang.sh b/package/cla-sysrepo/czechlight-install-yang.sh
index ac80ec8..c346fbc 100755
--- a/package/cla-sysrepo/czechlight-install-yang.sh
+++ b/package/cla-sysrepo/czechlight-install-yang.sh
@@ -80,7 +80,7 @@
sysrepoctl --search-dirs ${VELIA_YANG} --install ${VELIA_YANG}/ietf-system@2014-08-06.yang
sysrepoctl --change ietf-system --permissions 0664 --apply
-sysrepoctl --search-dirs /usr/share/lldp-systemd-networkd-sysrepo/yang --install /usr/share/lldp-systemd-networkd-sysrepo/yang/czechlight-lldp@2020-11-04.yang
+sysrepoctl --search-dirs ${VELIA_YANG} --install ${VELIA_YANG}/czechlight-lldp@2020-11-04.yang
sysrepoctl --change czechlight-lldp --permissions 0664 --apply
sysrepoctl --search-dirs ${VELIA_YANG} --install ${VELIA_YANG}/czechlight-system@2021-01-13.yang
diff --git a/package/lldp-systemd-networkd-sysrepo/Config.in b/package/lldp-systemd-networkd-sysrepo/Config.in
deleted file mode 100644
index 4b9e418..0000000
--- a/package/lldp-systemd-networkd-sysrepo/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config BR2_PACKAGE_LLDP_SYSTEMD_NETWORKD_SYSREPO
- bool "lldp-systemd-networkd-sysrepo"
- select BR2_PACKAGE_SPDLOG
- select BR2_PACKAGE_SDBUS_CPP
- select BR2_PACKAGE_SYSTEMD
- select BR2_PACKAGE_DOCOPT_CPP
- select BR2_PACKAGE_SYSREPO
- select BR2_PACKAGE_SYSREPO_CPP
- help
- lldp-systemd-networkd-sysrepo is a sysrepo application announcing LLDP neighbours from systemd-networkd.
-
- https://gerrit.cesnet.cz/q/project:CzechLight/lldp-systemd-networkd-sysrepo
diff --git a/package/lldp-systemd-networkd-sysrepo/lldp-systemd-networkd-sysrepo.hash b/package/lldp-systemd-networkd-sysrepo/lldp-systemd-networkd-sysrepo.hash
deleted file mode 100644
index 075e53a..0000000
--- a/package/lldp-systemd-networkd-sysrepo/lldp-systemd-networkd-sysrepo.hash
+++ /dev/null
@@ -1 +0,0 @@
-none xxx
diff --git a/package/lldp-systemd-networkd-sysrepo/lldp-systemd-networkd-sysrepo.mk b/package/lldp-systemd-networkd-sysrepo/lldp-systemd-networkd-sysrepo.mk
deleted file mode 100644
index f6a17cb..0000000
--- a/package/lldp-systemd-networkd-sysrepo/lldp-systemd-networkd-sysrepo.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-LLDP_SYSTEMD_NETWORKD_SYSREPO_VERSION = master
-LLDP_SYSTEMD_NETWORKD_SYSREPO_SITE = https://gerrit.cesnet.cz/CzechLight/lldp-systemd-networkd-sysrepo
-LLDP_SYSTEMD_NETWORKD_SYSREPO_SITE_METHOD = git
-LLDP_SYSTEMD_NETWORKD_SYSREPO_INSTALL_STAGING = NO
-LLDP_SYSTEMD_NETWORKD_SYSREPO_DEPENDENCIES = spdlog sdbus-cpp systemd docopt-cpp sysrepo
-LLDP_SYSTEMD_NETWORKD_SYSREPO_CONF_OPTS = -DTHREADS_PTHREAD_ARG:STRING=-pthread
-LLDP_SYSTEMD_NETWORKD_SYSREPO_LICENSE = Apache-2.0
-LLDP_SYSTEMD_NETWORKD_SYSREPO_LICENSE_FILES = LICENSE.md
-
-define LLDP_SYSTEMD_NETWORKD_SYSREPO_INSTALL_INIT_SYSTEMD
- $(INSTALL) -D -m 0644 -t $(TARGET_DIR)/usr/lib/systemd/system/ \
- $(BR2_EXTERNAL_CZECHLIGHT_PATH)/package/lldp-systemd-networkd-sysrepo/lldp-systemd-networkd-sysrepo.service
- ln -sf ../lldp-systemd-networkd-sysrepo.service $(TARGET_DIR)/usr/lib/systemd/system/multi-user.target.wants/
-endef
-
-$(eval $(cmake-package))
diff --git a/package/lldp-systemd-networkd-sysrepo/lldp-systemd-networkd-sysrepo.service b/package/lldp-systemd-networkd-sysrepo/lldp-systemd-networkd-sysrepo.service
deleted file mode 100644
index f903427..0000000
--- a/package/lldp-systemd-networkd-sysrepo/lldp-systemd-networkd-sysrepo.service
+++ /dev/null
@@ -1,20 +0,0 @@
-[Unit]
-Description=lldp-systemd-networkd-sysrepo is a sysrepo application announcing LLDP neighbours from systemd-networkd.
-After=syslog.target network.target czechlight-install-yang.service cfg-restore-sysrepo.service nacm-restore.service
-Requires=czechlight-install-yang.service cfg-restore-sysrepo.service nacm-restore.service
-PartOf=netopeer2.service
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/lldp-systemd-networkd-sysrepod
-PrivateTmp=yes
-PrivateDevices=no
-ProtectSystem=yes
-ProtectHome=yes
-Restart=always
-LogRateLimitIntervalSec=10
-LogRateLimitBurst=30000
-SyslogLevel=alert
-
-[Install]
-WantedBy=multi-user.target
diff --git a/package/reset-sysrepo/reset-sysrepo.mk b/package/reset-sysrepo/reset-sysrepo.mk
index d1e7dd0..773806c 100644
--- a/package/reset-sysrepo/reset-sysrepo.mk
+++ b/package/reset-sysrepo/reset-sysrepo.mk
@@ -20,7 +20,6 @@
cla-sdn-roadm-coherent-a-d.service \
cla-sdn-roadm-hires-drop.service \
cla-sdn-roadm-line.service \
- lldp-systemd-networkd-sysrepo.service \
netopeer2.service \
sysrepo-persistent-cfg.service \
nacm-restore.service \