Merge branch 'merge_base_initfs_recipe' into 'master'

Build the base system and initfs in a single recipe

See merge request redox-os/redox!2089

config/aarch64/ci.toml

@@ -25,7 +25,6 @@ prompt = false
 acid = {}
 acid-bins = {}
 base = {}
-base-initfs = {}
 bash = {}
 bash-completion = {}
 bootloader = {}

config/base.toml

@@ -10,7 +10,6 @@ prompt = false
 
 [packages]
 base = {}
-base-initfs = {}
 bootloader = {}
 kernel = {}
 libgcc = {}

config/i586/ci.toml

@@ -25,7 +25,6 @@ prompt = false
 # acid = {} # rust require dynamic linking
 acid-bins = {}
 base = {}
-base-initfs = {}
 bash = {}
 bash-completion = {}
 bootloader = {}

config/riscv64gc/ci.toml

@@ -25,7 +25,6 @@ prompt = false
 # acid = {} # rust require dynamic linking
 acid-bins = {}
 base = {}
-base-initfs = {}
 bash = {}
 bash-completion = {}
 bootloader = {}

config/x86_64/ci.toml

@@ -29,7 +29,6 @@ adwaita-icon-theme = {}
 autoconf = {}
 automake = {}
 base = {}
-base-initfs = {}
 bash = {}
 bash-completion = {}
 binutils = {}

recipes/core/base-initfs/recipe.toml

@@ -1,14 +0,0 @@
-[source]
-same_as = "../base"
-
-[build]
-template = "custom"
-dependencies = [
-  "redoxfs",
-]
-script = """
-cd "${COOKBOOK_SOURCE}" && make install-initfs \
-    SRC_DIR="${COOKBOOK_SOURCE}" SYSROOT="${COOKBOOK_SYSROOT}" \
-    LINKER="${GNU_TARGET}-ld" CARGO="${COOKBOOK_CARGO}" \
-    BUILD_DIR="${COOKBOOK_BUILD}" DESTDIR="${COOKBOOK_STAGE}"
-"""

recipes/core/base/recipe.toml

@@ -3,6 +3,9 @@ git = "https://gitlab.redox-os.org/redox-os/base.git"
 
 [build]
 template = "custom"
+dependencies = [
+  "redoxfs",
+]
 script = """
 cd "${COOKBOOK_SOURCE}" && make install-base \
     SRC_DIR="${COOKBOOK_SOURCE}" SYSROOT="${COOKBOOK_SYSROOT}" \