commit: 3669db9125b7141b234a1bb48dd04a6cc419caeb
parent 5b84cdd1787ba627b66f05d426a2da1c1e7fe80a
Author: fosslinux <fosslinux@aussies.space>
Date: Fri, 12 Jan 2024 22:12:47 +1100
Use merged usr throughout the entire bootstrap
Diffstat:
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/steps/improve/finalize_fhs.sh b/steps/improve/finalize_fhs.sh
@@ -3,13 +3,6 @@
# SPDX-FileCopyrightText: 2023 fosslinux <fosslinux@aussies.space>
#
# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# Add the rest of the FHS that we will use and is not created pre-boot
-rm -rf /sbin /usr/sbin
-ln -s /usr/bin /usr/sbin
-for d in bin lib sbin; do
- ln -s "/usr/${d}" "/${d}" || true # these might exist if rerunning
-done
mkdir -p /etc /run /var/log /var/lock /var/spool /var/tmp /var/cache
diff --git a/steps/improve/merged_usr.sh b/steps/improve/merged_usr.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+# SPDX-FileCopyrightText: 2023 fosslinux <fosslinux@aussies.space>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# Add the rest of the FHS that we will use and is not created pre-boot
+ln -s bin /usr/sbin
+for d in bin lib sbin; do
+ ln -s "usr/${d}" "/${d}" || true # these might exist if rerunning
+done
diff --git a/steps/manifest b/steps/manifest
@@ -53,6 +53,7 @@ build: heirloom-devtools-070527
build: bash-2.05b
improve: setup_repo
improve: update_env
+improve: merged_usr
build: flex-2.5.11
build: tcc-0.9.27
improve: musl_libdir
