recipes/core/initfs/init_drivers.rc

+ps2d us
+acpid
+pcid
+pcid-spawner /etc/pcid/initfs.toml

recipes/initfs/recipe.toml → recipes/core/initfs/recipe.toml

@@ -4,30 +4,41 @@ git = "https://gitlab.redox-os.org/redox-os/redox-initfs.git"
 [build]
 template = "custom"
 dependencies = [
+  "base-initfs",
+  "bootstrap",
   "drivers-initfs",
-  "init",
-  "logd",
-  "nulld",
-  "ramfs",
-  "randd",
   "redoxfs",
-  "zerod",
 ]
 script = """
 INITFS_RM_BINS='redoxfs-ar redoxfs-mkfs'
 
+rm -rf "${COOKBOOK_BUILD}/initfs"
 mkdir -p "${COOKBOOK_BUILD}/initfs/etc"
 
 cp -r "${COOKBOOK_SYSROOT}/"* "${COOKBOOK_BUILD}/initfs"
 
 # TODO: Move init.rc to another recipe, perhaps initfs-misc? Then it can be installed as a regular dependency.
 cp "${COOKBOOK_RECIPE}/init.rc" "${COOKBOOK_BUILD}/initfs/etc/init.rc"
+cp "${COOKBOOK_RECIPE}/init_drivers.rc" "${COOKBOOK_BUILD}/initfs/etc/init_drivers.rc"
+if [ -e ${COOKBOOK_RECIPE}/${TARGET}/init_drivers.rc.${BOARD} ]; then
+    cp "${COOKBOOK_RECIPE}/${TARGET}/init_drivers.rc.${BOARD}" "${COOKBOOK_BUILD}/initfs/etc/init_drivers.rc"
+elif [ -e ${COOKBOOK_RECIPE}/${TARGET}/init_drivers.rc ]; then
+    cp "${COOKBOOK_RECIPE}/${TARGET}/init_drivers.rc" "${COOKBOOK_BUILD}/initfs/etc/init_drivers.rc"
+fi
+
+# Move /usr folders to / and remove links
+for folder in bin lib include share
+do
+    rm "${COOKBOOK_BUILD}/initfs/${folder}"
+    mv "${COOKBOOK_BUILD}/initfs/usr/${folder}" "${COOKBOOK_BUILD}/initfs/${folder}"
+done
+rmdir "${COOKBOOK_BUILD}/initfs/usr"
 
 for bin in ${INITFS_RM_BINS}; do
   rm -f "${COOKBOOK_BUILD}/initfs/bin/$bin"
 done
 
-env -u CARGO cargo run --manifest-path "${COOKBOOK_SOURCE}/tools/Cargo.toml" --bin redox-initfs-ar -- "${COOKBOOK_BUILD}/initfs" -o "${COOKBOOK_BUILD}/initfs.img"
+env -u CARGO cargo run --manifest-path "${COOKBOOK_SOURCE}/tools/Cargo.toml" --bin redox-initfs-ar -- "${COOKBOOK_BUILD}/initfs" "${COOKBOOK_SYSROOT}/boot/bootstrap" -o "${COOKBOOK_BUILD}/initfs.img"
 
 mkdir -v "${COOKBOOK_STAGE}/boot"
 cp "${COOKBOOK_BUILD}/initfs.img" "${COOKBOOK_STAGE}/boot/initfs"

recipes/ion/recipe.toml → recipes/core/ion/recipe.toml

@@ -2,4 +2,11 @@
 git = "https://gitlab.redox-os.org/redox-os/ion.git"
 
 [build]
-template = "cargo"
+template = "custom"
+script = """
+DYNAMIC_INIT
+cookbook_cargo
+"""
+
+[package]
+shared-deps = ["libgcc"]

recipes/core/kernel/recipe.toml

+[source]
+git = "https://gitlab.redox-os.org/redox-os/kernel.git"
+
+[build]
+template = "custom"
+script = """
+make -f ${COOKBOOK_SOURCE}/Makefile
+mkdir -v "${COOKBOOK_STAGE}/boot"
+cp -v kernel "${COOKBOOK_STAGE}/boot"
+"""

recipes/core/pkgar/recipe.toml

+[source]
+git = "https://gitlab.redox-os.org/redox-os/pkgar.git"
+
+[build]
+template = "custom"
+script = """
+"${COOKBOOK_CARGO}" install \
+    --path "${COOKBOOK_SOURCE}/pkgar" \
+    --root "${COOKBOOK_STAGE}/usr" \
+    --locked \
+    --no-track
+"""

recipes/pkgutils/recipe.toml → recipes/core/pkgutils/recipe.toml

@@ -2,4 +2,8 @@
 git = "https://gitlab.redox-os.org/redox-os/pkgutils.git"
 
 [build]
-template = "cargo"
+template = "custom"
+script = """
+PACKAGE_PATH=pkg-cli
+cookbook_cargo
+"""

recipes/core/profiled/recipe.toml

+[source]
+git = "https://gitlab.redox-os.org/redox-os/profiled.git"
+
+[build]
+template = "cargo"

recipes/redoxerd/recipe.toml → recipes/core/redoxerd/recipe.toml

@@ -4,9 +4,6 @@ git = "https://gitlab.redox-os.org/redox-os/redoxer.git"
 [build]
 template = "custom"
 script = """
-COOKBOOK_CARGO_FLAGS=(
-    --path "${COOKBOOK_SOURCE}/daemon"
-    --root "${COOKBOOK_STAGE}"
-)
+COOKBOOK_SOURCE="${COOKBOOK_SOURCE}/daemon"
 cookbook_cargo
 """

recipes/relibc/recipe.toml → recipes/core/relibc/recipe.toml

@@ -5,5 +5,5 @@ git = "https://gitlab.redox-os.org/redox-os/relibc.git"
 template = "custom"
 script = """
 rsync -av --delete "${COOKBOOK_SOURCE}/" ./
-"$REDOX_MAKE" CARGO="env -u CARGO cargo" -j"$($NPROC)" DESTDIR="${COOKBOOK_STAGE}" install
+"${COOKBOOK_MAKE}" CARGO="env -u CARGO cargo" -j"$($NPROC)" DESTDIR="${COOKBOOK_STAGE}" install
 """

recipes/userutils/recipe.toml → 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"
 """

recipes/uutils/recipe.toml → recipes/core/uutils/recipe.toml

 [source]
-git = "https://gitlab.redox-os.org/redox-os/uutils.git"
-branch = "redox"
+git = "https://gitlab.redox-os.org/andrey.turkin/uutils.git"
+branch = "cc-fix"
 
 [build]
 template = "custom"
 script = """
-COOKBOOK_CARGO_FLAGS+=(
-    --no-default-features
-    --features feat_os_unix_redox
-    --bin coreutils
-)
-cookbook_cargo
+cookbook_cargo --no-default-features --features feat_os_unix_redox --bin coreutils
 
 BINS=(
     base32
@@ -68,6 +63,7 @@ BINS=(
     sleep
     sort
     split
+    stat
     sum
     tac
     tail
@@ -84,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
 """