.cargo/config → .cargo/config.toml

@@ -9,3 +9,10 @@ rustflags = []
 [target.x86_64-unknown-redox]
 linker = "x86_64-unknown-redox-gcc"
 rustflags = []
+
+[target.riscv64gc-unknown-redox]
+linker = "riscv64-unknown-redox-gcc"
+rustflags = []
+
+[env]
+CFLAGS_riscv64gc_unknown_redox="-march=rv64gc -mabi=lp64d"

.gitmodules

@@ -6,7 +6,3 @@
 	path = pkgar
 	url = https://gitlab.redox-os.org/redox-os/pkgar.git
 	branch = master
-[submodule "pkgutils"]
-	path = pkgutils
-	url = https://gitlab.redox-os.org/redox-os/pkgutils.git
-	branch = master

Cargo.toml

@@ -20,12 +20,12 @@ name = "cookbook"
 path = "src/lib.rs"
 
 [dependencies]
-blake3 = "1.5"
+blake3 = "=1.5.3" # 1.5.4 is incompatible with blake3 0.3 dependency from pkgar
 pbr = "1.0.2"
 pkgar = "0.1.7"
 pkgar-keys = "0.1.0"
 redoxer = "0.2"
-serde = { version = "1.0.110", features = ["derive"] }
-termion = "1.5.5"
-toml = "0.5.6"
+serde = { version = "=1.0.197", features = ["derive"] }
+termion = "4"
+toml = "0.8"
 walkdir = "2.3.1"

README.md

