[sysroot] Use a merged /usr layout

mcb30 · mcb30 · commit 35ab9a6a46df · 2026-02-12T18:57:39.000Z
In the RISC-V 32-bit sysroot, some quirk seems to cause compiled
binaries to fail to locate libc.so.6 if they were linked with -lslirp.
Experiments indicate that the loader is for some reason searching for
/usr/lib/libc.so.6 rather than /lib/libc.so.6.

Fix by using a merged /usr layout so that this distinction goes away.

Signed-off-by: Michael Brown &lt;mbrown@fensystems.co.uk&gt;
diff --git a/sysroot/configs/sysroot_arm32_defconfig b/sysroot/configs/sysroot_arm32_defconfig
@@ -1,6 +1,7 @@
 BR2_arm=y
 BR2_ARM_ENABLE_VFP=y
 BR2_INIT_NONE=y
+BR2_ROOTFS_MERGED_USR=y
 BR2_SYSTEM_BIN_SH_NONE=y
 # BR2_PACKAGE_BUSYBOX is not set
 BR2_PACKAGE_SLIRP=y
diff --git a/sysroot/configs/sysroot_arm64_defconfig b/sysroot/configs/sysroot_arm64_defconfig
@@ -1,5 +1,6 @@
 BR2_aarch64=y
 BR2_INIT_NONE=y
+BR2_ROOTFS_MERGED_USR=y
 BR2_SYSTEM_BIN_SH_NONE=y
 # BR2_PACKAGE_BUSYBOX is not set
 BR2_PACKAGE_SLIRP=y
diff --git a/sysroot/configs/sysroot_loong64_defconfig b/sysroot/configs/sysroot_loong64_defconfig
@@ -1,5 +1,6 @@
 BR2_loongarch64=y
 BR2_INIT_NONE=y
+BR2_ROOTFS_MERGED_USR=y
 BR2_SYSTEM_BIN_SH_NONE=y
 # BR2_PACKAGE_BUSYBOX is not set
 BR2_PACKAGE_SLIRP=y
diff --git a/sysroot/configs/sysroot_riscv32_defconfig b/sysroot/configs/sysroot_riscv32_defconfig
@@ -1,6 +1,7 @@
 BR2_riscv=y
 BR2_RISCV_32=y
 BR2_INIT_NONE=y
+BR2_ROOTFS_MERGED_USR=y
 BR2_SYSTEM_BIN_SH_NONE=y
 # BR2_PACKAGE_BUSYBOX is not set
 BR2_PACKAGE_SLIRP=y
diff --git a/sysroot/configs/sysroot_riscv64_defconfig b/sysroot/configs/sysroot_riscv64_defconfig
@@ -1,5 +1,6 @@
 BR2_riscv=y
 BR2_INIT_NONE=y
+BR2_ROOTFS_MERGED_USR=y
 BR2_SYSTEM_BIN_SH_NONE=y
 # BR2_PACKAGE_BUSYBOX is not set
 BR2_PACKAGE_SLIRP=y
