From 22015430909ca8bb5e93d8a4e1926e63a4484413 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Wed, 7 Aug 2024 17:52:35 +0200 Subject: [PATCH] package/finit: add support for BR2_ROOTFS_MERGED_USR Ensure Finit installs its files to /usr/lib/finit when building with the merged-usr config option. For consistency we adjust --exec-prefix, which is the base for $libdir, meaning also /libexec is moved to /usr/libexec. Finit tracks the paths internally, we only need to update runparts probe. Signed-off-by: Joachim Wiberg --- board/common/rootfs/etc/finit.d/10-infix.conf | 4 +++- package/finit/finit.mk | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/board/common/rootfs/etc/finit.d/10-infix.conf b/board/common/rootfs/etc/finit.d/10-infix.conf index c7f0f632..dd0dc393 100644 --- a/board/common/rootfs/etc/finit.d/10-infix.conf +++ b/board/common/rootfs/etc/finit.d/10-infix.conf @@ -1 +1,3 @@ -task name:ixinit log:tag:ixinit [S] /libexec/finit/runparts -bp /libexec/infix/init.d -- Probing system +task name:ixinit log:tag:ixinit [S] \ + /usr/libexec/finit/runparts -bp /libexec/infix/init.d \ + -- Probing system diff --git a/package/finit/finit.mk b/package/finit/finit.mk index 4f0fa3fc..cb890033 100644 --- a/package/finit/finit.mk +++ b/package/finit/finit.mk @@ -27,13 +27,18 @@ FINIT_D = $(TARGET_DIR)/etc/finit.d # no override necessary there. FINIT_CONF_OPTS = \ --prefix=/usr \ - --exec-prefix= \ --disable-doc \ --disable-contrib \ --disable-rescue \ --disable-silent-rules \ --with-group=$(BR2_PACKAGE_FINIT_INITCTL_GROUP) +ifeq ($(BR2_ROOTFS_MERGED_USR),y) +FINIT_CONF_OPTS += --exec-prefix=/usr +else +FINIT_CONF_OPTS += --exec-prefix= +endif + ifeq ($(BR2_PACKAGE_FINIT_ADVANCED),y) ifneq ($(BR2_PACKAGE_FINIT_CUSTOM_FSTAB),) FINIT_CONF_OPTS += --with-fstab=$(BR2_PACKAGE_FINIT_CUSTOM_FSTAB)