@@ -6,7 +6,7 @@ This repository contains the system source code and packages inside the `recipes
 
 - A recipe can be a software port or system package (they use `pkgar` or `tar.gz` formats).
 
-**Read [this](https://doc.redox-os.org/book/ch09-03-porting-applications.html) page before porting programs to Redox**
+**Read [this](https://doc.redox-os.org/book/porting-applications.html) page before porting programs to Redox**
 
 In order for this repository to be useful, it must be set up with an environment
 from the [redox](https://gitlab.redox-os.org/redox-os/redox) repository.
@@ -14,6 +14,7 @@ from the [redox](https://gitlab.redox-os.org/redox-os/redox) repository.
 [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE)
 
 - [Recipe Categories](#recipe-categories)
+- [Search Recipes](#search-recipes)
 - [Package Policy](#package-policy)
     - [Cross-Compilation](#cross-compilation)
     - [Library Linking](#library-linking)
@@ -34,9 +35,10 @@ The categories inside the `recipes` folder.
 - `dev` - Programs used for development and programming languages, like compilers and dependency managers
 - `doc` - Programs used for documentation
 - `emulators` - Console emulators or compatibility layers
+- `fonts` - Fonts and programs for fonts
 - `games` - Any kind of game
 - `graphics` - Programs used for graphics processing or production
-- `gui` - Graphical interfaces
+- `gui` - Orbital
 - `icons` - Icon packs
 - `libs` - Software with functions for other softwares, like OpenSSL
 - `math` - Programs used for calculations
@@ -51,13 +53,17 @@ The categories inside the `recipes` folder.
 - `web` - World Wide Web browsers and tools
 - `wip` - Software that needs porting or incomplete recipes
 
+### Search Recipes
+
+Click in the button named "Find file" on the top of this repository to search for recipe names.
+
 ### Package Policy
 
 Before sending your recipe to upstream (to become a public package), you must follow these rules:
 
 #### Cross-Compilation
 
-- All recipes must use our cross-compilers, a Cookbook [template](https://doc.redox-os.org/book/ch09-03-porting-applications.html#templates) does this automatically but it's not always possible, study the build system of your program or library to find these options or patch the configuration files.
+- All recipes must use our cross-compilers, a Cookbook [template](https://doc.redox-os.org/book/porting-applications.html#templates) does this automatically but it's not always possible, study the build system of your program or library to find these options or patch the configuration files.
 - Don't hardcode the CPU architecture on the recipe script (this would break the multi-arch support).
 
 #### Tarballs
@@ -75,12 +81,12 @@ Before sending your recipe to upstream (to become a public package), you must fo
 
 #### Checksum
 
-- If your recipe download a tarball, you will need to create a BLAKE3 hash for it. You can learn how to do it [here](https://doc.redox-os.org/book/ch09-03-porting-applications.html#create-a-blake3-hash-for-your-recipee).
+- If your recipe download a tarball, you will need to create a BLAKE3 hash for it. You can learn how to do it [here](https://doc.redox-os.org/book/porting-applications.html#create-a-blake3-hash-for-your-recipe).
 
 #### License
 
 - Don't package programs or libraries lacking a license.
-- Verify if the program has some license violation, in case of doubt ask us on the [chat](https://doc.redox-os.org/book/ch13-01-chat.html).
+- Verify if the program has some license violation, in case of doubt ask us on the [chat](https://doc.redox-os.org/book/chat.html).
 - Non-free programs and assets should go to a subcategory of the `nonfree` category and be approved per license.
 
 ### Testing Area
@@ -103,6 +109,7 @@ These TODOs improve the packagers cooperation and understanding.
 - `probably wrong script, see insert-the-link-for-build-instructions-here` - It means that you don't know if your script will work.
 - `probably wrong template, see insert-the-link-for-build-instructions-here` - It means that you don't know if the Cookbook template will work.
 - `probably missing dependencies, see insert-the-link-for-required-dependencies-here` - It means that you don't know if the required dependencies are satisfied.
+- `promote` - It means that the recipe is working and should be moved to the equivalent category at `cookbook/recipes`
 
 Other TODOs are specific and won't be covered on this list.
 

bin/riscv64-unknown-redox-pkg-config

+#!/usr/bin/env bash
+
+export PKG_CONFIG_SYSROOT_DIR="${COOKBOOK_SYSROOT}"
+export PKG_CONFIG_LIBDIR="${PKG_CONFIG_SYSROOT_DIR}/lib/pkgconfig"
+export PKG_CONFIG_PATH="${PKG_CONFIG_SYSROOT_DIR}/share/pkgconfig"
+
+exec pkg-config --static "$@"

config.sh

@@ -8,6 +8,9 @@ then
 fi
 ARCH="${TARGET%%-*}"
 HOST="$TARGET"
+if [ x"${HOST}" == x"riscv64gc-unknown-redox" ] ; then
+	HOST="riscv64-unknown-redox"
+fi
 
 # Automatic variables
 ROOT="$(cd `dirname "$0"` && pwd)"
@@ -54,3 +57,14 @@ fi
 
 export FIND
 export STAT
+
+if [ ! "$(uname -s)" = "Redox" ]
+then
+function docgen {
+    "$ROOT/docgen/target/release/docgen" "$@"
+}
+
+function pkgar {
+    "$ROOT/pkgar/target/release/pkgar" "$@"
+}
+fi

cook.sh

@@ -20,21 +20,6 @@ else
     SHASUM="shasum -a 256"
 fi
 
-if [ ! "$(uname -s)" = "Redox" ]
-then
-function docgen {
-    CC=cc AR=ar RANLIB=ranlib cargo run --release --manifest-path "$ROOT/docgen/Cargo.toml" --bin docgen -- "$@"
-}
-
-function pkg {
-    CC=cc AR=ar RANLIB=ranlib cargo run --release --manifest-path "$ROOT/pkgutils/Cargo.toml" --bin pkg -- "$@"
-}
-
-function pkgar {
-    CC=cc AR=ar RANLIB=ranlib cargo run --release --manifest-path "$ROOT/pkgar/Cargo.toml" --bin pkgar -- "$@"
-}
-fi
-
 function usage {
     echo "cook.sh $1 <op>" >&2
     echo "  dist" >&2
@@ -47,12 +32,8 @@ function usage {
     echo "  unpkg" >&2
     echo "  prepare" >&2
     echo "  unprepare" >&2
-    echo "  publish" >&2
-    echo "  unpublish" >&2
     echo "  stage" >&2
     echo "  unstage" >&2
-    echo "  tar" >&2
-    echo "  untar" >&2
     echo "  version" >&2
 }
 
@@ -67,12 +48,10 @@ function op {
             op $1 prepare
             op $1 build
             op $1 stage
-            op $1 tar
             op $1 pkg
             ;;
         distclean)
             op $1 unpkg
-            op $1 untar
             op $1 unstage
             op $1 unprepare
             ;;
@@ -154,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
@@ -310,11 +297,8 @@ function op {
                 --archive "${COOKBOOK_STAGE}.pkgar" \
                 --skey "${ROOT}/build/id_ed25519.toml" \
                 "${COOKBOOK_STAGE}"
-            ;;
-        unpkg)
-            rm -fv "${COOKBOOK_STAGE}.pkgar"
-            ;;
-        tar)
+
+            # Generate stage.toml
             echo "name = \"$1\"" > "${COOKBOOK_STAGE}.toml"
             echo "version = \"$(op $1 version)\"" >> "${COOKBOOK_STAGE}.toml"
             echo "target = \"$TARGET\"" >> "${COOKBOOK_STAGE}.toml"
@@ -329,33 +313,9 @@ function op {
             else
                 echo "depends = []" >> "${COOKBOOK_STAGE}.toml"
             fi
-
-            rm -rf "${COOKBOOK_STAGE}/pkg"
-            mkdir -p "${COOKBOOK_STAGE}/pkg"
-
-            pushd "${COOKBOOK_STAGE}" > /dev/null
-            find -L . -type f | cut -d / -f 2- | sort | while read file
-            do
-                $SHASUM "$file" >> "pkg/$1.sha256sums"
-            done
-            popd > /dev/null
-
-            cp -v "${COOKBOOK_STAGE}.toml" "${COOKBOOK_STAGE}/pkg/$1.toml"
-            pushd "$(dirname "${COOKBOOK_STAGE}")" > /dev/null
-                pkg --target="$TARGET" create "$(basename "${COOKBOOK_STAGE}")"
-            popd > /dev/null
-            ;;
-        untar)
-            rm -rfv "${COOKBOOK_STAGE}.tar.gz" "${COOKBOOK_STAGE}.sig" "${COOKBOOK_STAGE}.toml"
             ;;
-        publish)
-            mkdir -p "$REPO"
-            cp -v "${COOKBOOK_STAGE}.tar.gz" "$REPO/$1.tar.gz"
-            cp -v "${COOKBOOK_STAGE}.sig" "$REPO/$1.sig"
-            cp -v "${COOKBOOK_STAGE}.toml" "$REPO/$1.toml"
-            ;;
-        unpublish)
-            rm -rfv "$REPO/$1.tar.gz" "$REPO/$1.sig" "$REPO/$1.toml"
+        unpkg)
+            rm -fv "${COOKBOOK_STAGE}.pkgar" "${COOKBOOK_STAGE}.toml"
             ;;
         *)
             usage $1

fetch.sh

@@ -12,10 +12,18 @@ fi
 
 for recipe_path in $recipes
 do
+    if (echo "$recipe_path" | grep '.*/.*' >/dev/null); then
+        recipe_name=$(basename "$recipe_path")
+        recipe_path="recipes/$recipe_path"
+    else
+        recipe_name="$recipe_path"
+        recipe_path=`target/release/find_recipe $recipe_name`
+    fi
+
     if [ -e "$recipe_path/recipe.toml" ]
     then
-        target/release/cook --fetch-only "$recipe_path"
+        target/release/cook --fetch-only "$recipe_name"
     else
-        ./cook.sh "$recipe_path" fetch
+        ./cook.sh "$recipe_name" fetch
     fi
 done

pkgar @ ccfa2bd3

-Subproject commit 7a316443046eef7cce87f62ccc5ea26e6fb33de2
+Subproject commit ccfa2bd3adc41f192d12cb1778a85da232fa2456

pkgutils @ ded66a6e

-Subproject commit ded66a6e557c6384026d2394b7624a12d66f53d7

recipes/archives/lz4/recipe.toml

+[source]
+tar = "https://github.com/lz4/lz4/releases/download/v1.10.0/lz4-1.10.0.tar.gz"
+blake3 = "3e69fd475e7852e17594985528b5232afeba7d3d56cfebe2e89071768b2ab36a"
+patches = ["redox.patch"]
+
+[build]
+template = "custom"
+script = """
+rsync -av --delete "${COOKBOOK_SOURCE}/" ./
+
+# No configure provided
+COOKBOOK_CONFIGURE="true"
+COOKBOOK_CONFIGURE_FLAGS=""
+
+export CPPFLAGS="${CPPFLAGS} -D_REDOX"
+
+cookbook_configure 
+"""

recipes/archives/lz4/redox.patch

+diff '--color=auto' -ruwN source/programs/util.h source-new/programs/util.h
+--- source/programs/util.h	2024-07-21 13:29:49.000000000 -0400
++++ source-new/programs/util.h	2024-12-13 02:21:03.032769559 -0500
+@@ -52,6 +52,9 @@
+ #include <time.h>         /* time */
+ #include <limits.h>       /* INT_MAX */
+ #include <errno.h>
++#if defined(_REDOX)
++#  include <sys/time.h>  /* utimes */
++#endif
+ 
+ 
+ 
+@@ -239,12 +242,20 @@
+         timebuf.modtime = statbuf->st_mtime;
+         res += utime(filename, &timebuf);  /* set access and modification times */
+ #else
++        #if defined(_REDOX)
++            struct timeval timebuf[2];
++            memset(timebuf, 0, sizeof(timebuf));
++            timebuf[0].tv_usec = UTIME_NOW;
++            timebuf[1].tv_sec = statbuf->st_mtime;
++            res += utimes(filename, timebuf);
++        #else
+         struct timespec timebuf[2];
+         memset(timebuf, 0, sizeof(timebuf));
+         timebuf[0].tv_nsec = UTIME_NOW;
+         timebuf[1].tv_sec = statbuf->st_mtime;
+         res += utimensat(AT_FDCWD, filename, timebuf, 0);  /* set access and modification times */
+ #endif
++#endif
+     }
+ 
+ #if !defined(_WIN32)

recipes/artwork/pop-wallpapers/recipe.toml

+[source]
+git = "https://github.com/pop-os/wallpapers"
+[build]
+template = "custom"
+script = """
+mkdir -pv "${COOKBOOK_STAGE}"/usr/share/wallpapers
+cp -rv "${COOKBOOK_SOURCE}"/original/* "${COOKBOOK_STAGE}"/usr/share/wallpapers
+"""

recipes/artwork/ubuntu-wallpapers/recipe.toml

+[source]
+tar = "https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/ubuntu-wallpapers/23.10.4/ubuntu-wallpapers_23.10.4.orig.tar.gz"
+blake3 = "1e479d0aa48fe3f2961a2dac28c3ed397a29616cf6e7d73f5ceb6fabfd6449e1"
+[build]
+template = "custom"
+script = """
+mkdir -pv "${COOKBOOK_STAGE}"/usr/share/wallpapers
+cp -rv "${COOKBOOK_SOURCE}"/ubuntu-wallpapers-23.10.4/*.{jpg,png} "${COOKBOOK_STAGE}"/usr/share/wallpapers
+"""

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

@@ -4,16 +4,15 @@ git = "https://gitlab.redox-os.org/redox-os/bootloader.git"
 [build]
 template = "custom"
 script = """
-rsync -av --delete "${COOKBOOK_SOURCE}/" ./
-
+OUTDIR="${COOKBOOK_BUILD}"
 mkdir -v "${COOKBOOK_STAGE}/boot"
 
 function bootloader {
     export TARGET="$1"
     src="$2"
     dst="$3"
-    "${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" "build/${TARGET}/${src}"
-    cp -v "build/${TARGET}/${src}" "${COOKBOOK_STAGE}/boot/${dst}"
+    "${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" -f "${COOKBOOK_SOURCE}/Makefile" -C "${OUTDIR}" "${OUTDIR}/${src}"
+    cp -v "${OUTDIR}/${src}" "${COOKBOOK_STAGE}/boot/${dst}"
 }
 
 ARCH="$(echo "${TARGET}" | cut -d - -f1)"
@@ -26,7 +25,7 @@ then
 fi
 
 # Build UEFI bootloader for supported architectures
-if [ "${ARCH}" == "aarch64" -o "${ARCH}" == "x86_64" ]
+if [ "${ARCH}" == "aarch64" -o "${ARCH}" == "x86_64" -o "${ARCH}" == "riscv64gc" ]
 then
     bootloader "${ARCH}-unknown-uefi" bootloader.efi bootloader.efi
     bootloader "${ARCH}-unknown-uefi" bootloader-live.efi bootloader-live.efi

recipes/core/bootstrap/recipe.toml

@@ -4,7 +4,7 @@ git = "https://gitlab.redox-os.org/redox-os/bootstrap.git"
 [build]
 template = "custom"
 script = """
-ARCH="$(echo "${TARGET}" | cut -d - -f1)"
+ARCH="$(echo "${GNU_TARGET}" | cut -d - -f1)"
 cargo \
     -Zbuild-std=core,alloc,compiler_builtins \
     -Zbuild-std-features=compiler-builtins-mem rustc \
@@ -15,7 +15,7 @@ cargo \
     -- \
     --emit link="${COOKBOOK_BUILD}/${TARGET}/release/libbootstrap.a"
 mkdir -v "${COOKBOOK_STAGE}/boot"
-"${TARGET}-ld" \
+"${GNU_TARGET}-ld" \
     -o "${COOKBOOK_STAGE}/boot/bootstrap" \
     --gc-sections \
     -T "${COOKBOOK_SOURCE}/src/${ARCH}.ld" \