cook.sh

@@ -133,6 +133,14 @@ function op {
                 rm -rf "${COOKBOOK_SYSROOT}"
                 mkdir "${COOKBOOK_SYSROOT}"
 
+                # usrmerge
+                mkdir "${COOKBOOK_SYSROOT}/usr"
+                for folder in bin include lib share
+                do
+                    mkdir "${COOKBOOK_SYSROOT}/usr/${folder}"
+                    ln -s "usr/${folder}" "${COOKBOOK_SYSROOT}/${folder}"
+                done
+
                 if [ ${#BUILD_DEPENDS} -gt 0 ]
                 then
                     pushd $ROOT

recipes/core/zerod/recipe.toml → recipes/core/base-initfs/recipe.toml

 [source]
-git = "https://gitlab.redox-os.org/redox-os/zerod.git"
+same_as = "../base"
 
 [build]
 template = "custom"
 script = """
-cookbook_cargo --bin zerod
+mkdir -pv "${COOKBOOK_STAGE}/usr/bin"
+for package in init logd ramfs randd zerod; do
+    "${COOKBOOK_CARGO}" build \
+        --manifest-path "${COOKBOOK_SOURCE}/${package}/Cargo.toml" \
+        ${build_flags}
+    cp -v \
+        "target/${TARGET}/${build_type}/${package}" \
+        "${COOKBOOK_STAGE}/usr/bin/${package}"
+done
 
 # TODO: symlinks aren't supported by redox-initfs
 #ln -sv zerod "${COOKBOOK_STAGE}/usr/bin/nulld"

recipes/core/base/recipe.toml

+[source]
+git = "https://gitlab.redox-os.org/redox-os/base.git"
+
+[build]
+template = "custom"
+script = """
+mkdir -pv "${COOKBOOK_STAGE}/usr/bin"
+for package in ipcd ptyd; do
+    "${COOKBOOK_CARGO}" build \
+        --manifest-path "${COOKBOOK_SOURCE}/${package}/Cargo.toml" \
+        ${build_flags}
+    cp -v \
+        "target/${TARGET}/${build_type}/${package}" \
+        "${COOKBOOK_STAGE}/usr/bin/${package}"
+done
+
+"${COOKBOOK_CARGO}" build \
+    --manifest-path "${COOKBOOK_SOURCE}/netstack/Cargo.toml" \
+    ${build_flags}
+for bin in smolnetd dnsd; do
+    cp -v \
+        "target/${TARGET}/${build_type}/${bin}" \
+        "${COOKBOOK_STAGE}/usr/bin/${bin}"
+done
+"""

recipes/core/drivers-initfs/recipe.toml

@@ -12,6 +12,7 @@ BINS=(
     lived
     nvmed
     pcid
+    pcid-spawner
     vesad
 )
 
@@ -62,7 +63,7 @@ export CARGO_PROFILE_RELEASE_PANIC=abort
 for bin in "${BINS[@]}"
 do
     case "${bin}" in
-      pcid | fbbootlogd | fbcond | inputd | vesad | lived | ps2d | acpid | bcm2835-sdhcid)
+      pcid | pcid-spawner | fbbootlogd | fbcond | inputd | vesad | lived | ps2d | acpid | bcm2835-sdhcid)
         cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/bin"
         ;;
       *)

recipes/core/drivers/recipe.toml

@@ -11,6 +11,7 @@ BINS=(
     ihdad
     ixgbed
     pcid
+    pcid-spawner
     rtl8139d
     rtl8168d
     usbctl
@@ -26,7 +27,7 @@ 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)
         ;;
     *)
         ;;
@@ -41,7 +42,7 @@ export CARGO_PROFILE_RELEASE_PANIC=abort
     $(for bin in "${BINS[@]}"; do echo "-p" "${bin}"; done)
 for bin in "${BINS[@]}"
 do
-    if [[ "${bin}" == "inputd" || "${bin}" == "pcid" ]]; then
+    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"

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

-export PATH /bin
-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?
-fbbootlogd
-fbcond 2
-logd /scheme/debug /scheme/fbbootlog
-stdio /scheme/log
-ramfs logging
-acpid
-pcid /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
-set-default-scheme file
-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 /bin
-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?
-fbbootlogd
-fbcond 2
-logd /scheme/debug /scheme/fbbootlog
-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
-set-default-scheme file
-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

+# 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?
 fbbootlogd
@@ -12,13 +16,17 @@ fbcond 2
 logd /scheme/debug /scheme/fbbootlog
 stdio /scheme/log
 ramfs logging
-ps2d us
-acpid
-pcid /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

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

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

recipes/core/netstack/recipe.toml

-[source]
-git = "https://gitlab.redox-os.org/redox-os/netstack.git"
-
-[build]
-template = "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/demos/gears/recipe.sh

-BUILD_DEPENDS=(liborbital llvm18 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

recipes/dev/cargo/recipe.toml

@@ -33,8 +33,8 @@ cp -v "target/${TARGET}/release/cargo" "${COOKBOOK_STAGE}/bin/cargo"
 
 [package]
 shared-deps = [
-    "libgcc",
     "curl",
+    "libgcc",
     "libssh2",
     "nghttp2",
     "openssl1",