From 64aa3b544cb856cdb359d6c81ca2116429174d4e Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 27 Nov 2023 13:51:48 +0100 Subject: [PATCH] package/klish-plugin-sysrepo: fix regression in release cycle Fix regression in line-drawing characters, introduced in c38c8a4. Signed-off-by: Joachim Wiberg --- package/klish-plugin-sysrepo/klish-plugin-sysrepo.mk | 3 +-- package/klish/klish.mk | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/klish-plugin-sysrepo/klish-plugin-sysrepo.mk b/package/klish-plugin-sysrepo/klish-plugin-sysrepo.mk index 047e336e..2a0fcd0e 100644 --- a/package/klish-plugin-sysrepo/klish-plugin-sysrepo.mk +++ b/package/klish-plugin-sysrepo/klish-plugin-sysrepo.mk @@ -17,8 +17,7 @@ KLISH_PLUGIN_SYSREPO_AUTORECONF = YES ifeq ($(BR2_PACKAGE_KLISH_PLUGIN_SYSREPO_XML),y) define KLISH_PLUGIN_SYSREPO_INSTALL_XML - $(INSTALL) -t $(TARGET_DIR)/etc/klish -D -m 0644 \ - $(@D)/xml/sysrepo.xml + $(INSTALL) -t $(TARGET_DIR)/etc/klish -D -m 0644 $(@D)/xml/sysrepo.xml endef KLISH_PLUGIN_SYSREPO_POST_INSTALL_TARGET_HOOKS += \ KLISH_PLUGIN_SYSREPO_INSTALL_XML diff --git a/package/klish/klish.mk b/package/klish/klish.mk index 8ecedddc..8cd2ffb9 100644 --- a/package/klish/klish.mk +++ b/package/klish/klish.mk @@ -20,15 +20,14 @@ KLISH_CONF_OPTS += --with-libxml2 define KLISH_INSTALL_CONFIG $(INSTALL) -t $(TARGET_DIR)/etc/klish -D -m 0644 \ $(@D)/plugins/klish/xml/ptypes.xml - $(INSTALL) -m 0644 $(KLISH_PKGDIR)/klish.conf $(@D)/klish.conf - $(INSTALL) -m 0644 $(KLISH_PKGDIR)/klishd.conf $(@D)/klishd.conf + $(INSTALL) -t $(TARGET_DIR)/etc/klish -m 0644 $(KLISH_PKGDIR)/klish.conf + $(INSTALL) -t $(TARGET_DIR)/etc/klish -m 0644 $(KLISH_PKGDIR)/klishd.conf endef KLISH_POST_INSTALL_TARGET_HOOKS += KLISH_INSTALL_CONFIG ifeq ($(BR2_PACKAGE_KLISH_DEFAULT_XML),y) define KLISH_INSTALL_XML - $(INSTALL) -t $(TARGET_DIR)/etc/klish -D -m 0644 \ - $(BR2_EXTERNAL_INFIX_PATH)/package/klish/default.xml + $(INSTALL) -t $(TARGET_DIR)/etc/klish -m 0644 $(KLISH_PKGDIR)/default.xml endef KLISH_POST_INSTALL_TARGET_HOOKS += KLISH_INSTALL_XML endif