recipes/dash/recipe.toml → recipes/core/dash/recipe.toml

@@ -18,5 +18,4 @@ sed -i'' -e 's|#define HAVE_GETRLIMIT 1|/* #undef HAVE_GETRLIMIT */|g' config.h
 COOKBOOK_CONFIGURE="true"
 COOKBOOK_CONFIGURE_FLAGS=()
 cookbook_configure
-ln -s "dash" "${COOKBOOK_STAGE}/bin/sh"
 """

recipes/core/drivers-initfs/recipe.toml

+[source]
+same_as = "../drivers"
+
+[build]
+template = "custom"
+script = """
+BINS=(
+    acpid
+    fbbootlogd
+    fbcond
+    inputd
+    lived
+    nvmed
+    pcid
+    pcid-spawner
+    rtcd
+    vesad
+)
+
+virt_bins()
+{
+    BINS+=(virtio-blkd virtio-gpud)
+}
+
+x86_common_bins()
+{
+    BINS+=(ahcid ided ps2d vesad)
+    virt_bins
+}
+
+aarch64_bins()
+{
+    case "${BOARD}" in
+        raspi3b*)
+            BINS+=(bcm2835-sdhcid)
+        ;;
+        *)
+        #qemu-virt
+            virt_bins
+        ;;
+    esac
+}
+
+case "${TARGET}" in
+    i686-unknown-redox)
+        x86_common_bins
+        ;;
+    x86_64-unknown-redox)
+        x86_common_bins
+        ;;
+    aarch64-unknown-redox)
+        aarch64_bins
+        ;;
+    *)
+        ;;
+esac
+
+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 \
+    --manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \
+    $(for bin in "${BINS[@]}"; do echo "-p" "${bin}"; done)
+for bin in "${BINS[@]}"
+do
+    case "${bin}" in
+      pcid | pcid-spawner | fbbootlogd | fbcond | inputd | vesad | lived | ps2d | acpid | bcm2835-sdhcid | rtcd)
+        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"
+cp -v "${COOKBOOK_SOURCE}/initfs.toml" "${COOKBOOK_STAGE}/etc/pcid/initfs.toml"
+"""

recipes/core/drivers/recipe.toml

+[source]
+git = "https://gitlab.redox-os.org/redox-os/drivers.git"
+
+[build]
+template = "custom"
+script = """
+# Drivers that are built on all architectures, and NOT in drivers-initfs
+BINS=(
+    alxd
+    e1000d
+    ihdad
+    ixgbed
+    pcid
+    pcid-spawner
+    rtl8139d
+    rtl8168d
+    usbctl
+    usbhidd
+    usbhubd
+    usbscsid
+    virtio-netd
+    xhcid
+    inputd
+)
+
+# Add additional drivers to the list to build, that are not in drivers-initfs
+# depending on the target architecture
+case "${TARGET}" in
+    i686-unknown-redox | x86_64-unknown-redox)
+        BINS+=(ac97d bgad sb16d vboxd)
+        ;;
+    *)
+        ;;
+esac
+
+#Build each driver in the list
+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 \
+    --manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \
+    $(for bin in "${BINS[@]}"; do echo "-p" "${bin}"; done)
+for bin in "${BINS[@]}"
+do
+    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}/etc/pcid"
+cp -v "${COOKBOOK_SOURCE}/initfs.toml" "${COOKBOOK_STAGE}/etc/pcid/initfs.toml"
+
+mkdir -pv "${COOKBOOK_STAGE}/etc/pcid.d"
+${FIND} "${COOKBOOK_SOURCE}" -maxdepth 3 -type f -name 'config.toml' | while read conf
+do
+    driver="$(basename "$(dirname "$conf")")"
+    cp -v "$conf" "${COOKBOOK_STAGE}/etc/pcid.d/$driver.toml"
+done
+"""

recipes/findutils/recipe.toml → recipes/core/findutils/recipe.toml

@@ -4,8 +4,5 @@ git = "https://gitlab.redox-os.org/redox-os/findutils.git"
 [build]
 template = "custom"
 script = """
-COOKBOOK_CARGO_FLAGS+=(
-    --bin find
-)
-cookbook_cargo
+cookbook_cargo --bin find
 """

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
+rtcd
+nulld
+zerod
+randd
+
+# Logging
+logd /scheme/debug
+stdio /scheme/log
+ramfs logging
+
+# Graphics infrastructure
+inputd
+vesad
+unset FRAMEBUFFER_ADDR FRAMEBUFFER_VIRT FRAMEBUFFER_WIDTH FRAMEBUFFER_HEIGHT FRAMEBUFFER_STRIDE
+#TODO: unset FRAMEBUFFER1 and beyond?
+fbbootlogd
+inputd -A 1
+fbcond 2
+
+# Drivers
+run /scheme/initfs/etc/init_drivers.rc
+unset RSDP_ADDR RSDP_SIZE
+
+# 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/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",
   "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"
 
-cp "${COOKBOOK_BUILD}/initfs.img" "${COOKBOOK_STAGE}/initfs"
+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,7 @@
 git = "https://gitlab.redox-os.org/redox-os/ion.git"
 
 [build]
-template = "cargo"
+template = "custom"
+script = """
+cookbook_cargo
+"""

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/netutils/recipe.toml → recipes/core/netutils/recipe.toml

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

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
 """