packages/supermin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!52 fix cannot detect package manager on kylin and uos

Browse Source 
From: @funningc0217 
Reviewed-by: @wang--ge 
Signed-off-by: @wang--ge
This commit is contained in:
openeuler-ci-bot 2024-10-28 08:50:58 +00:00 committed by Gitee
commit ea1c6b103f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
9002-fix-cannot-detect-package-manager-on-kylin-and-uos.patch Normal file
View File

@ -0,0 +1,41 @@
From decd4660a9df603dc2fedc72bdc9c9b99bc567d1 Mon Sep 17 00:00:00 2001
From: Yurii Huang <yurii.huang@dbappsecurity.com.cn>
Date: Fri, 18 Oct 2024 17:11:26 +0800
Subject: [PATCH] fix cannot detect package manager on kylin and uos
---
src/ph_rpm.ml | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/ph_rpm.ml b/src/ph_rpm.ml
index 61537ce..61d2cb7 100644
--- a/src/ph_rpm.ml
+++ b/src/ph_rpm.ml
@@ -31,11 +31,13 @@ let stringset_of_list pkgs =
let fedora_detect () =
Config.rpm <> "no" && Config.rpm2cpio <> "no" && rpm_is_available () &&
(Config.yumdownloader <> "no" || Config.dnf <> "no") &&
- (List.mem (Os_release.get_id ()) [ "fedora"; "rhel"; "centos"; "openEuler" ] ||
+ (List.mem (Os_release.get_id ()) [ "fedora"; "rhel"; "centos"; "openEuler"; "uos"; "kylin" ] ||
try
(stat "/etc/redhat-release").st_kind = S_REG ||
(stat "/etc/fedora-release").st_kind = S_REG ||
- (stat "/etc/openEuler-release").st_kind = S_REG
+ (stat "/etc/openEuler-release").st_kind = S_REG ||
+ (stat "/etc/UnionTech-release").st_kind = S_REG ||
+ (stat "/etc/kylin-release").st_kind = S_REG
with Unix_error _ -> false)
let opensuse_detect () =
@@ -439,7 +441,7 @@ and pkgs_as_NA_rpms pkgs =
and rpm_unpack tdir dir =
(* Unpack each downloaded package.
- *
+ *
* yumdownloader can't necessarily download the specific file that we
* requested, we might get a different (eg later) version.
*)
--
2.27.0

6
supermin.spec
View File

@ -1,6 +1,6 @@
Name: supermin
Version: 5.1.19
Release: 12
Release: 13
Summary: A tool for building supermin appliances, required by libguestfs
License: GPLv2+
URL: http://libguestfs.org/
@ -11,6 +11,7 @@ Patch0001: 0001-Fix-Bytes-String-for-OCaml-4.06.patch
Patch0002: 0002-use-installed-packages-instead-of-dnf-downloading.patch
Patch9000: 9000-fix-cannot-detect-package-manager-on-openeuler.patch
Patch9001: add-pie-and-bind_now-flags.patch
Patch9002: 9002-fix-cannot-detect-package-manager-on-kylin-and-uos.patch
BuildRequires: augeas dietlibc-devel dnf dnf-plugins-core e2fsprogs-devel
BuildRequires: findutils gnupg2 grubby hivex kernel ocaml ocaml-findlib-devel
BuildRequires: rpm rpm-devel systemd-udev tar
@ -68,6 +69,9 @@ install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/
%{_mandir}/man1/*
%changelog
* Fri Oct 18 2024 Yurii.Huang<yurii.huang@dbappsecurity.com.cn> - 5.1.19-13
- adapter os uos and kylin
* Wed Sep 08 2021 wangyue <wangyue92@huawei.com> - 5.1.19-12
- Add pie and bind_now flags