recipes/core/drivers-initfs/recipe.toml

 [source]
-git = "https://gitlab.redox-os.org/redox-os/drivers.git"
+same_as = "../drivers"
 
 [build]
 template = "custom"
 script = """
 BINS=(
+    acpid
+    fbbootlogd
     fbcond
     inputd
+    lived
     nvmed
     pcid
+    pcid-spawner
     vesad
-    lived
 )
 
 virt_bins()
@@ -27,7 +30,7 @@ x86_common_bins()
 aarch64_bins()
 {
     case "${BOARD}" in
-        raspi3b | raspi3bp)
+        raspi3b*)
             BINS+=(bcm2835-sdhcid)
         ;;
         *)
@@ -43,7 +46,6 @@ case "${TARGET}" in
         ;;
     x86_64-unknown-redox)
         x86_common_bins
-        BINS+=(acpid)
         ;;
     aarch64-unknown-redox)
         aarch64_bins
@@ -52,7 +54,7 @@ case "${TARGET}" in
         ;;
 esac
 
-mkdir -pv "${COOKBOOK_STAGE}/bin"
+mkdir -pv "${COOKBOOK_STAGE}/bin" "${COOKBOOK_STAGE}/lib/drivers"
 export CARGO_PROFILE_RELEASE_OPT_LEVEL=s
 export CARGO_PROFILE_RELEASE_PANIC=abort
 "${COOKBOOK_CARGO}" build --release \
@@ -60,7 +62,14 @@ export CARGO_PROFILE_RELEASE_PANIC=abort
     $(for bin in "${BINS[@]}"; do echo "-p" "${bin}"; done)
 for bin in "${BINS[@]}"
 do
-    cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/bin"
+    case "${bin}" in
+      pcid | pcid-spawner | fbbootlogd | fbcond | inputd | vesad | lived | ps2d | acpid | bcm2835-sdhcid)
+        cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/bin"
+        ;;
+      *)
+        cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/lib/drivers"
+        ;;
+    esac
 done
 
 mkdir -pv "${COOKBOOK_STAGE}/etc/pcid"

recipes/core/drivers/recipe.toml

@@ -11,10 +11,12 @@ BINS=(
     ihdad
     ixgbed
     pcid
+    pcid-spawner
     rtl8139d
     rtl8168d
     usbctl
     usbhidd
+    usbhubd
     usbscsid
     virtio-netd
     xhcid
@@ -25,14 +27,14 @@ BINS=(
 # depending on the target architecture
 case "${TARGET}" in
     i686-unknown-redox | x86_64-unknown-redox)
-        BINS+=(ac97d bgad pcspkrd sb16d vboxd)
+        BINS+=(ac97d bgad sb16d vboxd)
         ;;
     *)
         ;;
 esac
 
 #Build each driver in the list
-mkdir -pv "${COOKBOOK_STAGE}/bin"
+mkdir -pv "${COOKBOOK_STAGE}/usr/bin" "${COOKBOOK_STAGE}/usr/lib/drivers"
 export CARGO_PROFILE_RELEASE_OPT_LEVEL=s
 export CARGO_PROFILE_RELEASE_PANIC=abort
 "${COOKBOOK_CARGO}" build --release \
@@ -40,16 +42,13 @@ export CARGO_PROFILE_RELEASE_PANIC=abort
     $(for bin in "${BINS[@]}"; do echo "-p" "${bin}"; done)
 for bin in "${BINS[@]}"
 do
-    cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/bin"
+    if [[ "${bin}" == "inputd" || "${bin}" == "pcid" || "${bin}" == "pcid-spawner" ]]; then
+        cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/usr/bin"
+    else
+        cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/usr/lib/drivers"
+    fi
 done
 
-mkdir -pv "${COOKBOOK_STAGE}/bin"
-${FIND} "target/${TARGET}/release" \
-    -maxdepth 1 \
-    -executable \
-    -type f \
-    -exec cp -v {} "${COOKBOOK_STAGE}/bin/" ';'
-
 mkdir -pv "${COOKBOOK_STAGE}/etc/pcid"
 cp -v "${COOKBOOK_SOURCE}/initfs.toml" "${COOKBOOK_STAGE}/etc/pcid/initfs.toml"
 

recipes/core/escalated/recipe.toml

 [source]
 git = "https://gitlab.redox-os.org/redox-os/escalated.git"
-
 # Escalated is not backwards compatible wrt relibc versions, so we pin it here
 # so it's updated together with the other main submodules.
-rev = "efe37543"
-
+rev = "92eed68f"
 [build]
 template = "cargo"

recipes/core/initfs/aarch64-unknown-redox/init.rc

-export PATH /scheme/initfs/bin
-export TMPDIR /tmp
-export RUST_BACKTRACE 1
-nulld
-zerod
-randd
-inputd
-vesad G G G
-unset FRAMEBUFFER_ADDR FRAMEBUFFER_VIRT FRAMEBUFFER_WIDTH FRAMEBUFFER_HEIGHT FRAMEBUFFER_STRIDE
-#TODO: unset FRAMEBUFFER1 and beyond?
-fbcond 1 2
-logd /scheme/debug /scheme/fbcon/1
-stdio /scheme/log
-ramfs logging
-pcid /scheme/initfs/etc/pcid/initfs.toml
-lived
-unset DISK_LIVE_ADDR DISK_LIVE_SIZE
-redoxfs --uuid $REDOXFS_UUID file $REDOXFS_BLOCK
-unset REDOXFS_UUID REDOXFS_BLOCK REDOXFS_PASSWORD_ADDR REDOXFS_PASSWORD_SIZE
-cd /
-export PATH /usr/bin
-run.d /usr/lib/init.d /etc/init.d

recipes/core/initfs/aarch64-unknown-redox/init.rc.raspi3bp

-export PATH /scheme/initfs/bin
-export TMPDIR /tmp
-nulld
-zerod
-randd
-inputd
-vesad G G G
-unset FRAMEBUFFER_ADDR FRAMEBUFFER_VIRT FRAMEBUFFER_WIDTH FRAMEBUFFER_HEIGHT FRAMEBUFFER_STRIDE
-#TODO: unset FRAMEBUFFER1 and beyond?
-fbcond 1 2
-logd /scheme/debug /scheme/fbcon/1
-stdio /scheme/log
-ramfs logging
-lived
-unset DISK_LIVE_ADDR DISK_LIVE_SIZE
-bcm2835-sdhcid
-redoxfs --uuid $REDOXFS_UUID file $REDOXFS_BLOCK
-unset REDOXFS_UUID REDOXFS_BLOCK REDOXFS_PASSWORD_ADDR REDOXFS_PASSWORD_SIZE
-cd /
-export PATH /usr/bin
-run.d /usr/lib/init.d /etc/init.d

recipes/core/initfs/aarch64-unknown-redox/init_drivers.rc

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

recipes/core/initfs/aarch64-unknown-redox/init_drivers.rc.raspi3bp

+bcm2835-sdhcid

recipes/core/initfs/init.rc

-export PATH /scheme/initfs/bin
-export TMPDIR /tmp
+# Various daemons that relibc needs to function as well as a bunch of env vars
+# that should be set for every program.
+export PATH /bin
 export RUST_BACKTRACE 1
 nulld
 zerod
 randd
+
+# Logging and graphics infrastructure
 inputd
-vesad G G G
+vesad
 unset FRAMEBUFFER_ADDR FRAMEBUFFER_VIRT FRAMEBUFFER_WIDTH FRAMEBUFFER_HEIGHT FRAMEBUFFER_STRIDE
 #TODO: unset FRAMEBUFFER1 and beyond?
-fbcond 1 2
-logd /scheme/debug /scheme/fbcon/1
+fbbootlogd
+logd /scheme/debug /scheme/fbbootlog
 stdio /scheme/log
-ps2d us
+inputd -A 1
+fbcond 2
 ramfs logging
-acpid
-pcid /scheme/initfs/etc/pcid/initfs.toml
+
+# Drivers
+run /scheme/initfs/etc/init_drivers.rc
+
+# Mount rootfs
 lived
 unset DISK_LIVE_ADDR DISK_LIVE_SIZE
 redoxfs --uuid $REDOXFS_UUID file $REDOXFS_BLOCK
 unset REDOXFS_UUID REDOXFS_BLOCK REDOXFS_PASSWORD_ADDR REDOXFS_PASSWORD_SIZE
+
+# Exit initfs
+set-default-scheme file
 cd /
 export PATH /usr/bin
 run.d /usr/lib/init.d /etc/init.d

recipes/core/initfs/init_drivers.rc

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

recipes/core/initfs/recipe.toml

@@ -4,37 +4,35 @@ git = "https://gitlab.redox-os.org/redox-os/redox-initfs.git"
 [build]
 template = "custom"
 dependencies = [
+  "base-initfs",
   "bootstrap",
   "drivers-initfs",
-  "init",
-  "logd",
-  "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"
-if [ -e ${COOKBOOK_RECIPE}/${TARGET}/init.rc.${BOARD} ]; then
-    cp "${COOKBOOK_RECIPE}/${TARGET}/init.rc.${BOARD}" "${COOKBOOK_BUILD}/initfs/etc/init.rc"
-elif [ -e ${COOKBOOK_RECIPE}/${TARGET}/init.rc ]; then
-    cp "${COOKBOOK_RECIPE}/${TARGET}/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/bin files to /bin
-mkdir -p "${COOKBOOK_BUILD}/initfs/bin"
-if [ -d "${COOKBOOK_BUILD}/initfs/usr/bin" ]
-then
-    mv "${COOKBOOK_BUILD}/initfs/usr/bin/"* "${COOKBOOK_BUILD}/initfs/bin"
-    rmdir "${COOKBOOK_BUILD}/initfs/usr/bin"
-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"

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

@@ -4,27 +4,7 @@ git = "https://gitlab.redox-os.org/redox-os/kernel.git"
 [build]
 template = "custom"
 script = """
