Merge branch 'master' of https://gitlab.redox-os.org/redox-os/cookbook

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

@@ -13,7 +13,8 @@ logd /scheme/debug /scheme/fbbootlog
 stdio /scheme/log
 ramfs logging
 acpid
-pcid /etc/pcid/initfs.toml
+pcid
+pcid-spawner /etc/pcid/initfs.toml
 lived
 unset DISK_LIVE_ADDR DISK_LIVE_SIZE
 redoxfs --uuid $REDOXFS_UUID file $REDOXFS_BLOCK

recipes/core/initfs/init.rc

@@ -14,7 +14,8 @@ stdio /scheme/log
 ramfs logging
 ps2d us
 acpid
-pcid /etc/pcid/initfs.toml
+pcid
+pcid-spawner /etc/pcid/initfs.toml
 lived
 unset DISK_LIVE_ADDR DISK_LIVE_SIZE
 redoxfs --uuid $REDOXFS_UUID file $REDOXFS_BLOCK

recipes/core/initfs/recipe.toml

@@ -12,6 +12,7 @@ dependencies = [
 script = """
 INITFS_RM_BINS='redoxfs-ar redoxfs-mkfs'
 
+rm -r "${COOKBOOK_BUILD}/initfs"
 mkdir -p "${COOKBOOK_BUILD}/initfs/etc"
 
 cp -r "${COOKBOOK_SYSROOT}/"* "${COOKBOOK_BUILD}/initfs"

recipes/games/opentyrian/recipe.toml

@@ -43,8 +43,5 @@ curl -OL https://camanis.net/tyrian/tyrian21.zip
 sha256sum -c tyrian21.zip.sha
 unzip -jd "${ASSETSDIR}" tyrian21.zip
 
-# The build system doesn't automatically apply patches to cloned repositories
-git apply "${COOKBOOK_RECIPE}/redox.patch"
-
 cookbook_configure
 """