From 21c62f8d899a18b7bd4a5ff508e053606ac2bf28 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Mon, 8 Jan 2024 14:52:07 -0700
Subject: [PATCH] userutils, uutils, zerod: use /usr/bin
---
recipes/core/userutils/recipe.toml | 8 ++++----
recipes/core/uutils/recipe.toml | 2 +-
recipes/core/zerod/recipe.toml | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/recipes/core/userutils/recipe.toml b/recipes/core/userutils/recipe.toml
index ec1920b8c..ef6c897bd 100644
--- a/recipes/core/userutils/recipe.toml
+++ b/recipes/core/userutils/recipe.toml
@@ -6,8 +6,8 @@ template = "custom"
script = """
cookbook_cargo
cp -rv "${COOKBOOK_SOURCE}/res" "${COOKBOOK_STAGE}/etc"
-ln -s id "${COOKBOOK_STAGE}/bin/whoami"
-chmod +s "${COOKBOOK_STAGE}/bin/passwd"
-chmod +s "${COOKBOOK_STAGE}/bin/sudo"
-chmod +s "${COOKBOOK_STAGE}/bin/su"
+ln -s id "${COOKBOOK_STAGE}/usr/bin/whoami"
+chmod +s "${COOKBOOK_STAGE}/usr/bin/passwd"
+chmod +s "${COOKBOOK_STAGE}/usr/bin/sudo"
+chmod +s "${COOKBOOK_STAGE}/usr/bin/su"
"""
diff --git a/recipes/core/uutils/recipe.toml b/recipes/core/uutils/recipe.toml
index 5c75f10e2..3f25cc788 100644
--- a/recipes/core/uutils/recipe.toml
+++ b/recipes/core/uutils/recipe.toml
@@ -80,6 +80,6 @@ BINS=(
for bin in "${BINS[@]}"
do
- ln -sv coreutils "${COOKBOOK_STAGE}/bin/$bin"
+ ln -sv coreutils "${COOKBOOK_STAGE}/usr/bin/$bin"
done
"""
diff --git a/recipes/core/zerod/recipe.toml b/recipes/core/zerod/recipe.toml
index be70616ff..0e8a33841 100644
--- a/recipes/core/zerod/recipe.toml
+++ b/recipes/core/zerod/recipe.toml
@@ -7,7 +7,7 @@ script = """
cookbook_cargo --bin zerod
# TODO: symlinks aren't supported by redox-initfs
-#ln -sv zerod "${COOKBOOK_STAGE}/bin/nulld"
+#ln -sv zerod "${COOKBOOK_STAGE}/usr/bin/nulld"
-cp "${COOKBOOK_STAGE}/bin/zerod" "${COOKBOOK_STAGE}/bin/nulld"
+cp "${COOKBOOK_STAGE}/usr/bin/zerod" "${COOKBOOK_STAGE}/usr/bin/nulld"
"""
--
GitLab