From: Michael Tremer Date: Tue, 28 Jan 2025 17:53:18 +0000 (+0000) Subject: builds: Remove old target implementation X-Git-Tag: 0.9.30~309 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cccd585eeabbc8def97e5709fbd43ee29796603e;p=pakfire.git builds: Remove old target implementation Signed-off-by: Michael Tremer --- diff --git a/src/cli/lib/build.c b/src/cli/lib/build.c index 6f5ab8fe..56b984ad 100644 --- a/src/cli/lib/build.c +++ b/src/cli/lib/build.c @@ -240,15 +240,6 @@ int cli_build(void* data, int argc, char* argv[]) { if (r < 0) goto ERROR; - // Set target - if (local_args.target) { - r = pakfire_build_set_target(build, local_args.target); - if (r) { - fprintf(stderr, "Could not set target directory %s: %m\n", local_args.target); - goto ERROR; - } - } - // Process all packages for (unsigned int i = 0; i < local_args.num_makefiles; i++) { // Run the build diff --git a/src/pakfire/build.c b/src/pakfire/build.c index 4470d04c..7f98baa6 100644 --- a/src/pakfire/build.c +++ b/src/pakfire/build.c @@ -78,8 +78,6 @@ struct pakfire_build { uuid_t id; char _id[UUID_STR_LEN]; - char target[PATH_MAX]; - // Times struct timespec time_start; @@ -2095,11 +2093,6 @@ int pakfire_build_set_ccache_path( return pakfire_string_set(build->ccache_path, path); } -int pakfire_build_set_target( - struct pakfire_build* build, const char* target) { - return pakfire_string_set(build->target, target); -} - static int pakfire_build_read_makefile(struct pakfire_build* build, struct pakfire_parser** parser, struct pakfire_package* package) { char path[PATH_MAX]; diff --git a/src/pakfire/build.h b/src/pakfire/build.h index fd2d2160..23df2e9c 100644 --- a/src/pakfire/build.h +++ b/src/pakfire/build.h @@ -44,7 +44,6 @@ struct pakfire_build* pakfire_build_ref(struct pakfire_build* build); struct pakfire_build* pakfire_build_unref(struct pakfire_build* build); int pakfire_build_set_ccache_path(struct pakfire_build* build, const char* path); -int pakfire_build_set_target(struct pakfire_build* build, const char* target); int pakfire_build_shell(struct pakfire_build* build, const char* argv[], const char** packages); diff --git a/src/pakfire/job.c b/src/pakfire/job.c index 43dcf747..70f41f64 100644 --- a/src/pakfire/job.c +++ b/src/pakfire/job.c @@ -648,8 +648,6 @@ static int pakfire_job_child(struct pakfire_job* job) { } } - // XXX need to set target - // Run the build r = pakfire_build_exec(build, job->pkg, pakfire_job_result, job);