From bf72bf38d31a058f7751df8d76f0bff6a5a60128 Mon Sep 17 00:00:00 2001 From: 4lDO2 <4lDO2@protonmail.com> Date: Mon, 18 Jul 2022 11:47:59 +0200 Subject: [PATCH 1/4] Fix relibc's recipe.toml --- recipes/relibc/recipe.toml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 recipes/relibc/recipe.toml diff --git a/recipes/relibc/recipe.toml b/recipes/relibc/recipe.toml new file mode 100644 index 000000000..a25543a23 --- /dev/null +++ b/recipes/relibc/recipe.toml @@ -0,0 +1,10 @@ +[recipe] +# TODO: Set git link once userspace_fexec is merged. +#GIT=https://gitlab.redox-os.org/redox-os/relibc.git + +[build] +template = "custom" +script = """ +cd "${COOKBOOK_SOURCE}" +"$REDOX_MAKE" CARGO="env -u CARGO cargo" -j"$($NPROC)" DESTDIR="${COOKBOOK_STAGE}" install +""" From e1f7024dba7e50ecce9bea7c7d96bff9fc41ad2a Mon Sep 17 00:00:00 2001 From: 4lDO2 <4lDO2@protonmail.com> Date: Mon, 18 Jul 2022 11:52:15 +0200 Subject: [PATCH 2/4] Add bootstrap recipe. --- recipes/bootstrap/recipe.toml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 recipes/bootstrap/recipe.toml diff --git a/recipes/bootstrap/recipe.toml b/recipes/bootstrap/recipe.toml new file mode 100644 index 000000000..9c1f730d3 --- /dev/null +++ b/recipes/bootstrap/recipe.toml @@ -0,0 +1,11 @@ +[recipe] +[build] +template = "custom" +script = """ +ARCH="$(echo "${TARGET}" | cut -d - -f1)" +nasm -o "${COOKBOOK_BUILD}/asm.o" -f elf64 "${COOKBOOK_SOURCE}/src/${ARCH}.asm" +cargo -Zbuild-std=core,alloc,compiler_builtins -Zbuild-std-features=compiler-builtins-mem rustc --target "${TARGET}" --manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" --release --target-dir "${COOKBOOK_BUILD}" -- --emit obj="${COOKBOOK_BUILD}/${TARGET}/release/libbootstrap.a" +compiler_builtins=`find "${COOKBOOK_BUILD}/x86_64-unknown-redox/release/deps/" -name "*libcompiler_builtins*.rlib"` +ld -o "${COOKBOOK_STAGE}/bootstrap" --gc-sections -T "${COOKBOOK_SOURCE}/src/${ARCH}.ld" "${COOKBOOK_BUILD}/asm.o" "${COOKBOOK_BUILD}/${TARGET}/release/libbootstrap.a" "${COOKBOOK_SYSROOT}/lib/libc.a" "$compiler_builtins" +""" +dependencies = ["relibc"] From f4c9004cd87c4fb28ae333911532e1d272918d1d Mon Sep 17 00:00:00 2001 From: 4lDO2 <4lDO2@protonmail.com> Date: Mon, 18 Jul 2022 11:52:33 +0200 Subject: [PATCH 3/4] Add escalated recipe. --- recipes/escalated/recipe.toml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 recipes/escalated/recipe.toml diff --git a/recipes/escalated/recipe.toml b/recipes/escalated/recipe.toml new file mode 100644 index 000000000..f56972d30 --- /dev/null +++ b/recipes/escalated/recipe.toml @@ -0,0 +1,2 @@ +[build] +template = "cargo" From 117e4d8921a2bfbd84ad4243a6e1ca69ab6e7c32 Mon Sep 17 00:00:00 2001 From: 4lDO2 <4lDO2@protonmail.com> Date: Wed, 27 Jul 2022 17:59:43 +0200 Subject: [PATCH 4/4] Add git links for bootstrap and escalated --- recipes/bootstrap/recipe.toml | 4 +++- recipes/escalated/recipe.toml | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes/bootstrap/recipe.toml b/recipes/bootstrap/recipe.toml index 9c1f730d3..d923d92bd 100644 --- a/recipes/bootstrap/recipe.toml +++ b/recipes/bootstrap/recipe.toml @@ -1,4 +1,6 @@ -[recipe] +[source] +git = "https://gitlab.redox-os.org/redox-os/bootstrap.git" + [build] template = "custom" script = """ diff --git a/recipes/escalated/recipe.toml b/recipes/escalated/recipe.toml index f56972d30..801bf9a8b 100644 --- a/recipes/escalated/recipe.toml +++ b/recipes/escalated/recipe.toml @@ -1,2 +1,5 @@ +[source] +git = "https://gitlab.redox-os.org/redox-os/escalated.git" + [build] template = "cargo"