From 6d89420774da6216b492871df9007b316199303c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20=C5=81yszczek?= Date: Sun, 12 May 2019 21:55:42 +0200 Subject: [PATCH] package/pkg-generic.mk: add _INSTALL_INIT_OPENRC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * package/pkg-generic.mk Add _INSTALL_INIT_OPENRC so packages can define their own steps to install openrc service scripts. * docs/manual/adding-packages-generic.txt update documentation about new hook. Signed-off-by: Michał Łyszczek Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-generic.txt | 13 +++++++------ package/pkg-generic.mk | 2 ++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index 7be1754f54..5ac07a81b4 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -536,12 +536,13 @@ different steps of the build process. should utilize this step if it has binaries which would be similar to the kernel image, bootloader or root filesystem images. -* +LIBFOO_INSTALL_INIT_SYSV+ and +LIBFOO_INSTALL_INIT_SYSTEMD+ list the - actions to install init scripts either for the systemV-like init systems - (busybox, sysvinit, etc.) or for the systemd units. These commands - will be run only when the relevant init system is installed (i.e. if - systemd is selected as the init system in the configuration, only - +LIBFOO_INSTALL_INIT_SYSTEMD+ will be run). +* +LIBFOO_INSTALL_INIT_SYSV+, +LIBFOO_INSTALL_INIT_OPENRC+ and + +LIBFOO_INSTALL_INIT_SYSTEMD+ list the actions to install init + scripts either for the systemV-like init systems (busybox, + sysvinit, etc.), openrc or for the systemd units. These commands + will be run only when the relevant init system is installed (i.e. + if systemd is selected as the init system in the configuration, + only +LIBFOO_INSTALL_INIT_SYSTEMD+ will be run). * +LIBFOO_HELP_CMDS+ lists the actions to print the package help, which is included to the main +make help+ output. These commands can print diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index e44f5d913c..3b5ee7b356 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -337,6 +337,8 @@ $(BUILD_DIR)/%/.stamp_target_installed: $($(PKG)_INSTALL_INIT_SYSTEMD)) $(if $(BR2_INIT_SYSV)$(BR2_INIT_BUSYBOX),\ $($(PKG)_INSTALL_INIT_SYSV)) + $(if $(BR2_INIT_OPENRC), \ + $($(PKG)_INSTALL_INIT_OPENRC)) $(foreach hook,$($(PKG)_POST_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep)) $(Q)if test -n "$($(PKG)_CONFIG_SCRIPTS)" ; then \ $(RM) -f $(addprefix $(TARGET_DIR)/usr/bin/,$($(PKG)_CONFIG_SCRIPTS)) ; \