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

!14 fix cannot detect package manager on UnionTech

Browse Source 
From: @WangTsing-Yan
Reviewed-by: @ruebb
Signed-off-by: @ruebb
This commit is contained in:
openeuler-ci-bot 2021-12-10 10:38:54 +00:00 committed by Gitee
commit aa0bd4594f
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
9002-fix-cannot-detect-package-manager-on-UnionTech.patch Normal file
View File

@ -0,0 +1,27 @@
From a5d2b966fe89e66b7e5f0bb5387f4f0c855cfb54 Mon Sep 17 00:00:00 2001
From: wangqing <wangqing@uniontech.com>
Date: Fri, 8 Oct 2021 16:20:26 +0800
Subject: [PATCH] fix cannot detect package manager on UnionTech
Signed-off-by: wangqing <wangqing@uniontech.com>
diff --git a/src/ph_rpm.ml b/src/ph_rpm.ml
index 61537ce..a0d3405 100644
--- a/src/ph_rpm.ml
+++ b/src/ph_rpm.ml
@@ -31,10 +31,11 @@ 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" ] ||
try
(stat "/etc/redhat-release").st_kind = S_REG ||
(stat "/etc/fedora-release").st_kind = S_REG ||
+ (stat "/etc/UnionTech-release").st_kind = S_REG ||
(stat "/etc/openEuler-release").st_kind = S_REG
with Unix_error _ -> false)
--
2.20.1

7
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,8 @@ 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-UnionTech.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 +70,9 @@ install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/
%{_mandir}/man1/*
%changelog
* Fri Oct 08 2021 wangqing <wangqing@uniontech.com> - 5.1.19-13
- fix cannot detect package manager on UnionTech
* Wed Sep 08 2021 wangyue <wangyue92@huawei.com> - 5.1.19-12
- Add pie and bind_now flags