Merge pull request #4703 from c-po/integrate-libvyosconfig

T7793: Integrate libvyosconfig repository into vyos-1x

5 files changed, 44 insertions, 7 deletions

diff --git a/debian/control b/debian/control
index 1d152c18b..e36e20ebe 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,9 @@ Build-Depends:
   iproute2,
   libzmq3-dev,
   python3 (>= 3.10),
+# For libvyosconfig
+  libpcre2-dev,
+  libffi-dev,
 # For QA/Lint
   pylint,
   python3-vici (>= 5.7.2),
@@ -392,6 +395,13 @@ Depends:
 Description: VyOS configuration scripts and data
  VyOS configuration scripts, interface definitions, and everything
 
+Package: libvyosconfig0
+Architecture: any
+Depends: ${shlibs:Depends},
+  ${misc:Depends}
+Description: VyConf config tree manipulation library
+  VyConf config tree parsing and manipulation library
+
 Package: vyos-1x-aws
 Architecture: all
 Depends:
diff --git a/debian/libvyosconfig0.install b/debian/libvyosconfig0.install
new file mode 100644
index 000000000..db337b486
--- /dev/null
+++ b/debian/libvyosconfig0.install
@@ -0,0 +1,2 @@
+libvyosconfig/usr/* /usr
+libvyosconfig/etc/* /etc
diff --git a/debian/libvyosconfig0.links b/debian/libvyosconfig0.links
new file mode 100644
index 000000000..b511a1ff4
--- /dev/null
+++ b/debian/libvyosconfig0.links
@@ -0,0 +1,5 @@
+/usr/libexec/vyos/vyconf/vyconf_cli /usr/libexec/vyos/vyconf/bin/vy_set
+/usr/libexec/vyos/vyconf/vyconf_cli /usr/libexec/vyos/vyconf/bin/vy_delete
+/usr/libexec/vyos/vyconf/vyconf_cli /usr/libexec/vyos/vyconf/bin/vy_discard
+/usr/libexec/vyos/vyconf/vyconf_cli /usr/libexec/vyos/vyconf/bin/vy_show
+/usr/libexec/vyos/vyconf/vyconf_cli /usr/libexec/vyos/vyconf/bin/vy_session_changed
diff --git a/debian/libvyosconfig0.postinst b/debian/libvyosconfig0.postinst
new file mode 100644
index 000000000..93efa1c89
--- /dev/null
+++ b/debian/libvyosconfig0.postinst
@@ -0,0 +1,3 @@
+ldconfig
+chown -R root:vyattacfg /usr/libexec/vyos/vyconf/session
+chmod -R 775 /usr/libexec/vyos/vyconf/session
diff --git a/debian/rules b/debian/rules
index 83091a88a..2cb32b839 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,16 +2,26 @@
 
 DIR := debian/tmp
 DIR_AWS := $(DIR)/vyos-1x-aws
+DIR_LIBVYOSCONFIG := $(DIR)/libvyosconfig
 VYOS_SBIN_DIR := usr/sbin
 VYOS_BIN_DIR := usr/bin
+VYOS_LIB_DIR := usr/lib
 VYOS_LIBEXEC_DIR := usr/libexec/vyos
 VYOS_DATA_DIR := usr/share/vyos
 VYOS_CFG_TMPL_DIR := opt/vyatta/share/vyatta-cfg/templates
 VYOS_OP_TMPL_DIR := opt/vyatta/share/vyatta-op/templates
 VYOS_MIBS_DIR := usr/share/snmp/mibs
 VYOS_LOCALUI_DIR := srv/localui
+
+VYCONF := usr/libexec/vyos/vyconf
+VYCONF_CONF := $(VYCONF)/config
+VYCONF_SESSION := $(VYCONF)/session
+VYCONF_DATA := usr/share/vyos/vyconf
+VYCONF_DEF := etc/vyos
 VYCONF_REFTREE_DIR := $(VYOS_LIBEXEC_DIR)/vyconf/reftree
 
+OCAML_DIR := /opt/opam/${OCAML_VERSION}
+
 MIGRATION_SCRIPTS_DIR := opt/vyatta/etc/config-migrate/migrate
 ACTIVATION_SCRIPTS_DIR := usr/libexec/vyos/activate
 SYSTEM_SCRIPTS_DIR := usr/libexec/vyos/system
@@ -19,12 +29,6 @@ SERVICES_DIR := usr/libexec/vyos/services
 
 DEB_TARGET_ARCH := $(shell dpkg-architecture -qDEB_TARGET_ARCH)
 
-# Base version prefix from debian/changelog
-BASE_VERSION := 999.0
-COMMIT_ID := $(shell echo -n g && git rev-parse --short HEAD)
-COMMIT_COUNT := $(shell git rev-list HEAD --count)
-DIRTY_FLAG := $(shell ! git diff --quiet || ! git diff --cached --quiet && echo -dirty || echo)
-
 %:
 	dh $@ --with python3, --with quilt
 
@@ -33,7 +37,7 @@ DIRTY_FLAG := $(shell ! git diff --quiet || ! git diff --cached --quiet && echo
 override_dh_strip_nondeterminism:
 
 override_dh_gencontrol:
-	dh_gencontrol -- -v$(BASE_VERSION)-$(COMMIT_COUNT)-$(COMMIT_ID)$(DIRTY_FLAG)
+	dh_gencontrol -- -v$(shell (git describe --tags --long --match 'vyos/*' --match '1.4.*' --dirty 2>/dev/null || echo 0.0-no.git.tag) | sed -E 's%vyos/%%' | sed -E 's%-dirty%+dirty%')
 
 override_dh_auto_build:
 	make all
@@ -168,6 +172,19 @@ override_dh_auto_install:
 	mkdir -p $(DIR_AWS)/usr/share/vyos/templates
 	mv $(DIR)/usr/share/vyos/templates/aws/ $(DIR_AWS)/usr/share/vyos/templates
 
+	# libvyosconfig package
+	mkdir -p $(DIR_LIBVYOSCONFIG)/$(VYOS_LIB_DIR)
+	mkdir -p $(DIR_LIBVYOSCONFIG)/$(VYCONF_CONF)
+	mkdir -p $(DIR_LIBVYOSCONFIG)/$(VYCONF_SESSION)
+	mkdir -p $(DIR_LIBVYOSCONFIG)/$(VYCONF_DATA)
+	mkdir -p $(DIR_LIBVYOSCONFIG)/$(VYCONF_DEF)
+
+	cp $(OCAML_DIR)/share/vyconf/vyconf.proto $(DIR_LIBVYOSCONFIG)/$(VYCONF_DATA)
+	cp $(OCAML_DIR)/share/vyconf/vyconfd.conf $(DIR_LIBVYOSCONFIG)/$(VYCONF_DEF)
+	cp $(OCAML_DIR)/bin/vyconfd $(DIR_LIBVYOSCONFIG)/$(VYCONF)
+	cp $(OCAML_DIR)/bin/vyconf_cli $(DIR_LIBVYOSCONFIG)/$(VYCONF)
+	cp libvyosconfig/_build/libvyosconfig.so $(DIR_LIBVYOSCONFIG)/$(VYOS_LIB_DIR)/libvyosconfig.so.0
+
 override_dh_installsystemd:
 	dh_installsystemd -pvyos-1x --name vyos-router vyos-router.service
 	dh_installsystemd -pvyos-1x --name vyos vyos.target