diff options
| author | Joseph Hunkeler <jhunkeler@gmail.com> | 2024-04-10 08:56:02 -0400 |
|---|---|---|
| committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2024-04-10 08:56:09 -0400 |
| commit | b9534c98ea7bc8cb476fa9b6f589c4e958a89606 (patch) | |
| tree | 8f2da3ed6ed9e2b4f06521ad8cecbd9f6350424c | |
| parent | 684097924c419813f2e23d751a953a02080eb470 (diff) | |
| download | stasis-b9534c98ea7bc8cb476fa9b6f589c4e958a89606.tar.gz | |
Move build/ directory creation into delivery_init_dirs_stage2
| -rw-r--r-- | src/deliverable.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/deliverable.c b/src/deliverable.c index 3688f21..b7ad0fd 100644 --- a/src/deliverable.c +++ b/src/deliverable.c @@ -208,6 +208,13 @@ void delivery_free(struct Delivery *ctx) { void delivery_init_dirs_stage2(struct Delivery *ctx) { path_store(&ctx->storage.output_dir, PATH_MAX, ctx->storage.output_dir, ctx->info.build_name); + path_store(&ctx->storage.build_dir, PATH_MAX, ctx->storage.build_dir, ctx->info.build_name); + + path_store(&ctx->storage.build_recipes_dir, PATH_MAX, ctx->storage.build_dir, "recipes"); + path_store(&ctx->storage.build_sources_dir, PATH_MAX, ctx->storage.build_dir, "sources"); + path_store(&ctx->storage.build_testing_dir, PATH_MAX, ctx->storage.build_dir, "testing"); + path_store(&ctx->storage.build_docker_dir, PATH_MAX, ctx->storage.build_dir, "docker"); + path_store(&ctx->storage.delivery_dir, PATH_MAX, ctx->storage.output_dir, "delivery"); path_store(&ctx->storage.results_dir, PATH_MAX, ctx->storage.output_dir, "results"); path_store(&ctx->storage.package_dir, PATH_MAX, ctx->storage.output_dir, "packages"); @@ -237,13 +244,8 @@ void delivery_init_dirs_stage1(struct Delivery *ctx) { exit(1); } - path_store(&ctx->storage.home, PATH_MAX, ctx->storage.tmpdir, "home"); + path_store(&ctx->storage.home, PATH_MAX, ctx->storage.root, "home"); path_store(&ctx->storage.build_dir, PATH_MAX, ctx->storage.root, "build"); - path_store(&ctx->storage.build_recipes_dir, PATH_MAX, ctx->storage.build_dir, "recipes"); - path_store(&ctx->storage.build_sources_dir, PATH_MAX, ctx->storage.build_dir, "sources"); - path_store(&ctx->storage.build_testing_dir, PATH_MAX, ctx->storage.build_dir, "testing"); - path_store(&ctx->storage.build_docker_dir, PATH_MAX, ctx->storage.build_dir, "docker"); - path_store(&ctx->storage.output_dir, PATH_MAX, ctx->storage.root, "output"); if (!ctx->storage.mission_dir) { |