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

!40 fix cannot detect package manager on NestOS

Browse Source 
From: @jianli-97 
Reviewed-by: @zhuchunyi 
Signed-off-by: @zhuchunyi
This commit is contained in:
openeuler-ci-bot 2023-10-23 01:49:05 +00:00 committed by Gitee
commit ff962ede17
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
0001-fix-cannot-detect-package-manager-on-NestOS.patch Normal file
View File

@ -0,0 +1,33 @@
From 79c8d4e698d4a05965eaec361e9a09eec12eee42 Mon Sep 17 00:00:00 2001
From: jianli-97 <lijian2@kylinos.cn>
Date: Mon, 16 Oct 2023 14:58:57 +0800
Subject: [PATCH] fix cannot detect package manager on NestOS
---
src/ph_rpm.ml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/ph_rpm.ml b/src/ph_rpm.ml
index f2d9d3e..94ec845 100644
--- a/src/ph_rpm.ml
+++ b/src/ph_rpm.ml
@@ -32,13 +32,14 @@ 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"; "anolis"; "uos" ] ||
+ (List.mem (Os_release.get_id ()) [ "fedora"; "rhel"; "centos"; "openEuler"; "anolis"; "uos"; "nestos" ] ||
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/UnionTech-release").st_kind = S_REG ||
- (stat "/etc/anolis-release").st_kind = S_REG
+ (stat "/etc/anolis-release").st_kind = S_REG ||
+ (stat "/etc/openEuler-NestOS-For-Virt-release").st_kind = S_REG
with Unix_error _ -> false)
let opensuse_detect () =
--
2.33.0

6
supermin.spec
View File

@ -1,6 +1,6 @@
Name: supermin
Version: 5.3.3
Release: 1
Release: 2
Summary: A tool for building supermin appliances, required by libguestfs
License: GPLv2+
URL: http://libguestfs.org/
@ -10,6 +10,7 @@ Source2: supermin-find-requires
Patch0002: 0002-use-installed-packages-instead-of-dnf-downloading.patch
Patch9001: add-pie-and-bind_now-flags.patch
Patch9002: 9002-fix-cannot-detect-package-manager-on-UnionTech.patch
Patch0004: 0001-fix-cannot-detect-package-manager-on-NestOS.patch
BuildRequires: augeas dietlibc-devel dnf dnf-plugins-core e2fsprogs-devel
BuildRequires: findutils gnupg2 grubby hivex ocaml ocaml-findlib-devel
@ -68,6 +69,9 @@ install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/
%{_mandir}/man1/*
%changelog
* Mon Oct 16 2023 lijian <lijian2@kylinos.cn> -5.3.3-2
- fix cannot detect package manager on NestOS
* Sun Oct 08 2023 xu_ping<707078654@qq.com> -5.3.3-1
- Update to version 5.3.3