Re: [Buildroot] [PATCH] Fix restorecond startup for sysvinit builds

[Baruch Siach <baruch@tkos.co.il>]

Hi José,

On Fri, Jul 23 2021, José Pekkarinen wrote:
> Currently restorecond init script sources the
> file /etc/rc.d/init.d/functions, that in some
> init systems, like sysvinit, may not be available,
> however, it doesn't actually uses any function
> from it.
>
> Also, the init script uses daemon, that is not
> marked as a dependency. So this patches adds its
> dependency to guarantee it's present in the build.
>
> Signed-off-by: José Pekkarinen <jose.pekkarinen@unikie.com>
> ---
>  package/restorecond/Config.in      |  2 +
>  package/restorecond/S20restorecond | 86 ++++++++++++++++++++++++++++++
>  package/restorecond/restorecond.mk |  4 +-
>  3 files changed, 90 insertions(+), 2 deletions(-)
>  create mode 100644 package/restorecond/S20restorecond
>
> diff --git a/package/restorecond/Config.in b/package/restorecond/Config.in
> index 31f85f2882..c2e773eace 100644
> --- a/package/restorecond/Config.in
> +++ b/package/restorecond/Config.in
> @@ -4,11 +4,13 @@ config BR2_PACKAGE_RESTORECOND
>  	depends on BR2_USE_WCHAR # libglib2
>  	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
>  	depends on !BR2_STATIC_LIBS # libselinux
> +	depends on BR2_PACKAGE_DAEMON # daemon

No need to depend on package you select.

>  	select BR2_PACKAGE_DBUS
>  	select BR2_PACKAGE_DBUS_GLIB
>  	select BR2_PACKAGE_LIBGLIB2
>  	select BR2_PACKAGE_LIBSELINUX
>  	select BR2_PACKAGE_LIBSEPOL
> +	select BR2_PACKAGE_DAEMON

Since BR2_PACKAGE_RESTORECOND depends on MMU and THREADS already, there
is no need to add dependencies. But it would be nice to add "daemon"
in the comment next to these dependencies above.

>  	help
>  	  restorecond is a daemon that watches for file creation and
>  	  then sets the default SELinux file context for that file.

[...]

> diff --git a/package/restorecond/restorecond.mk b/package/restorecond/restorecond.mk
> index 7ab7e978dd..1546661baf 100644
> --- a/package/restorecond/restorecond.mk
> +++ b/package/restorecond/restorecond.mk
> @@ -9,7 +9,7 @@ RESTORECOND_SITE = https://github.com/SELinuxProject/selinux/releases/download/2
>  RESTORECOND_LICENSE = GPL-2.0
>  RESTORECOND_LICENSE_FILES = COPYING
>  
> -RESTORECOND_DEPENDENCIES = libglib2 libsepol libselinux dbus-glib
> +RESTORECOND_DEPENDENCIES = libglib2 libsepol libselinux dbus-glib daemon

This is a run-time dependency, right? If so there is no need for daemon
to build before restorecond. But add a "runtime" comment next to
select BR2_PACKAGE_DAEMON.

baruch

>  
>  # Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h
>  # large file support.
> @@ -27,7 +27,7 @@ define RESTORECOND_BUILD_CMDS
>  endef
>  
>  define RESTORECOND_INSTALL_INIT_SYSV
> -	$(INSTALL) -m 0755 -D $(@D)/restorecond.init \
> +	$(INSTALL) -m 0755 -D package/restorecond/S20restorecond \
>  		$(TARGET_DIR)/etc/init.d/S20restorecond
>  endef


-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot