Merge pull request #704 from kernelkit/defconfig-regression-fixes

Defconfig regression fixes
kernelkit · Oct 11, 2024 · 6e8f91e · 6e8f91e
2 parents e8035f4 + 60b8f97
commit 6e8f91e
Show file tree

Hide file tree

Showing 11 changed files with 61 additions and 49 deletions.
diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig
@@ -56,7 +56,9 @@ BR2_PACKAGE_UBOOT_TOOLS_FIT_CHECK_SIGN=y
 BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE=y
 BR2_PACKAGE_PYTHON3=y
 BR2_PACKAGE_PYTHON_GUNICORN=y
+BR2_PACKAGE_LIBSSH_OPENSSL=y
 BR2_PACKAGE_LIBSSH2=y
+BR2_PACKAGE_LIBSSH2_OPENSSL=y
 BR2_PACKAGE_LIBXCRYPT=y
 BR2_PACKAGE_LIBOPENSSL_BIN=y
 BR2_PACKAGE_LIBCURL_CURL=y
@@ -128,7 +130,8 @@ INFIX_DESC="Infix is a Network Operating System based on Linux.  It can be set u
 INFIX_HOME="https://github.com/kernelkit/infix/"
 INFIX_DOC="https://github.com/kernelkit/infix/tree/main/doc"
 INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
-BR2_PACKAGE_TEST_MODE=y
+BR2_PACKAGE_CONFD=y
+BR2_PACKAGE_CONFD_TEST_MODE=y
 BR2_PACKAGE_CURIOS_HTTPD=y
 BR2_PACKAGE_CURIOS_NFTABLES=y
 BR2_PACKAGE_EXECD=y

diff --git a/configs/aarch64_minimal_defconfig b/configs/aarch64_minimal_defconfig
@@ -55,7 +55,9 @@ BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
 BR2_PACKAGE_UBOOT_TOOLS_FIT_CHECK_SIGN=y
 BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE=y
 BR2_PACKAGE_PYTHON3=y
+BR2_PACKAGE_LIBSSH_OPENSSL=y
 BR2_PACKAGE_LIBSSH2=y
+BR2_PACKAGE_LIBSSH2_OPENSSL=y
 BR2_PACKAGE_LIBXCRYPT=y
 BR2_PACKAGE_LIBOPENSSL_BIN=y
 BR2_PACKAGE_LIBCURL_CURL=y
@@ -111,7 +113,8 @@ INFIX_DESC="Infix is a Network Operating System based on Linux.  It can be set u
 INFIX_HOME="https://github.com/kernelkit/infix/"
 INFIX_DOC="https://github.com/kernelkit/infix/tree/main/doc"
 INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
-BR2_PACKAGE_TEST_MODE=y
+BR2_PACKAGE_CONFD=y
+BR2_PACKAGE_CONFD_TEST_MODE=y
 BR2_PACKAGE_GENCERT=y
 BR2_PACKAGE_STATD=y
 BR2_PACKAGE_FACTORY=y

diff --git a/configs/r2s_defconfig b/configs/r2s_defconfig
@@ -173,6 +173,7 @@ INFIX_HOME="https://github.com/kernelkit/infix/"
 INFIX_DOC="https://github.com/kernelkit/infix/tree/main/doc"
 INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
 BR2_PACKAGE_CONFD=y
+# BR2_PACKAGE_CONFD_TEST_MODE is not set
 BR2_PACKAGE_EXECD=y
 BR2_PACKAGE_GENCERT=y
 BR2_PACKAGE_STATD=y
@@ -199,7 +200,6 @@ BR2_PACKAGE_PODMAN_DRIVER_VFS=y
 BR2_PACKAGE_TETRIS=y
 BR2_PACKAGE_ROUSETTE=y
 BR2_PACKAGE_HOST_PYTHON_YANGDOC=y
-# BR2_PACKAGE_TEST_MODE is not set
 TRUSTED_KEYS=y
 TRUSTED_KEYS_DEVELOPMENT=y
 # GNS3_APPLIANCE is not set

diff --git a/configs/riscv64_defconfig b/configs/riscv64_defconfig
@@ -164,6 +164,7 @@ INFIX_HOME="https://github.com/kernelkit/infix/"
 INFIX_DOC="https://github.com/kernelkit/infix/tree/main/doc"
 INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
 BR2_PACKAGE_CONFD=y
+# BR2_PACKAGE_CONFD_TEST_MODE is not set
 BR2_PACKAGE_EXECD=y
 BR2_PACKAGE_GENCERT=y
 BR2_PACKAGE_STATD=y
@@ -190,7 +191,6 @@ BR2_PACKAGE_PODMAN_DRIVER_VFS=y
 BR2_PACKAGE_TETRIS=y
 BR2_PACKAGE_ROUSETTE=y
 BR2_PACKAGE_HOST_PYTHON_YANGDOC=y
-# BR2_PACKAGE_TEST_MODE is not set
 TRUSTED_KEYS=y
 TRUSTED_KEYS_DEVELOPMENT=y
 # GNS3_APPLIANCE is not set

diff --git a/configs/x86_64_defconfig b/configs/x86_64_defconfig
@@ -51,7 +51,9 @@ BR2_PACKAGE_UBOOT_TOOLS_FIT_CHECK_SIGN=y
 BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE=y
 BR2_PACKAGE_PYTHON3=y
 BR2_PACKAGE_PYTHON_GUNICORN=y
+BR2_PACKAGE_LIBSSH_OPENSSL=y
 BR2_PACKAGE_LIBSSH2=y
