From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 14 Jun 2021 14:21:50 +0000 (+0000)
Subject: execute: Drop setting LD_PRELOAD
X-Git-Tag: 0.9.28~1254
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9594dd7604cf30000e8201c7d0770f9bdc5c3dc1;p=pakfire.git

execute: Drop setting LD_PRELOAD

This should no longer be required because the QEMU emulation will set an
appropriate value. This was also quite fragile and required some binary
code in the build container.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/execute.c b/src/libpakfire/execute.c
index 33d0d5cfe..e0f290fde 100644
--- a/src/libpakfire/execute.c
+++ b/src/libpakfire/execute.c
@@ -465,10 +465,6 @@ PAKFIRE_EXPORT int pakfire_execute(Pakfire pakfire, const char* argv[], char* en
 		.cgroup = "pakfire/execute-XXXXXX",
 	};
 
-	// Fetch architectures
-	const char* native_arch = pakfire_arch_native();
-	const char* arch = pakfire_get_arch(pakfire);
-
 	// argv is invalid
 	if (!argv || !argv[0])
 		return -EINVAL;
@@ -557,17 +553,6 @@ PAKFIRE_EXPORT int pakfire_execute(Pakfire pakfire, const char* argv[], char* en
 		}
 	}
 
-	// Fake architecture
-	if (strcmp(arch, native_arch) != 0) {
-		r = set_environ(&env, "LD_PRELOAD", "/usr/lib/libpakfire_preload.so");
-		if (r)
-			goto ERROR;
-
-		r = set_environ(&env, "UTS_MACHINE", arch);
-		if (r)
-			goto ERROR;
-	}
-
 	// Make cgroup name
 	r = pakfire_cgroup_random_name(env.cgroup);
 	if (r)