From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 13 Apr 2026 09:12:32 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wCBTD-00BdJt-3A for lore@lore.pengutronix.de; Mon, 13 Apr 2026 09:12:31 +0200 Received: from [127.0.0.1] (helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1wCBTD-0001Z9-NY; Mon, 13 Apr 2026 09:12:31 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1wCBSw-0001Hd-La; Mon, 13 Apr 2026 09:12:14 +0200 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wCBSw-0057yC-1L; Mon, 13 Apr 2026 09:12:14 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.98.2) (envelope-from ) id 1wCBSw-00000001R1p-1WWw; Mon, 13 Apr 2026 09:12:14 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Mon, 13 Apr 2026 09:12:14 +0200 Message-ID: <20260413071214.342218-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260328161943.966987-1-artur@4wiebe.de> References: <20260328161943.966987-1-artur@4wiebe.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] usr-rootfs: always enable, decouple from initmethod X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Artur Wiebe Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 65b45fb254e14d60a0581d7728b9163d04f0327b. Michael [sent from post-receive hook] On Mon, 13 Apr 2026 09:12:14 +0200, Artur Wiebe wrote: > 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 > Message-Id: <20260328161943.966987-1-artur@4wiebe.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/initmethod.in b/rules/initmethod.in > index 6bf67d01ca90..cad86e6b74c2 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 8190c62d13af..f8377ad37743 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