+BR2_PACKAGE_LIBSSH2_OPENSSL=y
 BR2_PACKAGE_LIBXCRYPT=y
 BR2_PACKAGE_LIBOPENSSL_BIN=y
 BR2_PACKAGE_LIBCURL_CURL=y
@@ -132,7 +134,8 @@ INFIX_DESC="Infix is a Network Operating System based on Linux.  It can be set u
 INFIX_HOME="https://github.com/kernelkit/infix/"
 INFIX_DOC="https://github.com/kernelkit/infix/tree/main/doc"
 INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
-BR2_PACKAGE_TEST_MODE=y
+BR2_PACKAGE_CONFD=y
+BR2_PACKAGE_CONFD_TEST_MODE=y
 BR2_PACKAGE_CURIOS_HTTPD=y
 BR2_PACKAGE_CURIOS_NFTABLES=y
 BR2_PACKAGE_EXECD=y

diff --git a/configs/x86_64_minimal_defconfig b/configs/x86_64_minimal_defconfig
@@ -50,7 +50,9 @@ BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
 BR2_PACKAGE_UBOOT_TOOLS_FIT_CHECK_SIGN=y
 BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE=y
 BR2_PACKAGE_PYTHON3=y
+BR2_PACKAGE_LIBSSH_OPENSSL=y
 BR2_PACKAGE_LIBSSH2=y
+BR2_PACKAGE_LIBSSH2_OPENSSL=y
 BR2_PACKAGE_LIBXCRYPT=y
 BR2_PACKAGE_LIBOPENSSL_BIN=y
 BR2_PACKAGE_LIBCURL_CURL=y
@@ -115,7 +117,8 @@ INFIX_DESC="Infix is a Network Operating System based on Linux.  It can be set u
 INFIX_HOME="https://github.com/kernelkit/infix/"
 INFIX_DOC="https://github.com/kernelkit/infix/tree/main/doc"
 INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
-BR2_PACKAGE_TEST_MODE=y
+BR2_PACKAGE_CONFD=y
+BR2_PACKAGE_CONFD_TEST_MODE=y
 BR2_PACKAGE_GENCERT=y
 BR2_PACKAGE_STATD=y
 BR2_PACKAGE_FACTORY=y

diff --git a/package/Config.in b/package/Config.in
@@ -1,6 +1,6 @@
 menu "Packages"
 source "$BR2_EXTERNAL_INFIX_PATH/package/confd/Config.in"
-source "$BR2_EXTERNAL_INFIX_PATH/package/test-mode/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/package/confd-test-mode/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/curios-httpd/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/curios-nftables/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/execd/Config.in"

diff --git a/package/confd-test-mode/Config.in b/package/confd-test-mode/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_CONFD_TEST_MODE
+	bool "confd test mode"
+	depends on BR2_PACKAGE_CONFD
+	select BR2_PACKAGE_LIBITE
+	select BR2_PACKAGE_LIBYANG
+	select BR2_PACKAGE_SYSREPO
+	select BR2_PACKAGE_LIBSRX
+	help
+	  A companion plugin to confd providing functionality required to
+	  run tests with Infamy, i.e., enable Infix test mode.
diff --git a/package/confd-test-mode/confd-test-mode.mk b/package/confd-test-mode/confd-test-mode.mk
@@ -0,0 +1,32 @@
+CONFD_TEST_MODE_VERSION = 1.0
+CONFD_TEST_MODE_SITE_METHOD = local
+CONFD_TEST_MODE_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/test-mode
+CONFD_TEST_MODE_LICENSE = BSD-3-Clause
+CONFD_TEST_MODE_LICENSE_FILES = LICENSE
+CONFD_TEST_MODE_REDISTRIBUTE = NO
+CONFD_TEST_MODE_DEPENDENCIES = sysrepo libite libyang confd
+CONFD_TEST_MODE_AUTORECONF = YES
+CONFD_TEST_MODE_SYSREPO_SHM_PREFIX = sr_buildroot$(subst /,_,$(CONFIG_DIR))_test_mode
+
+COMMON_SYSREPO_ENV = \
+	SYSREPO_SHM_PREFIX=$(CONFD_SYSREPO_SHM_PREFIX) \
+	SYSREPOCTL_EXECUTABLE="$(HOST_DIR)/bin/sysrepoctl" \
+	SYSREPOCFG_EXECUTABLE="$(HOST_DIR)/bin/sysrepocfg" \
+	SEARCH_PATH="$(TARGET_DIR)/usr/share/yang/modules/confd/"
+
+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
+endef
+define CONFD_TEST_MODE_PERMISSIONS
+	/etc/sysrepo/data/ r 660 root wheel - - - - -
+	/etc/sysrepo/data  d 770 root wheel - - - - -
+endef
+define CONFD_TEST_MODE_CLEANUP
+        rm -f /dev/shm/$(CONFD_TEST_MODE_SYSREPO_SHM_PREFIX)*
+endef
+
+CONFD_TEST_MODE_PRE_INSTALL_TARGET_HOOKS += CONFD_TEST_MODE_CLEANUP
+CONFD_TEST_MODE_POST_INSTALL_TARGET_HOOKS += CONFD_TEST_MODE_INSTALL_YANG_MODULES
+
+$(eval $(autotools-package))
diff --git a/package/test-mode/Config.in b/package/test-mode/Config.in
diff --git a/package/test-mode/test-mode.mk b/package/test-mode/test-mode.mk