Add x86_64_v2
This commit is contained in:
parent
2dff5e1b57
commit
b698dd3710
24
SOURCES/0001-Add-x86_64_v2-to-arch_map.patch
Normal file
24
SOURCES/0001-Add-x86_64_v2-to-arch_map.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
From 51bf44398eedd4ede0f5021d477b8ef5ac0dc144 Mon Sep 17 00:00:00 2001
|
||||||
|
From: eabdullin <ed.abdullin.1@gmail.com>
|
||||||
|
Date: Thu, 12 Sep 2024 11:36:09 +0300
|
||||||
|
Subject: [PATCH] Add x86_64_v2 to arch_map
|
||||||
|
|
||||||
|
---
|
||||||
|
libdnf/dnf-context.cpp | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/libdnf/dnf-context.cpp b/libdnf/dnf-context.cpp
|
||||||
|
index d019743..37847ea 100644
|
||||||
|
--- a/libdnf/dnf-context.cpp
|
||||||
|
+++ b/libdnf/dnf-context.cpp
|
||||||
|
@@ -119,6 +119,7 @@ static const struct {
|
||||||
|
{ "sparc", { "sparc", "sparc64", "sparc64v", "sparcv8",
|
||||||
|
"sparcv9", "sparcv9v", NULL } },
|
||||||
|
{ "x86_64", { "x86_64", "amd64", "ia32e", NULL } },
|
||||||
|
+ { "x86_64_v2", { "x86_64_v2", NULL } },
|
||||||
|
{ "loongarch64", { "loongarch64", NULL } },
|
||||||
|
{ NULL, { NULL } }
|
||||||
|
};
|
||||||
|
--
|
||||||
|
2.39.3 (Apple Git-146)
|
||||||
|
|
42
SOURCES/0001-Add-x86_64_v2-to-tests.patch
Normal file
42
SOURCES/0001-Add-x86_64_v2-to-tests.patch
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
From 9b2b677bee48f18d41f958f01e00142b0e39e543 Mon Sep 17 00:00:00 2001
|
||||||
|
From: eabdullin <ed.abdullin.1@gmail.com>
|
||||||
|
Date: Wed, 31 Jul 2024 16:34:28 +0300
|
||||||
|
Subject: [PATCH] Add x86_64_v2 to tests
|
||||||
|
|
||||||
|
---
|
||||||
|
tests/hawkey/test_sack.cpp | 12 +++++++++++-
|
||||||
|
1 file changed, 11 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/tests/hawkey/test_sack.cpp b/tests/hawkey/test_sack.cpp
|
||||||
|
index 98a8660..5b085f3 100644
|
||||||
|
--- a/tests/hawkey/test_sack.cpp
|
||||||
|
+++ b/tests/hawkey/test_sack.cpp
|
||||||
|
@@ -83,7 +83,7 @@ START_TEST(test_list_arches)
|
||||||
|
const char ** arches = dnf_sack_list_arches(sack);
|
||||||
|
|
||||||
|
/* noarch, x86_64, athlon, i686, i586, i486, i386 */
|
||||||
|
- fail_unless(g_strv_length((gchar**)arches) >= 6 && g_strv_length((gchar**)arches) <= 7);
|
||||||
|
+ fail_unless(g_strv_length((gchar**)arches) >= 6 && g_strv_length((gchar**)arches) <= 8);
|
||||||
|
|
||||||
|
if (g_strv_length((gchar**)arches) == 7) {
|
||||||
|
// Fedora, Mageia
|
||||||
|
@@ -94,6 +94,16 @@ START_TEST(test_list_arches)
|
||||||
|
ck_assert_str_eq(arches[4], "i586");
|
||||||
|
ck_assert_str_eq(arches[5], "i486");
|
||||||
|
ck_assert_str_eq(arches[6], "i386");
|
||||||
|
+ } else if (g_strv_length((gchar**)arches) == 8) {
|
||||||
|
+ // AlmaLinux x86_64_v2 arch is available
|
||||||
|
+ ck_assert_str_eq(arches[0], "noarch");
|
||||||
|
+ ck_assert_str_eq(arches[1], "x86_64");
|
||||||
|
+ ck_assert_str_eq(arches[2], "x86_64_v2");
|
||||||
|
+ ck_assert_str_eq(arches[3], "athlon");
|
||||||
|
+ ck_assert_str_eq(arches[4], "i686");
|
||||||
|
+ ck_assert_str_eq(arches[5], "i586");
|
||||||
|
+ ck_assert_str_eq(arches[6], "i486");
|
||||||
|
+ ck_assert_str_eq(arches[7], "i386");
|
||||||
|
} else {
|
||||||
|
// openSUSE, Debian - "athlon" is not available
|
||||||
|
ck_assert_str_eq(arches[0], "noarch");
|
||||||
|
--
|
||||||
|
2.39.3 (Apple Git-146)
|
||||||
|
|
@ -58,7 +58,7 @@
|
|||||||
|
|
||||||
Name: libdnf
|
Name: libdnf
|
||||||
Version: %{libdnf_major_version}.%{libdnf_minor_version}.%{libdnf_micro_version}
|
Version: %{libdnf_major_version}.%{libdnf_minor_version}.%{libdnf_micro_version}
|
||||||
Release: 12%{?dist}
|
Release: 12%{?dist}.alma.1
|
||||||
Summary: Library providing simplified C and Python API to libsolv
|
Summary: Library providing simplified C and Python API to libsolv
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: https://github.com/rpm-software-management/libdnf
|
URL: https://github.com/rpm-software-management/libdnf
|
||||||
@ -81,6 +81,9 @@ Patch15: 0015-Since-we-use-rpmtsAddReinstallElement-rpm-also-unins.patch
|
|||||||
Patch16: 0016-repo-Don-t-try-to-perform-labeling-if-SELinux-is-dis.patch
|
Patch16: 0016-repo-Don-t-try-to-perform-labeling-if-SELinux-is-dis.patch
|
||||||
|
|
||||||
|
|
||||||
|
Patch1001: 0001-Add-x86_64_v2-to-arch_map.patch
|
||||||
|
Patch1002: 0001-Add-x86_64_v2-to-tests.patch
|
||||||
|
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
|
Loading…
Reference in New Issue
Block a user