From 01d07b4942f7033b7b89dfc24effd79c1eb893e4 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sun, 12 Jan 2025 09:19:23 +0100 Subject: [PATCH] utils: rename sysrepo-load-modules.sh -> srload Simplify name, follow new srop tool naming convention. Signed-off-by: Joachim Wiberg --- package/confd-test-mode/confd-test-mode.mk | 9 ++++++++- package/confd/confd.mk | 4 ++-- utils/{sysrepo-load-modules.sh => srload} | 0 3 files changed, 10 insertions(+), 3 deletions(-) rename utils/{sysrepo-load-modules.sh => srload} (100%) diff --git a/package/confd-test-mode/confd-test-mode.mk b/package/confd-test-mode/confd-test-mode.mk index 0786b1b8..aa144ed8 100644 --- a/package/confd-test-mode/confd-test-mode.mk +++ b/package/confd-test-mode/confd-test-mode.mk @@ -1,3 +1,9 @@ +################################################################################ +# +# confd-test-mode +# +################################################################################ + CONFD_TEST_MODE_VERSION = 1.0 CONFD_TEST_MODE_SITE_METHOD = local CONFD_TEST_MODE_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/test-mode @@ -16,7 +22,8 @@ COMMON_SYSREPO_ENV = \ define CONFD_TEST_MODE_INSTALL_YANG_MODULES $(COMMON_SYSREPO_ENV) \ - SEARCH_PATH="$(TARGET_DIR)/usr/share/yang/modules/test-mode/" $(BR2_EXTERNAL_INFIX_PATH)/utils/sysrepo-load-modules.sh $(@D)/yang/test-mode.inc + SEARCH_PATH="$(TARGET_DIR)/usr/share/yang/modules/test-mode/" \ + $(BR2_EXTERNAL_INFIX_PATH)/utils/srload $(@D)/yang/test-mode.inc endef define CONFD_TEST_MODE_PERMISSIONS /etc/sysrepo/data/ r 660 root wheel - - - - - diff --git a/package/confd/confd.mk b/package/confd/confd.mk index a194fd61..bcd2da91 100644 --- a/package/confd/confd.mk +++ b/package/confd/confd.mk @@ -41,13 +41,13 @@ COMMON_SYSREPO_ENV = \ define CONFD_INSTALL_YANG_MODULES $(COMMON_SYSREPO_ENV) \ - $(BR2_EXTERNAL_INFIX_PATH)/utils/sysrepo-load-modules.sh $(@D)/yang/confd.inc + $(BR2_EXTERNAL_INFIX_PATH)/utils/srload $(@D)/yang/confd.inc endef ifeq ($(BR2_PACKAGE_PODMAN),y) define CONFD_INSTALL_YANG_MODULES_CONTAINERS $(COMMON_SYSREPO_ENV) \ - $(BR2_EXTERNAL_INFIX_PATH)/utils/sysrepo-load-modules.sh $(@D)/yang/containers.inc + $(BR2_EXTERNAL_INFIX_PATH)/utils/srload $(@D)/yang/containers.inc endef endif diff --git a/utils/sysrepo-load-modules.sh b/utils/srload similarity index 100% rename from utils/sysrepo-load-modules.sh rename to utils/srload