From 73892ea6f00cb96366a4af91e6f303e20e548c7d Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 13 Apr 2023 11:09:58 +0200 Subject: [PATCH] package/cli*: drop cligen and clixon after migration to sysrepo Signed-off-by: Joachim Wiberg --- package/Config.in | 2 - package/cligen/Config.in | 6 --- package/cligen/cligen.hash | 2 - package/cligen/cligen.mk | 14 ------- package/clixon/Config.in | 83 -------------------------------------- package/clixon/clixon.mk | 79 ------------------------------------ 6 files changed, 186 deletions(-) delete mode 100644 package/cligen/Config.in delete mode 100644 package/cligen/cligen.hash delete mode 100644 package/cligen/cligen.mk delete mode 100644 package/clixon/Config.in delete mode 100644 package/clixon/clixon.mk diff --git a/package/Config.in b/package/Config.in index 932c4503..2c289aad 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1,5 +1,3 @@ -source "$BR2_EXTERNAL_INFIX_PATH/package/cligen/Config.in" -source "$BR2_EXTERNAL_INFIX_PATH/package/clixon/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/confd/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/factory/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/faux/Config.in" diff --git a/package/cligen/Config.in b/package/cligen/Config.in deleted file mode 100644 index 7597eda3..00000000 --- a/package/cligen/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_CLIGEN - bool "cligen" - help - CLIgen is a Command-Line Interface generator. - - https://github.com/clicon/cligen diff --git a/package/cligen/cligen.hash b/package/cligen/cligen.hash deleted file mode 100644 index 73015fe0..00000000 --- a/package/cligen/cligen.hash +++ /dev/null @@ -1,2 +0,0 @@ -sha256 d56039f340a7a65db06b1f209df4e72503a9f9940a6901fa20aa43b33dea84f5 cligen-6.1.0.tar.gz -sha256 dea515c12a123c00370347276a7e58f699c6861c1398f4c863a7facef2f86b23 LICENSE.md diff --git a/package/cligen/cligen.mk b/package/cligen/cligen.mk deleted file mode 100644 index 12cf828d..00000000 --- a/package/cligen/cligen.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# cligen -# -################################################################################ - -CLIGEN_VERSION = 6.1.0 -CLIGEN_SITE = $(call github,clicon,cligen,$(CLIGEN_VERSION)) -CLIGEN_LICENSE = Apache-2.0 -CLIGEN_LICENSE_FILES = LICENSE.md -CLIGEN_INSTALL_STAGING = YES -CLIGEN_CONF_OPTS = INSTALLFLAGS=" " - -$(eval $(autotools-package)) diff --git a/package/clixon/Config.in b/package/clixon/Config.in deleted file mode 100644 index 0c4819b4..00000000 --- a/package/clixon/Config.in +++ /dev/null @@ -1,83 +0,0 @@ -config BR2_PACKAGE_CLIXON - bool "clixon" - depends on BR2_USE_MMU - select BR2_PACKAGE_CLIGEN -# select BR2_PACKAGE_LIBCURL -# select BR2_PACKAGE_LIBXML2 - help - Clixon is a YANG-based configuration manager, with interactive - CLI, NETCONF and RESTCONF interfaces, an embedded database and - transaction mechanism. - - Clixon has support for RESTCONF over HTTP/2 using NGHTTP2 as - well as support for FCGI using NGINX (HTTP/1), or the native - support for HTTP/1. - - If Net-SNMP is enabled, it is possible to also enable the Clixon - YANG mapping to SNMP. - - NOTE: Clixon by itself does not do anything, you need to build an - application it can run. See the example for more info. - - https://github.com/clicon/clixon - -if BR2_PACKAGE_CLIXON - -config BR2_PACKAGE_CLIXON_EXAMPLE - bool "example" - help - Install Clixon YANG + CLI example application. - -choice - prompt "restconf" - default BR2_PACKAGE_CLIXON_RESTCONF_NATIVE - -config BR2_PACKAGE_CLIXON_RESTCONF_NATIVE - bool "native" - help - Native RESTCONF frontend supports HTTP/1 by default, for - HTTP/2 it relies on the nghttp2 library. - -config BR2_PACKAGE_CLIXON_RESTCONF_FCGI - bool "nginx" - select BR2_PACKAGE_NGINX - select BR2_PACKAGE_NGINX_HTTP_FASTCGI_MODULE - select BR2_PACKAGE_LIBFCGI - help - Enable RESTCONF using NGINX fastcgi instead of native. - -config BR2_PACKAGE_CLIXON_RESTCONF_NONE - bool "disabled" - help - Disable RESTCONF frontend completely. - -endchoice - -config BR2_PACKAGE_CLIXON_HTTP1 - bool "native http/1" - default y - depends on BR2_PACKAGE_CLIXON_RESTCONF_NATIVE - help - By default, native HTTP/1 support restconf is enabled. - Disabling this leaves nginx fcgi or http/2 options. - -config BR2_PACKAGE_CLIXON_HTTP2 - bool "native http/2" - depends on BR2_PACKAGE_CLIXON_RESTCONF_NATIVE - select BR2_PACKAGE_NGHTTP2 - help - Native RESTCONF over HTTP/2 using NGHTTP2 package. - - -config BR2_PACKAGE_CLIXON_PUBLISH - bool "publish" - help - Enable publish of notification streams using SSE and curl. - -config BR2_PACKAGE_CLIXON_SNMP - bool "net-snmp" - depends on BR2_PACKAGE_NETSNMP - help - Enable mapping of YANG to SNMP. Uses AgentX interface. - -endif diff --git a/package/clixon/clixon.mk b/package/clixon/clixon.mk deleted file mode 100644 index 56d14f3e..00000000 --- a/package/clixon/clixon.mk +++ /dev/null @@ -1,79 +0,0 @@ -################################################################################ -# -# clixon -# -################################################################################ - -#CLIXON_VERSION = 6.0.0 -#CLIXON_SITE = $(call github,clicon,clixon,$(CLIXON_VERSION)) -CLIXON_VERSION = 3d7f1099a6aa7889b3a0645184089148ef511bf3 -CLIXON_SITE = https://github.com/kernelkit/clixon -CLIXON_SITE_METHOD = git - -CLIXON_LICENSE = Apache-2.0 -CLIXON_LICENSE_FILES = LICENSE.md -CLIXON_INSTALL_STAGING = YES -CLIXON_DEPENDENCIES = cligen #libcurl libxml2 - -CLIXON_CONF_OPTS = INSTALLFLAGS=" " - -# autotools-package.mk dutifully sets sysconfdir to /etc, but -# unfortunately clixon uses a hard-coded default location of -# /usr/local/etc/clixon.xml unless this option is specified. -CLIXON_CONF_OPTS += --with-configfile=/etc/clixon.xml - -ifeq ($(BR2_PACKAGE_CLIXON_RESTCONF_NATIVE),y) -CLIXON_CONF_OPTS += --with-restconf=native -endif - -ifeq ($(BR2_PACKAGE_CLIXON_HTTP1),y) -CLIXON_CONF_OPTS += --enable-http1 -else -CLIXON_CONF_OPTS += --disable-http1 -endif - -ifeq ($(BR2_PACKAGE_CLIXON_HTTP2),y) -CLIXON_DEPENDENCIES += nghttp2 -CLIXON_CONF_OPTS += --enable-nghttp2 -else -CLIXON_CONF_OPTS += --disable-nghttp2 -endif - -ifeq ($(BR2_PACKAGE_CLIXON_RESTCONF_FCGI),y) -CLIXON_DEPENDENCIES += nginx libfcgi -CLIXON_CONF_OPTS += --with-restconf=fcgi -endif - -ifeq ($(BR2_PACKAGE_CLIXON_RESTCONF_NONE),y) -CLIXON_CONF_OPTS += --without-restconf -endif - -ifeq ($(BR2_PACKAGE_CLIXON_PUBLISH),y) -CLIXON_CONF_OPTS += --enable-publish -else -CLIXON_CONF_OPTS += --disable-publish -endif - -ifeq ($(BR2_PACKAGE_CLIXON_SNMP),y) -CLIXON_DEPENDENCIES += netsnmp -CLIXON_CONF_OPTS += --enable-netsnmp -else -CLIXON_CONF_OPTS += --disable-netsnmp -endif - -ifeq ($(BR2_PACKAGE_CLIXON_EXAMPLE),y) -define CLIXON_INSTALL_EXAMPLE - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install-example -endef -CLIXON_POST_INSTALL_TARGET_HOOKS += CLIXON_INSTALL_EXAMPLE -endif - -define CLIXON_INSTALL_EXTRA - rm -rf $(TARGET_DIR)/var/clixon - ln -sf clixon_cli $(TARGET_DIR)/usr/bin/clish - grep -qsE '^/usr/bin/clish$$' "$(TARGET_DIR)/etc/shells" \ - || echo "/usr/bin/clish" >> "$(TARGET_DIR)/etc/shells" -endef -CLIXON_POST_INSTALL_TARGET_HOOKS += CLIXON_INSTALL_EXTRA - -$(eval $(autotools-package))