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/.gitmodules b/.gitmodules
index 599aae4..cb0eb34 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,9 +13,6 @@
[submodule "submodules/velia"]
path = submodules/velia
url = ../velia/
-[submodule "submodules/lldp-systemd-networkd-sysrepo"]
- path = submodules/lldp-systemd-networkd-sysrepo
- url = ../lldp-systemd-networkd-sysrepo
[submodule "submodules/rousette"]
path = submodules/rousette
url = ../rousette
diff --git a/.zuul.yaml b/.zuul.yaml
index d8d2797..af1a45e 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -13,7 +13,6 @@
- CzechLight/gammarus
- CzechLight/netconf-cli
- CzechLight/velia
- - CzechLight/lldp-systemd-networkd-sysrepo
- CzechLight/rousette
- github/CESNET/libyang
- github/sysrepo/sysrepo
diff --git a/ci/build.sh b/ci/build.sh
index 8672849..02c1549 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -61,7 +61,7 @@
# We don't use gating, so there's a risk that there's no prebuilt artifact, so don't die if we cannot download that file
curl ${ARTIFACT_URL} | unzstd --stdout | tar -xf - || echo "No Buildroot prebuilt tarball found, will build from scratch"
- for PROJECT in cla-sysrepo netconf-cli gammarus velia rousette lldp-systemd-networkd-sysrepo; do
+ for PROJECT in cla-sysrepo netconf-cli gammarus velia rousette; do
# If there's a change for ${PROJECT} queued ahead, ensure it gets used.
# This means that if our submodules still pin, say, `cla-sysrepo` to some ancient version and we're testing a `netconf-cli` change,
# then we will keep using that ancient `cla-sysrepo`. Hopefully this reduces the number of false alerts.
diff --git a/configs/czechlight_clearfog_defconfig b/configs/czechlight_clearfog_defconfig
index 02bc74e..880719c 100644
--- a/configs/czechlight_clearfog_defconfig
+++ b/configs/czechlight_clearfog_defconfig
@@ -4,7 +4,7 @@
BR2_ARM_ENABLE_VFP=y
BR2_ARM_FPU_NEON=y
BR2_ENABLE_DEBUG=y
-BR2_STRIP_EXCLUDE_FILES="cla-* netopeer* *sysrepo* libSysrepo* *netconf* *yang* velia* lldp-systemd-networkd-sysrepod rousette*"
+BR2_STRIP_EXCLUDE_FILES="cla-* netopeer* *sysrepo* libSysrepo* *netconf* *yang* velia* rousette*"
BR2_STRIP_EXCLUDE_DIRS="/usr/lib/libyang /usr/lib/sysrepo"
BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/common/patches"
BR2_PER_PACKAGE_DIRECTORIES=y
diff --git a/dev-setup-git.sh b/dev-setup-git.sh
index 510e157..d29b70a 100755
--- a/dev-setup-git.sh
+++ b/dev-setup-git.sh
@@ -23,7 +23,6 @@
NETCONF_CLI_OVERRIDE_SRCDIR = ${CZECHLIGHT_BR2_EXT_LOC}/submodules/netconf-cli
GAMMARUS_OVERRIDE_SRCDIR = ${CZECHLIGHT_BR2_EXT_LOC}/submodules/gammarus
VELIA_OVERRIDE_SRCDIR = ${CZECHLIGHT_BR2_EXT_LOC}/submodules/velia
-LLDP_SYSTEMD_NETWORKD_SYSREPO_OVERRIDE_SRCDIR = ${CZECHLIGHT_BR2_EXT_LOC}/submodules/lldp-systemd-networkd-sysrepo
ROUSETTE_OVERRIDE_SRCDIR = ${CZECHLIGHT_BR2_EXT_LOC}/submodules/rousette
define CZECHLIGHT_GIT_FIX_GITDIR
@@ -33,7 +32,6 @@
NETCONF_CLI_POST_RSYNC_HOOKS += CZECHLIGHT_GIT_FIX_GITDIR
GAMMARUS_POST_RSYNC_HOOKS += CZECHLIGHT_GIT_FIX_GITDIR
VELIA_POST_RSYNC_HOOKS += CZECHLIGHT_GIT_FIX_GITDIR
-LLDP_SYSTEMD_NETWORKD_SYSREPO_POST_RSYNC_HOOKS += CZECHLIGHT_GIT_FIX_GITDIR
ROUSETTE_POST_RSYNC_HOOKS += CZECHLIGHT_GIT_FIX_GITDIR
EOF
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 \
diff --git a/submodules/lldp-systemd-networkd-sysrepo b/submodules/lldp-systemd-networkd-sysrepo
deleted file mode 160000
index 6d79ded..0000000
--- a/submodules/lldp-systemd-networkd-sysrepo
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6d79dede96f720b77aa5bf132e7f16787002f6ce
diff --git a/submodules/velia b/submodules/velia
index 0e45cb6..2041a67 160000
--- a/submodules/velia
+++ b/submodules/velia
@@ -1 +1 @@
-Subproject commit 0e45cb6dbc5bed245d716931bf6f2f6b6664096f
+Subproject commit 2041a67f4bd0e71bebcaf1cad88373709f0f2a4a