From a4b1d377632d667baf04e4788cd32838c7a0ebc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= Date: Mon, 20 May 2024 15:29:17 +0200 Subject: [PATCH] confd: Update SHM path Do not use netopeer-created shm-path --- package/confd/confd.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/confd/confd.mk b/package/confd/confd.mk index 56e1afc6..8654f2b4 100644 --- a/package/confd/confd.mk +++ b/package/confd/confd.mk @@ -11,12 +11,11 @@ CONFD_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/confd CONFD_LICENSE = BSD-3-Clause CONFD_LICENSE_FILES = LICENSE CONFD_REDISTRIBUTE = NO -CONFD_DEPENDENCIES = host-sysrepo netopeer2 augeas jansson libite sysrepo libsrx libglib2 +CONFD_DEPENDENCIES = host-sysrepo augeas jansson libite sysrepo libsrx libglib2 CONFD_AUTORECONF = YES -CONFD_SYSREPO_SHM_PREFIX = sr_buildroot$(subst /,_,$(CONFIG_DIR))_netopeer2 +CONFD_SYSREPO_SHM_PREFIX = sr_buildroot$(subst /,_,$(CONFIG_DIR))_confd -echo "prefix: $(CONFD_SYSREPO_SHM_PREFIX)" define CONFD_CONF_ENV CFLAGS="$(INFIX_CFLAGS)" endef @@ -383,8 +382,9 @@ define CONFD_PERMISSIONS endef define CONFD_CLEANUP - rm -f /dev/shm/$(NETOPEER2_SYSREPO_SHM_PREFIX)* + rm -f /dev/shm/$(CONFD_SYSREPO_SHM_PREFIX)* endef +CONFD_PRE_INSTALL_TARGET_HOOKS += CONFD_CLEANUP CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_EXTRA CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_YANG_MODULES CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_CLEANUP