[ptxdist] [PATCH] usr-rootfs: always enable, decouple from initmethod

[ptxdist] [PATCH] usr-rootfs: always enable, decouple from initmethod

[Artur Wiebe via ptxdist]

usr-rootfs installs the /usr merge symlinks (/bin → usr/bin,
/sbin → usr/sbin, /lib → usr/lib). These are required for any
dynamically linked binary to run, as the dynamic linker is looked
up via /lib64 → usr/lib.

Previously usr-rootfs was pulled in via "select USR_ROOTFS" in
initmethod. This broke minimal initramfs setups where /init is a
plain shell script and INITMETHOD is disabled: without the symlinks,
even busybox fails to start because the dynamic linker cannot be
found.

The UsrMerge layout is unconditionally needed on any target image,
so make USR_ROOTFS a bool with default y and remove the dependency
from initmethod.

Signed-off-by: Artur Wiebe <artur@4wiebe.de>
---
 rules/initmethod.in | 1 -
 rules/usr-rootfs.in | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/initmethod.in b/rules/initmethod.in
index 6bf67d01c..cad86e6b7 100644
--- a/rules/initmethod.in
+++ b/rules/initmethod.in
@@ -2,7 +2,6 @@
 
 menuconfig INITMETHOD
 	bool  "init                          "
-	select USR_ROOTFS
 	default y
 	help
 	  Choose the system startup init method here
diff --git a/rules/usr-rootfs.in b/rules/usr-rootfs.in
index 8190c62d1..f8377ad37 100644
--- a/rules/usr-rootfs.in
+++ b/rules/usr-rootfs.in
@@ -1,5 +1,6 @@
 ## SECTION=rootfs
 
 config USR_ROOTFS
-	tristate
+	bool
+	default y
 	select BASE
-- 
2.53.0