From 80ccbe96611f7b1e45798b47827d6e9e6c1aaa34 Mon Sep 17 00:00:00 2001 From: Sofia Boldyreva Date: Mon, 20 Jan 2025 21:50:16 +0100 Subject: [PATCH] Initial setup --- config.yaml | 23 ++++++++++ ...001-Add-link-to-AlmaLinux-bugtracker.patch | 38 +++++++++++++++++ files/0001-Add-x86_64_v2-to-arch_map.patch | 24 +++++++++++ files/0001-Add-x86_64_v2-to-tests.patch | 42 +++++++++++++++++++ 4 files changed, 127 insertions(+) create mode 100644 config.yaml create mode 100644 files/0001-Add-link-to-AlmaLinux-bugtracker.patch create mode 100644 files/0001-Add-x86_64_v2-to-arch_map.patch create mode 100644 files/0001-Add-x86_64_v2-to-tests.patch diff --git a/config.yaml b/config.yaml new file mode 100644 index 0000000..dd62c82 --- /dev/null +++ b/config.yaml @@ -0,0 +1,23 @@ +actions: + - modify_release: + - suffix: ".alma.1" + enabled: true + + - changelog_entry: + - name: "Eduard Abdullin" + email: "eabdullin@almalinux.org" + line: + - "Add x86_64_v2 to arch_map" + - "Add link to AlmaLinux bugtracker" + - "Fix tests on x86_64_v2" + + - add_files: + - type: "patch" + name: "0001-Add-link-to-AlmaLinux-bugtracker.patch" + number: 1001 + - type: "patch" + name: "0001-Add-x86_64_v2-to-arch_map.patch" + number: "Latest" + - type: "patch" + name: "0001-Add-x86_64_v2-to-tests.patch" + number: "Latest" \ No newline at end of file diff --git a/files/0001-Add-link-to-AlmaLinux-bugtracker.patch b/files/0001-Add-link-to-AlmaLinux-bugtracker.patch new file mode 100644 index 0000000..837844e --- /dev/null +++ b/files/0001-Add-link-to-AlmaLinux-bugtracker.patch @@ -0,0 +1,38 @@ +From 5f7e4b85ed7331eb27654bb3dbab9592a3f8f722 Mon Sep 17 00:00:00 2001 +From: eabdullin +Date: Wed, 31 Jul 2024 16:18:32 +0300 +Subject: [PATCH 1/2] Add link to AlmaLinux bugtracker + +--- + docs/hawkey/conf.py | 2 +- + libdnf/conf/Const.hpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/docs/hawkey/conf.py b/docs/hawkey/conf.py +index 93330c2..5ea39da 100644 +--- a/docs/hawkey/conf.py ++++ b/docs/hawkey/conf.py +@@ -260,6 +260,6 @@ texinfo_documents = [ + rst_prolog = """ + .. default-domain:: py + .. _libsolv: https://github.com/openSUSE/libsolv +-.. _bugzilla: https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=hawkey ++.. _bugzilla: https://bugs.almalinux.org/ + + """ +diff --git a/libdnf/conf/Const.hpp b/libdnf/conf/Const.hpp +index ba21bbe..28cfa57 100644 +--- a/libdnf/conf/Const.hpp ++++ b/libdnf/conf/Const.hpp +@@ -41,7 +41,7 @@ const std::vector INSTALLONLYPKGS{"kernel", "kernel-PAE", + "installonlypkg(vm)", + "multiversion(kernel)"}; + +-constexpr const char * BUGTRACKER="https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=dnf"; ++constexpr const char * BUGTRACKER="https://bugs.almalinux.org/"; + + } + +-- +2.39.3 (Apple Git-146) + diff --git a/files/0001-Add-x86_64_v2-to-arch_map.patch b/files/0001-Add-x86_64_v2-to-arch_map.patch new file mode 100644 index 0000000..ca9c66c --- /dev/null +++ b/files/0001-Add-x86_64_v2-to-arch_map.patch @@ -0,0 +1,24 @@ +From 51bf44398eedd4ede0f5021d477b8ef5ac0dc144 Mon Sep 17 00:00:00 2001 +From: eabdullin +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) + diff --git a/files/0001-Add-x86_64_v2-to-tests.patch b/files/0001-Add-x86_64_v2-to-tests.patch new file mode 100644 index 0000000..60f3e0b --- /dev/null +++ b/files/0001-Add-x86_64_v2-to-tests.patch @@ -0,0 +1,42 @@ +From 9b2b677bee48f18d41f958f01e00142b0e39e543 Mon Sep 17 00:00:00 2001 +From: eabdullin +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) +