From f5c75bb121ef4033f9631deb7fa03f87ebc5de05 Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Wed, 15 Dec 2021 08:28:08 +0000 Subject: [PATCH 1/2] !1 Disable rhsm support in Anolis and fix platform compatibility * rebrand: fix platform compatibility * Disable rhsm support in Anolis --- 1000-anolis-fix-platform-compatibility.path | 15 +++++++++++++++ libdnf.spec | 12 ++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 1000-anolis-fix-platform-compatibility.path diff --git a/1000-anolis-fix-platform-compatibility.path b/1000-anolis-fix-platform-compatibility.path new file mode 100644 index 0000000..977f72e --- /dev/null +++ b/1000-anolis-fix-platform-compatibility.path @@ -0,0 +1,15 @@ +diff -Nur libdnf-0.55.0/libdnf/module/ModulePackage.cpp libdnf-0.55.0.new/libdnf/module/ModulePackage.cpp +--- libdnf-0.55.0/libdnf/module/ModulePackage.cpp 2020-11-09 22:42:13.000000000 +0800 ++++ libdnf-0.55.0.new/libdnf/module/ModulePackage.cpp 2021-07-08 16:40:15.635247194 +0800 +@@ -580,6 +580,11 @@ + Id id = repo_add_solvable(repo); + Solvable *solvable = pool_id2solvable(pool, id); + setSovable(pool, solvable, name, stream, version, context, "noarch"); ++ if (name == "platform" and stream == "an8") ++ { ++ std::string compatible_stream = "el8"; ++ setSovable(pool, solvable, name, compatible_stream, version, context, "noarch"); ++ } + repoImpl->needs_internalizing = 1; + dnf_sack_set_provides_not_ready(moduleSack); + dnf_sack_set_considered_to_update(moduleSack); diff --git a/libdnf.spec b/libdnf.spec index 131c72b..72e05b5 100644 --- a/libdnf.spec +++ b/libdnf.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 %global libsolv_version 0.7.17 %global libmodulemd_version 2.11.2-2 %global librepo_version 1.13.1 @@ -36,7 +37,7 @@ %bcond_without python2 %endif -%if 0%{?rhel} && ! 0%{?centos} +%if 0%{?rhel} && ! 0%{?centos} && ! 0%{?anolis} %bcond_without rhsm %else %bcond_with rhsm @@ -56,7 +57,7 @@ Name: libdnf Version: %{libdnf_major_version}.%{libdnf_minor_version}.%{libdnf_micro_version} -Release: 7%{?dist} +Release: 7%{anolis_release}%{?dist} Summary: Library providing simplified C and Python API to libsolv License: LGPLv2+ URL: https://github.com/rpm-software-management/libdnf @@ -87,6 +88,8 @@ Patch23: 0023-Turn-off-strict-validation-of-modulemd-documents-RhBug20048 Patch24: 0024-Add-unittest-for-setting-up-repo-with-empty-keyfile-RhBug1994614.patch Patch25: 0025-Add-getLatestModules.patch +Patch1000: 1000-anolis-fix-platform-compatibility.path + BuildRequires: cmake BuildRequires: gcc BuildRequires: gcc-c++ @@ -330,6 +333,11 @@ popd %endif %changelog +* Wed Dec 15 2021 zhangbinchen - 0.63.0-7.0.1 +- cherry-pick [8469287] +- Disable rhsm support in Anolis +- Fix platform compatibility + * Fri Jan 14 2022 Pavla Kratochvilova - 0.63.0-7 - Rebuild with new release number -- Gitee From ca5c8d65a5bba4e118de205287984ccbd994532e Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Thu, 23 Dec 2021 16:30:20 +0800 Subject: [PATCH 2/2] module: fix platform compatibility with centos Signed-off-by: Liwei Ge Signed-off-by: yunqi.zwt --- 1000-anolis-fix-platform-compatibility.path | 7 ++++++- libdnf.spec | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/1000-anolis-fix-platform-compatibility.path b/1000-anolis-fix-platform-compatibility.path index 977f72e..b470693 100644 --- a/1000-anolis-fix-platform-compatibility.path +++ b/1000-anolis-fix-platform-compatibility.path @@ -1,7 +1,7 @@ diff -Nur libdnf-0.55.0/libdnf/module/ModulePackage.cpp libdnf-0.55.0.new/libdnf/module/ModulePackage.cpp --- libdnf-0.55.0/libdnf/module/ModulePackage.cpp 2020-11-09 22:42:13.000000000 +0800 +++ libdnf-0.55.0.new/libdnf/module/ModulePackage.cpp 2021-07-08 16:40:15.635247194 +0800 -@@ -580,6 +580,11 @@ +@@ -580,6 +580,16 @@ Id id = repo_add_solvable(repo); Solvable *solvable = pool_id2solvable(pool, id); setSovable(pool, solvable, name, stream, version, context, "noarch"); @@ -9,6 +9,11 @@ diff -Nur libdnf-0.55.0/libdnf/module/ModulePackage.cpp libdnf-0.55.0.new/libdnf + { + std::string compatible_stream = "el8"; + setSovable(pool, solvable, name, compatible_stream, version, context, "noarch"); ++ } ++ if (name == "platform" and stream == "el8") ++ { ++ std::string compatible_stream = "an8"; ++ setSovable(pool, solvable, name, compatible_stream, version, context, "noarch"); + } repoImpl->needs_internalizing = 1; dnf_sack_set_provides_not_ready(moduleSack); diff --git a/libdnf.spec b/libdnf.spec index 72e05b5..cb4f866 100644 --- a/libdnf.spec +++ b/libdnf.spec @@ -333,6 +333,9 @@ popd %endif %changelog +* Thu Dec 23 2021 Liwei Ge - 0.63.0-7.0.2 +- Fix platform compatibility with centos + * Wed Dec 15 2021 zhangbinchen - 0.63.0-7.0.1 - cherry-pick [8469287] - Disable rhsm support in Anolis -- Gitee