diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2026-04-21 18:01:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-04-21 18:01:27 +0300 |
| commit | 5297e6827bf70b581ade41824fa1f347f4beee9d (patch) | |
| tree | d0c424ba5f5ccd55dfc860a8018825202f4a8e2e /debian | |
| parent | 9c8029128d2672f8dd388b31ac831d0497ce8595 (diff) | |
| parent | 42a3eb4751e11991a47aa1036bf60597f3937fd3 (diff) | |
| download | vyos-1x-5297e6827bf70b581ade41824fa1f347f4beee9d.tar.gz vyos-1x-5297e6827bf70b581ade41824fa1f347f4beee9d.zip | |
Merge pull request #5136 from c-po/vyos-utils-merge
T8532: merge unrelated histories of vyos-utils and vyos-1x repo
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 1 | ||||
| -rwxr-xr-x | debian/rules | 9 | ||||
| -rw-r--r-- | debian/vyos-1x.install | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/debian/control b/debian/control index a98d0bd34..ba059ae0b 100644 --- a/debian/control +++ b/debian/control @@ -72,7 +72,6 @@ Depends: vyatta-biosdevname, vyatta-cfg, vyos-http-api-tools, - vyos-utils, ## End of Fundamentals ## Python libraries used in multiple modules and scripts python3, diff --git a/debian/rules b/debian/rules index 9649a6a36..332a32ecf 100755 --- a/debian/rules +++ b/debian/rules @@ -22,6 +22,7 @@ VYCONF_DEF := etc/vyos VYCONF_REFTREE_DIR := $(VYOS_LIBEXEC_DIR)/vyconf/reftree OCAML_DIR := /opt/opam/${OCAML_VERSION} +VYOS_OCAML_TOOLS := src/ocaml/_build/install/default/bin MIGRATION_SCRIPTS_DIR := opt/vyatta/etc/config-migrate/migrate ACTIVATION_SCRIPTS_DIR := usr/libexec/vyos/activate @@ -190,6 +191,14 @@ override_dh_auto_install: cp $(OCAML_DIR)/bin/vyconf_cli_compat $(DIR_LIBVYOSCONFIG)/$(VYCONF_BIN) cp libvyosconfig/_build/libvyosconfig.so $(DIR_LIBVYOSCONFIG)/$(VYOS_LIB_DIR)/libvyosconfig.so.0 + # OCaml binaries from former vyos-utils package + cp $(VYOS_OCAML_TOOLS)/numeric $(DIR)/$(VYOS_LIBEXEC_DIR)/validators + cp $(VYOS_OCAML_TOOLS)/validate-value $(DIR)/$(VYOS_LIBEXEC_DIR) + cp $(VYOS_OCAML_TOOLS)/file-path $(DIR)/$(VYOS_LIBEXEC_DIR)/validators + cp $(VYOS_OCAML_TOOLS)/url $(DIR)/$(VYOS_LIBEXEC_DIR)/validators + cp $(VYOS_OCAML_TOOLS)/list_interfaces $(DIR)/$(VYOS_LIBEXEC_DIR)/completion + cp $(VYOS_OCAML_TOOLS)/vyos-op-run $(DIR)/$(VYOS_BIN_DIR) + override_dh_installsystemd: dh_installsystemd -pvyos-1x --name vyos-router vyos-router.service dh_installsystemd -pvyos-1x --name vyos vyos.target diff --git a/debian/vyos-1x.install b/debian/vyos-1x.install index 7732cc039..55369aebe 100644 --- a/debian/vyos-1x.install +++ b/debian/vyos-1x.install @@ -29,6 +29,7 @@ usr/bin/vyos-config-to-commands usr/bin/vyos-config-to-json usr/bin/vyos-commands-to-config usr/bin/vyos-hostsd-client +usr/bin/vyos-op-run usr/lib usr/libexec/vyos/activate usr/libexec/vyos/completion @@ -38,6 +39,7 @@ usr/libexec/vyos/op_mode usr/libexec/vyos/services usr/libexec/vyos/system usr/libexec/vyos/validators +usr/libexec/vyos/validate-value usr/libexec/vyos/vyconf usr/libexec/vyos/*.py usr/libexec/vyos/*.sh |