From 83e5af33ffcf24807fd93246b2e7564fd872bb11 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Wed, 9 Aug 2023 14:12:25 +0200 Subject: [PATCH] Fix #86: rename klinfix -> klish-plugin-infix Also renames all klix_SYM@klinfix to SYM@infix, this is fine since we're always calling these symbols with @infix. Signed-off-by: Joachim Wiberg --- configs/aarch64_defconfig | 2 +- configs/x86_64_defconfig | 2 +- configs/x86_64_minimal_defconfig | 2 +- package/Config.in | 2 +- package/klinfix/klinfix.mk | 21 ------------ .../{klinfix => klish-plugin-infix}/Config.in | 4 +-- .../klish-plugin-infix.hash} | 0 .../klish-plugin-infix/klish-plugin-infix.mk | 21 ++++++++++++ package/klish-plugin-sysrepo/Config.in | 2 +- package/klish/Config.in | 2 +- src/klinfix/src/Makefile.am | 9 ----- .../.gitignore | 0 .../Makefile.am | 0 src/{klinfix => klish-plugin-infix}/README.md | 10 +++--- .../autogen.sh | 0 .../configure.ac | 2 +- src/klish-plugin-infix/src/Makefile.am | 9 +++++ .../src/infix.c} | 34 +++++++++---------- .../xml/Makefile.am | 0 .../xml/infix.xml | 18 +++++----- 20 files changed, 70 insertions(+), 70 deletions(-) delete mode 100644 package/klinfix/klinfix.mk rename package/{klinfix => klish-plugin-infix}/Config.in (76%) rename package/{klinfix/klinfix.hash => klish-plugin-infix/klish-plugin-infix.hash} (100%) create mode 100644 package/klish-plugin-infix/klish-plugin-infix.mk delete mode 100644 src/klinfix/src/Makefile.am rename src/{klinfix => klish-plugin-infix}/.gitignore (100%) rename src/{klinfix => klish-plugin-infix}/Makefile.am (100%) rename src/{klinfix => klish-plugin-infix}/README.md (94%) rename src/{klinfix => klish-plugin-infix}/autogen.sh (100%) rename src/{klinfix => klish-plugin-infix}/configure.ac (94%) create mode 100644 src/klish-plugin-infix/src/Makefile.am rename src/{klinfix/src/klinfix.c => klish-plugin-infix/src/infix.c} (86%) rename src/{klinfix => klish-plugin-infix}/xml/Makefile.am (100%) rename src/{klinfix => klish-plugin-infix}/xml/infix.xml (96%) diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig index 24535bcf..d1940e34 100644 --- a/configs/aarch64_defconfig +++ b/configs/aarch64_defconfig @@ -116,7 +116,7 @@ BR2_PACKAGE_FINIT_PLUGIN_MODPROBE=y BR2_PACKAGE_FINIT_PLUGIN_RTC=y BR2_PACKAGE_FINIT_PLUGIN_TTY=y BR2_PACKAGE_FINIT_PLUGIN_URANDOM=y -BR2_PACKAGE_KLINFIX=y +BR2_PACKAGE_KLISH_PLUGIN_INFIX=y BR2_PACKAGE_LOWDOWN=y BR2_PACKAGE_NET=y BR2_PACKAGE_TETRIS=y diff --git a/configs/x86_64_defconfig b/configs/x86_64_defconfig index 0077fffb..694c39eb 100644 --- a/configs/x86_64_defconfig +++ b/configs/x86_64_defconfig @@ -121,7 +121,7 @@ BR2_PACKAGE_FINIT_PLUGIN_MODPROBE=y BR2_PACKAGE_FINIT_PLUGIN_RTC=y BR2_PACKAGE_FINIT_PLUGIN_TTY=y BR2_PACKAGE_FINIT_PLUGIN_URANDOM=y -BR2_PACKAGE_KLINFIX=y +BR2_PACKAGE_KLISH_PLUGIN_INFIX=y BR2_PACKAGE_LOWDOWN=y BR2_PACKAGE_NET=y BR2_PACKAGE_TETRIS=y diff --git a/configs/x86_64_minimal_defconfig b/configs/x86_64_minimal_defconfig index 387de832..f0a54cf6 100644 --- a/configs/x86_64_minimal_defconfig +++ b/configs/x86_64_minimal_defconfig @@ -69,7 +69,7 @@ BR2_PACKAGE_FINIT_PLUGIN_MODPROBE=y BR2_PACKAGE_FINIT_PLUGIN_RTC=y BR2_PACKAGE_FINIT_PLUGIN_TTY=y BR2_PACKAGE_FINIT_PLUGIN_URANDOM=y -BR2_PACKAGE_KLINFIX=y +BR2_PACKAGE_KLISH_PLUGIN_INFIX=y BR2_PACKAGE_NET=y # SIGN_ENABLED is not set # GNS3_APPLIANCE is not set diff --git a/package/Config.in b/package/Config.in index 2ab388fb..b9d5022a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -5,7 +5,7 @@ source "$BR2_EXTERNAL_INFIX_PATH/package/factory/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/faux/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/finit/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/ifupdown-ng/Config.in" -source "$BR2_EXTERNAL_INFIX_PATH/package/klinfix/Config.in" +source "$BR2_EXTERNAL_INFIX_PATH/package/klish-plugin-infix/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/klish/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/klish-plugin-sysrepo/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/lowdown/Config.in" diff --git a/package/klinfix/klinfix.mk b/package/klinfix/klinfix.mk deleted file mode 100644 index 7805182e..00000000 --- a/package/klinfix/klinfix.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# klinfix -# -################################################################################ - -KLINFIX_VERSION = 1.0 -KLINFIX_LICENSE = BSD-3-Clause -KLINFIX_LICENSE_FILES = LICENSE -KLINFIX_SITE_METHOD = local -KLINFIX_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/klinfix -KLINFIX_DEPENDENCIES = klish-plugin-sysrepo -KLINFIX_AUTORECONF = YES - -define KLINFIX_INSTALL_DOC - $(INSTALL) -t $(TARGET_DIR)/usr/share/infix/cli -D -m 0644 \ - $(wildcard $(BR2_EXTERNAL_INFIX_PATH)/doc/cli/*.md) -endef -KLINFIX_POST_INSTALL_TARGET_HOOKS += KLINFIX_INSTALL_DOC - -$(eval $(autotools-package)) diff --git a/package/klinfix/Config.in b/package/klish-plugin-infix/Config.in similarity index 76% rename from package/klinfix/Config.in rename to package/klish-plugin-infix/Config.in index 933d1289..f8ae6808 100644 --- a/package/klinfix/Config.in +++ b/package/klish-plugin-infix/Config.in @@ -1,5 +1,5 @@ -config BR2_PACKAGE_KLINFIX - bool "klinfix" +config BR2_PACKAGE_KLISH_PLUGIN_INFIX + bool "klish-plugin-infix" select BR2_PACKAGE_KLISH select BR2_PACKAGE_KLISH_PLUGIN_SYSREPO select BR2_PACKAGE_SYSREPO diff --git a/package/klinfix/klinfix.hash b/package/klish-plugin-infix/klish-plugin-infix.hash similarity index 100% rename from package/klinfix/klinfix.hash rename to package/klish-plugin-infix/klish-plugin-infix.hash diff --git a/package/klish-plugin-infix/klish-plugin-infix.mk b/package/klish-plugin-infix/klish-plugin-infix.mk new file mode 100644 index 00000000..353ef9cc --- /dev/null +++ b/package/klish-plugin-infix/klish-plugin-infix.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# klish-plugin-infix +# +################################################################################ + +KLISH_PLUGIN_INFIX_VERSION = 1.0 +KLISH_PLUGIN_INFIX_LICENSE = BSD-3-Clause +KLISH_PLUGIN_INFIX_LICENSE_FILES = LICENSE +KLISH_PLUGIN_INFIX_SITE_METHOD = local +KLISH_PLUGIN_INFIX_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/klish-plugin-infix +KLISH_PLUGIN_INFIX_DEPENDENCIES = klish-plugin-sysrepo +KLISH_PLUGIN_INFIX_AUTORECONF = YES + +define KLISH_PLUGIN_INFIX_INSTALL_DOC + $(INSTALL) -t $(TARGET_DIR)/usr/share/infix/cli -D -m 0644 \ + $(wildcard $(BR2_EXTERNAL_INFIX_PATH)/doc/cli/*.md) +endef +KLISH_PLUGIN_INFIX_POST_INSTALL_TARGET_HOOKS += KLISH_PLUGIN_INFIX_INSTALL_DOC + +$(eval $(autotools-package)) diff --git a/package/klish-plugin-sysrepo/Config.in b/package/klish-plugin-sysrepo/Config.in index b9c735e8..ff8de00e 100644 --- a/package/klish-plugin-sysrepo/Config.in +++ b/package/klish-plugin-sysrepo/Config.in @@ -13,7 +13,7 @@ config BR2_PACKAGE_KLISH_PLUGIN_SYSREPO config BR2_PACKAGE_KLISH_PLUGIN_SYSREPO_XML bool "install xml" depends on BR2_PACKAGE_KLISH_PLUGIN_SYSREPO - depends on !BR2_PACKAGE_KLINFIX + depends on !BR2_PACKAGE_KLISH_PLUGIN_INFIX default y help Install the default XML spec bundled with the project, which diff --git a/package/klish/Config.in b/package/klish/Config.in index e3f03e0e..caccdc20 100644 --- a/package/klish/Config.in +++ b/package/klish/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_KLISH config BR2_PACKAGE_KLISH_DEFAULT_XML bool "install xml" depends on BR2_PACKAGE_KLISH - depends on !BR2_PACKAGE_KLINFIX + depends on !BR2_PACKAGE_KLISH_PLUGIN_INFIX default y help Install a small XML spec containing a definition of an diff --git a/src/klinfix/src/Makefile.am b/src/klinfix/src/Makefile.am deleted file mode 100644 index 8076ac1c..00000000 --- a/src/klinfix/src/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -CFLAGS = -Wall -Wextra -Werror -Wno-unused-parameter - -pluginsdir = $(KLISHLIBDIR)/plugins -plugins_LTLIBRARIES = kplugin-klinfix.la - -kplugin_klinfix_la_CFLAGS = $(sysrepo_CFLAGS) $(klish_CFLAGS) $(libyang_CFLAGS) $(CFLAGS) -kplugin_klinfix_la_LIBADD = $(sysrepo_LIBS) $(klish_LIBS) $(libyang_LIBS) -kplugin_klinfix_la_LDFLAGS = -module -avoid-version -shared -kplugin_klinfix_la_SOURCES = klinfix.c diff --git a/src/klinfix/.gitignore b/src/klish-plugin-infix/.gitignore similarity index 100% rename from src/klinfix/.gitignore rename to src/klish-plugin-infix/.gitignore diff --git a/src/klinfix/Makefile.am b/src/klish-plugin-infix/Makefile.am similarity index 100% rename from src/klinfix/Makefile.am rename to src/klish-plugin-infix/Makefile.am diff --git a/src/klinfix/README.md b/src/klish-plugin-infix/README.md similarity index 94% rename from src/klinfix/README.md rename to src/klish-plugin-infix/README.md index 7dfcc518..5a2f8f02 100644 --- a/src/klinfix/README.md +++ b/src/klish-plugin-infix/README.md @@ -1,10 +1,10 @@ -Infix Extensions to klish-plugin-sysrepo ----------------------------------------- +Infix Extensions to Klish +------------------------- -Tailor `klish` and `klish-plugin-sysrepo` to suit Infix. The resulting +Tailor `klish` and `klish-plugin-sysrepo` to suit Infix. The resulting CLI is, in many respects, still very similar to Juniper's JunOS, since -that is also the primary inspiration for klish, with some additions -and modifications. +that is also the primary inspiration for klish, with some additions and +modifications. Broadly speaking, the CLI is split up in two major modes: diff --git a/src/klinfix/autogen.sh b/src/klish-plugin-infix/autogen.sh similarity index 100% rename from src/klinfix/autogen.sh rename to src/klish-plugin-infix/autogen.sh diff --git a/src/klinfix/configure.ac b/src/klish-plugin-infix/configure.ac similarity index 94% rename from src/klinfix/configure.ac rename to src/klish-plugin-infix/configure.ac index 45bf620a..e25df3ba 100644 --- a/src/klinfix/configure.ac +++ b/src/klish-plugin-infix/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.61) -AC_INIT([klinfix], [1.0.0], +AC_INIT([klish-plugin-infix], [1.0.0], [https://github.com/kernelkit/infix/issues]) AM_INIT_AUTOMAKE(1.11 foreign subdir-objects) AM_SILENT_RULES(yes) diff --git a/src/klish-plugin-infix/src/Makefile.am b/src/klish-plugin-infix/src/Makefile.am new file mode 100644 index 00000000..ae733254 --- /dev/null +++ b/src/klish-plugin-infix/src/Makefile.am @@ -0,0 +1,9 @@ +CFLAGS = -Wall -Wextra -Werror -Wno-unused-parameter + +pluginsdir = $(KLISHLIBDIR)/plugins +plugins_LTLIBRARIES = kplugin-infix.la + +kplugin_infix_la_CFLAGS = $(sysrepo_CFLAGS) $(klish_CFLAGS) $(libyang_CFLAGS) $(CFLAGS) +kplugin_infix_la_LIBADD = $(sysrepo_LIBS) $(klish_LIBS) $(libyang_LIBS) +kplugin_infix_la_LDFLAGS = -module -avoid-version -shared +kplugin_infix_la_SOURCES = infix.c diff --git a/src/klinfix/src/klinfix.c b/src/klish-plugin-infix/src/infix.c similarity index 86% rename from src/klinfix/src/klinfix.c rename to src/klish-plugin-infix/src/infix.c index b343698e..5454dc4c 100644 --- a/src/klinfix/src/klinfix.c +++ b/src/klish-plugin-infix/src/infix.c @@ -14,10 +14,10 @@ #include -const uint8_t kplugin_klinfix_major = 1; -const uint8_t kplugin_klinfix_minor = 0; +const uint8_t kplugin_infix_major = 1; +const uint8_t kplugin_infix_minor = 0; -int klix_files(kcontext_t *ctx) +int infix_files(kcontext_t *ctx) { const char *path; struct dirent *d; @@ -46,14 +46,14 @@ int klix_files(kcontext_t *ctx) return 0; } -int klix_ifaces(kcontext_t *ctx) +int infix_ifaces(kcontext_t *ctx) { (void)ctx; system("ls /sys/class/net"); return 0; } -int klix_ds_from_str(const char *text, sr_datastore_t *ds) +int infix_ds_from_str(const char *text, sr_datastore_t *ds) { size_t len = strlen(text); @@ -73,7 +73,7 @@ int klix_ds_from_str(const char *text, sr_datastore_t *ds) return 0; } -int klix_copy(kcontext_t *ctx) +int infix_copy(kcontext_t *ctx) { kpargv_t *pargv = kcontext_pargv(ctx); sr_datastore_t srcds, dstds; @@ -87,13 +87,13 @@ int klix_copy(kcontext_t *ctx) if (!srcarg || !dstarg) goto err; - if (klix_ds_from_str(kparg_value(srcarg), &srcds)) { + if (infix_ds_from_str(kparg_value(srcarg), &srcds)) { fprintf(stderr, "Error: \"%s\" is not the name of any known datastore\n", kparg_value(srcarg)); goto err; } - if (klix_ds_from_str(kparg_value(dstarg), &dstds)) { + if (infix_ds_from_str(kparg_value(dstarg), &dstds)) { fprintf(stderr, "Error: \"%s\" is not the name of any known datastore\n", kparg_value(dstarg)); @@ -149,7 +149,7 @@ err: return -1; } -int klix_commit(kcontext_t *ctx) +int infix_commit(kcontext_t *ctx) { sr_session_ctx_t *sess; sr_conn_ctx_t *conn; @@ -185,7 +185,7 @@ err: return -1; } -int klix_rpc(kcontext_t *ctx) +int infix_rpc(kcontext_t *ctx) { kpargv_pargs_node_t *iter; size_t icnt = 0, ocnt = 0; @@ -252,22 +252,22 @@ err: return -1; } -int kplugin_klinfix_fini(kcontext_t *ctx) +int kplugin_infix_fini(kcontext_t *ctx) { (void)ctx; return 0; } -int kplugin_klinfix_init(kcontext_t *ctx) +int kplugin_infix_init(kcontext_t *ctx) { kplugin_t *plugin = kcontext_plugin(ctx); - kplugin_add_syms(plugin, ksym_new("klix_copy", klix_copy)); - kplugin_add_syms(plugin, ksym_new("klix_commit", klix_commit)); - kplugin_add_syms(plugin, ksym_new("klix_files", klix_files)); - kplugin_add_syms(plugin, ksym_new("klix_ifaces", klix_ifaces)); - kplugin_add_syms(plugin, ksym_new("klix_rpc", klix_rpc)); + kplugin_add_syms(plugin, ksym_new("copy", infix_copy)); + kplugin_add_syms(plugin, ksym_new("commit", infix_commit)); + kplugin_add_syms(plugin, ksym_new("files", infix_files)); + kplugin_add_syms(plugin, ksym_new("ifaces", infix_ifaces)); + kplugin_add_syms(plugin, ksym_new("rpc", infix_rpc)); return 0; } diff --git a/src/klinfix/xml/Makefile.am b/src/klish-plugin-infix/xml/Makefile.am similarity index 100% rename from src/klinfix/xml/Makefile.am rename to src/klish-plugin-infix/xml/Makefile.am diff --git a/src/klinfix/xml/infix.xml b/src/klish-plugin-infix/xml/infix.xml similarity index 96% rename from src/klinfix/xml/infix.xml rename to src/klish-plugin-infix/xml/infix.xml index 9c45f101..eae4ba86 100644 --- a/src/klinfix/xml/infix.xml +++ b/src/klish-plugin-infix/xml/infix.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="https://src.libcode.org/pkun/klish/src/master/klish.xsd"> - + ShowBrackets = y @@ -90,14 +90,14 @@ - /var/log + /var/log - + @@ -129,11 +129,11 @@ - /ietf-system:system-shutdown + /ietf-system:system-shutdown - /ietf-system:system-restart + /ietf-system:system-restart @@ -154,7 +154,7 @@ - + @@ -189,7 +189,7 @@ - /ietf-system:set-current-datetime + /ietf-system:set-current-datetime @@ -384,7 +384,7 @@ - + replace main @@ -426,7 +426,7 @@ - +