-export RUST_TARGET_PATH="${COOKBOOK_SOURCE}/targets"
-ARCH="$(echo "${TARGET}" | cut -d - -f1)"
-cargo rustc \
-	--bin kernel \
-	--manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \
-	--target "${COOKBOOK_SOURCE}/targets/${ARCH}-unknown-kernel.json" \
-	--release \
-	-Z build-std=core,alloc \
-	-- \
-	-C soft-float \
-	-C link-arg=-T -Clink-arg="${COOKBOOK_SOURCE}/linkers/${ARCH}.ld" \
-	-C link-arg=-z -Clink-arg=max-page-size=0x1000 \
-	--emit link="${PWD}/kernel.all"
-"${TARGET}-objcopy" \
-	--only-keep-debug \
-	kernel.all \
-	kernel.sym
-"${TARGET}-objcopy" \
-	--strip-debug \
-	kernel.all \
-	kernel
+make -f ${COOKBOOK_SOURCE}/Makefile
 mkdir -v "${COOKBOOK_STAGE}/boot"
 cp -v kernel "${COOKBOOK_STAGE}/boot"
 """

recipes/core/pkgar/recipe.toml

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

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/ptyd/recipe.toml

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

recipes/core/ramfs/recipe.toml

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

recipes/core/randd/recipe.toml

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

recipes/core/uutils/recipe.toml

 [source]
-git = "https://github.com/uutils/coreutils"
-rev = "181cfc885b460bbcdf2cf1c866cb1ea48c3f6009"
+git = "https://gitlab.redox-os.org/andrey.turkin/uutils.git"
+branch = "cc-fix"
 
 [build]
 template = "custom"

recipes/demos/gears/recipe.sh

-BUILD_DEPENDS=(liborbital llvm mesa mesa-glu zlib)
-
-function recipe_version {
-    printf "1.0.0"
-    skip=1
-}
-
-function recipe_prepare {
-    rm -rf source
-    mkdir source
-    cp gears.c source
-}
-
-function recipe_build {
-    sysroot="$(realpath ../sysroot)"
-    set -x
-    "${CXX}" -O2 -I "$sysroot/include" -L "$sysroot/lib" gears.c -o gears -static -lorbital $("${PKG_CONFIG}" --libs glu) -lz
-    set +x
-    skip=1
-}
-
-function recipe_clean {
-    "$REDOX_MAKE" clean
-    skip=1
-}
-
-function recipe_stage {
-    dest="$(realpath $1)"
-    mkdir -pv "$dest/bin"
-    cp -v "gears" "$dest/bin/gears"
-    skip=1
-}

recipes/demos/gears/recipe.toml

+[build]
+dependencies=[
+    "liborbital",
+    "llvm18",
+    "mesa",
+    "mesa-glu",
+    "zlib",
+]
+template = "custom"
+script = """
+set -x
+"${CXX}" -O2 -I "${COOKBOOK_SYSROOT}/usr/include" -L "${COOKBOOK_SYSROOT}/usr/lib" "${COOKBOOK_RECIPE}/gears.c" -o gears -static -lorbital $("${PKG_CONFIG}" --libs glu) -lz
+set +x
+mkdir -pv "${COOKBOOK_STAGE}/usr/bin"
+cp -v "gears" "${COOKBOOK_STAGE}/usr/bin/gears"
+"""
\ No newline at end of file