diff --git a/config/aarch64/ci.toml b/config/aarch64/ci.toml index 1d184f31..c44288a1 100644 --- a/config/aarch64/ci.toml +++ b/config/aarch64/ci.toml @@ -25,7 +25,6 @@ prompt = false acid = {} acid-bins = {} base = {} -base-initfs = {} bash = {} bash-completion = {} bootloader = {} diff --git a/config/base.toml b/config/base.toml index 4f6c8f57..437f2db3 100644 --- a/config/base.toml +++ b/config/base.toml @@ -10,7 +10,6 @@ prompt = false [packages] base = {} -base-initfs = {} bootloader = {} kernel = {} libgcc = {} diff --git a/config/i586/ci.toml b/config/i586/ci.toml index 3432fba0..d333d0f8 100644 --- a/config/i586/ci.toml +++ b/config/i586/ci.toml @@ -25,7 +25,6 @@ prompt = false # acid = {} # rust require dynamic linking acid-bins = {} base = {} -base-initfs = {} bash = {} bash-completion = {} bootloader = {} diff --git a/config/riscv64gc/ci.toml b/config/riscv64gc/ci.toml index 382a421e..ef207e73 100644 --- a/config/riscv64gc/ci.toml +++ b/config/riscv64gc/ci.toml @@ -25,7 +25,6 @@ prompt = false # acid = {} # rust require dynamic linking acid-bins = {} base = {} -base-initfs = {} bash = {} bash-completion = {} bootloader = {} diff --git a/config/x86_64/ci.toml b/config/x86_64/ci.toml index 23ce90a6..b22114c7 100644 --- a/config/x86_64/ci.toml +++ b/config/x86_64/ci.toml @@ -29,7 +29,6 @@ adwaita-icon-theme = {} autoconf = {} automake = {} base = {} -base-initfs = {} bash = {} bash-completion = {} binutils = {} diff --git a/recipes/core/base-initfs/recipe.toml b/recipes/core/base-initfs/recipe.toml deleted file mode 100644 index ac5ce116..00000000 --- a/recipes/core/base-initfs/recipe.toml +++ /dev/null @@ -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}" -""" diff --git a/recipes/core/base/recipe.toml b/recipes/core/base/recipe.toml index aed81605..5a8520bd 100644 --- a/recipes/core/base/recipe.toml +++ b/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}" \