MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-07-08 20:48:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jeremy Soller 2025-03-01 20:58:04 -07:00
commit be90e40f48
No known key found for this signature in database
GPG Key ID: 670FDFB5428E05CA
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
recipes/core/drivers-initfs/recipe.toml
View File

@ -12,6 +12,7 @@ BINS=(
lived lived
nvmed nvmed
pcid pcid
pcid-spawner
vesad vesad
) )
@ -62,7 +63,7 @@ export CARGO_PROFILE_RELEASE_PANIC=abort
for bin in "${BINS[@]}" for bin in "${BINS[@]}"
do do
case "${bin}" in 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" cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/bin"
;; ;;
*) *)

3
recipes/core/drivers/recipe.toml
View File

@ -11,6 +11,7 @@ BINS=(
ihdad ihdad
ixgbed ixgbed
pcid pcid
pcid-spawner
rtl8139d rtl8139d
rtl8168d rtl8168d
usbctl 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 echo "-p" "${bin}"; done)
for bin in "${BINS[@]}" for bin in "${BINS[@]}"
do 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" cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/usr/bin"
else else
cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/usr/lib/drivers" cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/usr/lib/drivers"

3
recipes/core/initfs/aarch64-unknown-redox/init.rc
View File

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

3
recipes/core/initfs/init.rc
View File

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

1
recipes/core/initfs/recipe.toml
View File

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

3
recipes/games/opentyrian/recipe.toml
View File

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