2024-01-06 04:07:28 +01:00
|
|
|
diff -ru libdnf-0.43.1.orig/libdnf/hy-util.cpp libdnf-0.43.1/libdnf/hy-util.cpp
|
|
|
|
--- libdnf-0.43.1.orig/libdnf/hy-util.cpp 2020-01-16 18:18:43.000000000 +0100
|
|
|
|
+++ libdnf-0.43.1/libdnf/hy-util.cpp 2020-01-16 18:21:06.663000000 +0100
|
|
|
|
@@ -101,23 +101,6 @@
|
2024-01-06 04:07:28 +01:00
|
|
|
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
|
2024-01-06 04:07:28 +01:00
|
|
|
- * 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. */
|
2024-01-06 04:07:28 +01:00
|
|
|
- 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';
|
2024-01-06 04:07:28 +01:00
|
|
|
- if ((atoi(un.machine+4) == 7) && (getauxval(AT_HWCAP) & HWCAP_ARM_NEON))
|
2024-01-06 04:07:28 +01:00
|
|
|
- *modifier++ = 'n';
|
|
|
|
- *modifier++ = endian;
|
|
|
|
- *modifier = 0;
|
|
|
|
- }
|
|
|
|
#ifdef __MIPSEL__
|
|
|
|
if (!strcmp(un.machine, "mips"))
|
|
|
|
strcpy(un.machine, "mipsel");
|