From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 16 Mar 2023 10:27:19 +0000 (+0000)
Subject: arch: Drop support for all 32 bit architectures
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=fe72c17fa7c38064a63d2077d87d0f0c5ecfa726;p=people%2Fstevee%2Fpakfire.git

arch: Drop support for all 32 bit architectures

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

diff --git a/src/libpakfire/arch.c b/src/libpakfire/arch.c
index 68076e5e..9799eb7b 100644
--- a/src/libpakfire/arch.c
+++ b/src/libpakfire/arch.c
@@ -48,16 +48,9 @@ static const struct pakfire_arch PAKFIRE_ARCHES[] = {
 	{
 		.name = "x86_64",
 		.platform = "x86",
-		.compatible = { "i686", NULL },
 		.personality = PER_LINUX,
 		.magic = "7f454c4602010100000000000000000002003e00",
 	},
-	{
-		.name = "i686",
-		.platform = "x86",
-		.personality = PER_LINUX32,
-		.magic = "7f454c4601010100000000000000000002000300",
-	},
 
 	// ARM
 	{
@@ -66,40 +59,6 @@ static const struct pakfire_arch PAKFIRE_ARCHES[] = {
 		.personality = PER_LINUX,
 		.magic = "7f454c460201010000000000000000000200b700",
 	},
-	{
-		.name = "armv7hl",
-		.platform = "arm",
-		.compatible = { "armv7l", "armv6l", "armv5tejl", "armv5tel", NULL },
-		.personality = PER_LINUX32,
-		.magic = "7f454c4601010100000000000000000002002800",
-	},
-	{
-		.name = "armv7l",
-		.platform = "arm",
-		.compatible = { "armv6l", "armv5tejl", "armv5tel", NULL },
-		.personality = PER_LINUX32,
-		.magic = "7f454c4601010100000000000000000002002800",
-	},
-	{
-		.name = "armv6l",
-		.platform = "arm",
-		.compatible = { "armv5tejl", "armv5tel", NULL },
-		.personality = PER_LINUX32,
-		.magic = "7f454c4601010100000000000000000002002800",
-	},
-	{
-		.name = "armv5tejl",
-		.platform = "arm",
-		.compatible = { "armv5tel", NULL },
-		.personality = PER_LINUX32,
-		.magic = "7f454c4601010100000000000000000002002800",
-	},
-	{
-		.name = "armv5tel",
-		.platform = "arm",
-		.personality = PER_LINUX32,
-		.magic = "7f454c4601010100000000000000000002002800",
-	},
 
 	// RISC-V
 	{
diff --git a/tests/libpakfire/arch.c b/tests/libpakfire/arch.c
index 7d383175..83f964a1 100644
--- a/tests/libpakfire/arch.c
+++ b/tests/libpakfire/arch.c
@@ -49,9 +49,6 @@ static int test_supported(const struct test* t) {
 	r = pakfire_arch_supported("x86_64");
 	ASSERT(r);
 
-	r = pakfire_arch_supported("i686");
-	ASSERT(r);
-
 	// Check non-existant architecture
 	r = pakfire_arch_supported("ABC");
 	ASSERT(!r);
@@ -62,35 +59,6 @@ FAIL:
 	return EXIT_SUCCESS;
 }
 
-static int test_compatible(const struct test* t) {
-	int r;
-
-	// x86_64 can build i686
-	r = pakfire_arch_is_compatible("x86_64", "i686");
-	ASSERT(r);
-
-	// i686 can NOT build i686
-	r = pakfire_arch_is_compatible("i686", "x86_64");
-	ASSERT(!r);
-
-	// x86_64 can build itself
-	r = pakfire_arch_is_compatible("x86_64", "x86_64");
-	ASSERT(r);
-
-	// x86_64 can NOT build a non-existant architecture
-	r = pakfire_arch_is_compatible("x86_64", "ABC");
-	ASSERT(!r);
-
-	// A non-existant architecture cannot build anything
-	r = pakfire_arch_is_compatible("ABC", "x86_64");
-	ASSERT(!r);
-
-	return EXIT_SUCCESS;
-
-FAIL:
-	return EXIT_SUCCESS;
-}
-
 static int test_machine(const struct test* t) {
 	char machine[128];
 	int r;
@@ -112,7 +80,6 @@ FAIL:
 int main(int argc, const char* argv[]) {
 	testsuite_add_test(test_native);
 	testsuite_add_test(test_supported);
-	testsuite_add_test(test_compatible);
 	testsuite_add_test(test_machine);
 
 	return testsuite_run(argc, argv);