From 4b1fd5b78636666d280307f5d65e50de9f1bdeae Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Wed, 15 Dec 2021 08:28:08 +0000 Subject: [PATCH] !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 | 14 +++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) 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..93147a1 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 @@ -57,6 +58,7 @@ Name: libdnf Version: %{libdnf_major_version}.%{libdnf_minor_version}.%{libdnf_micro_version} Release: 7%{?dist} +Release: 3%{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 +89,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 +334,14 @@ popd %endif %changelog +* Wed Dec 15 2021 zhangbinchen - 0.63.0-3.0.1 +- cherry-pick [8469287] +- Disable rhsm support in Anolis +- Fix platform compatibility + +* Mon Sep 13 2021 Marek Blaha - 0.63.0-3 +- Update translations (RhBug:1961634) + * Fri Jan 14 2022 Pavla Kratochvilova - 0.63.0-7 - Rebuild with new release number -- Gitee