1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
From aa0f8b65feec64420a9b7b61cfcc8bcce161e14b Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 9 Nov 2023 10:29:31 +0000
Subject: [PATCH] libdnf: Fix arm arch mapping issues for qemuarmv5
We change the way rpm architectures work, we make the machine name the default machine
specific package architecture.
This arm mapping code can work or in the case of qemuarmv5, it doesn't as it creates
armv5hl which doesn't exist and causes errrors. We can simply remove it, we don't need it.
Upstream-Status: Inappropriate [Relies on OE rpm config]
---
libdnf/hy-util.cpp | 23 -----------------------
1 file changed, 23 deletions(-)
diff --git a/libdnf/hy-util.cpp b/libdnf/hy-util.cpp
index 9978c8e9..aa1369b6 100644
--- a/libdnf/hy-util.cpp
+++ b/libdnf/hy-util.cpp
@@ -117,29 +117,6 @@ hy_detect_arch(char **arch)
if (uname(&un) < 0)
return DNF_ERROR_FAILED;
- if (!strncmp(un.machine, "armv", 4)) {
- /* un.machine is armvXE, where X is version number and E is
- * endianness (b or l); we need to add modifiers such as
- * h (hardfloat), n (neon). Neon is a requirement of armv8 so
- * as far as rpm is concerned armv8l is the equivilent of armv7hnl
- * (or 7hnb) so we don't explicitly add 'n' for 8+ as it's expected. */
- char endian = un.machine[strlen(un.machine)-1];
- char *modifier = un.machine + 5;
- while(isdigit(*modifier)) /* keep armv7, armv8, armv9, armv10, armv100, ... */
- modifier++;
- if (getauxval(AT_HWCAP) & HWCAP_ARM_VFP)
- *modifier++ = 'h';
- if ((atoi(un.machine+4) == 7) && (getauxval(AT_HWCAP) & HWCAP_ARM_NEON))
- *modifier++ = 'n';
- *modifier++ = endian;
- *modifier = 0;
- }
-#ifdef __MIPSEL__
- if (!strcmp(un.machine, "mips"))
- strcpy(un.machine, "mipsel");
- else if (!strcmp(un.machine, "mips64"))
- strcpy(un.machine, "mips64el");
-#endif
*arch = g_strdup(un.machine);
return 0;
}
|
