From 9faba29108e74eb4acab21f5919dfab0288b23ac Mon Sep 17 00:00:00 2001 From: Norbert Lange Date: Fri, 17 Jul 2020 12:18:36 +0200 Subject: [PATCH] package/busybox: enable flags for use as systemd pager If the less package is not enable and systemd is enabled, then configure the less applet to fully work with systemd. systemd sets the flags for less in an environment variable and requires a few options for correct display. Signed-off-by: Norbert Lange Signed-off-by: Thomas Petazzoni (cherry picked from commit c2caf816e9296c4812f83f0a5d16e0e33a264b72) Signed-off-by: Peter Korsgaard --- package/busybox/busybox.mk | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index b9d82ed71e..55aa9b0bb1 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -237,6 +237,18 @@ define BUSYBOX_SET_SELINUX endef endif +# enable relevant options to allow the Busybox less applet to be used +# as a systemd pager +ifeq ($(BR2_PACKAGE_SYSTEMD):$(BR2_PACKAGE_LESS),y:) +define BUSYBOX_SET_LESS_FLAGS + $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_LESS_DASHCMD) + $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_LESS_RAW) + $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_LESS_TRUNCATE) + $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_LESS_FLAGS) + $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_LESS_ENV) +endef +endif + ifeq ($(BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES),y) define BUSYBOX_SET_INDIVIDUAL_BINARIES $(call KCONFIG_ENABLE_OPT,CONFIG_BUILD_LIBBUSYBOX,$(BUSYBOX_BUILD_CONFIG)) @@ -338,6 +350,7 @@ define BUSYBOX_KCONFIG_FIXUP_CMDS $(BUSYBOX_SET_INIT) $(BUSYBOX_SET_WATCHDOG) $(BUSYBOX_SET_SELINUX) + $(BUSYBOX_SET_LESS_FLAGS) $(BUSYBOX_SET_INDIVIDUAL_BINARIES) endef