[Buildroot] [PATCH v2 3/4] package/openrc: adapt "modules" init script to busybox "modprobe"
unixmania at gmail.com
unixmania at gmail.com
Thu Feb 27 20:08:14 UTC 2020
From: Carlos Santos <unixmania at gmail.com>
If kmod tools are not selected, check the busybox configuration files
and adapt the modules script accordingly:
- Busybox modprobe does not have a "--first-time" option.
- The "--verbose" option is just "-v".
- The "--use-blacklist" option is just "-b". Also blacklist support is
not selected in the default busybox configuration.
If modprobe is not available, do not install the modules script and
configuration file.
Signed-off-by: Carlos Santos <unixmania at gmail.com>
---
package/openrc/openrc.mk | 28 +++++++++++++++++++++++++---
1 file changed, 25 insertions(+), 3 deletions(-)
diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk
index 3f6453cef5..0fc87f95b1 100644
--- a/package/openrc/openrc.mk
+++ b/package/openrc/openrc.mk
@@ -9,7 +9,7 @@ OPENRC_SITE = $(call github,OpenRC,openrc,$(OPENRC_VERSION))
OPENRC_LICENSE = BSD-2-Clause
OPENRC_LICENSE_FILES = LICENSE
-OPENRC_DEPENDENCIES = ncurses
+OPENRC_DEPENDENCIES = ncurses $(if $(BR2_PACKAGE_BUSYBOX),busybox)
# set LIBNAME so openrc puts files in proper directories and sets proper
# paths in installed files. Since in buildroot /lib64 and /lib32 always
@@ -29,9 +29,31 @@ else
OPENRC_MAKE_OPTS += MKSTATICLIBS=yes
endif
-define OPENRC_BUILD_CMDS
- $(MAKE) $(OPENRC_MAKE_OPTS) -C $(@D)
+# modprobe can be provided by either kmod or busybox
+ifeq ($(BR2_PACKAGE_KMOD_TOOLS),)
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+# Busybox modprobe does not have a --first-time option; --verbose is just -v
+# and --use-blacklist is just -b.
+OPENRC_BB_FILES = $(BUSYBOX_KCONFIG_FILE) $(BUSYBOX_KCONFIG_FRAGMENT_FILES) $(BUSYBOX_BUILD_CONFIG)
+ifeq ($(call KCONFIG_GET_OPT,CONFIG_MODPROBE,$(OPENRC_BB_FILES)),y)
+ifeq ($(call KCONFIG_GET_OPT,CONFIG_FEATURE_MODPROBE_BLACKLIST,$(OPENRC_BB_FILES)),y)
+OPENRC_MODULES_BLACKLIST = s/ --use-blacklist/ -b/
+else
+OPENRC_MODULES_BLACKLIST = s/ --use-blacklist//
+endif
+define OPENRC_MODULES_CLEAN
+ $(SED) 's/ --first-time//;$(OPENRC_MODULES_BLACKLIST);s/--verbose/-v/' \
+ $(@D)/init.d/modules.in
+endef
+else # BR2_PACKAGE_BUSYBOX
+# No modprobe command available. Do not build/install the modules script.
+define OPENRC_MODULES_CLEAN
+ $(SED) 's/ modules//' $(@D)/{conf.d,init.d,runlevels}/Makefile
endef
+endif # CONFIG_MODPROBE
+OPENRC_POST_PATCH_HOOKS += OPENRC_MODULES_CLEAN
+endif # BR2_PACKAGE_BUSYBOX
+endif # BR2_PACKAGE_KMOD_TOOLS
define OPENRC_INSTALL_TARGET_CMDS
$(MAKE) $(OPENRC_MAKE_OPTS) DESTDIR=$(TARGET_DIR) -C $(@D) install
--
2.18.2
More information about the buildroot
mailing list