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

fix cannot detect package manager on NestOS

Browse Source
This commit is contained in:
jianli-97 2023-10-16 14:45:11 +08:00
parent dcb5f49a2d
commit 7e62b59d45
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,36 @@
From 373ce3be8c1fc0835746eca91a4a2f8176df7203 Mon Sep 17 00:00:00 2001
From: jianli-97 <lijian2@kylinos.cn>
Date: Mon, 16 Oct 2023 14:40:48 +0800
Subject: [PATCH] fix cannot detect package manager on NestOS
---
src/ph_rpm.ml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/ph_rpm.ml b/src/ph_rpm.ml
index db7818a..9a65d0a 100644
--- a/src/ph_rpm.ml
+++ b/src/ph_rpm.ml
@@ -31,14 +31,17 @@ 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"; "hce"; "euleros"; "KylinSecOS"; "kylinsecos" ] ||
+ (List.mem (Os_release.get_id ()) [ "fedora"; "rhel"; "centos"; "openEuler"; "hce"; "euleros"; "KylinSecOS"; "kylinsecos"; "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/euleros-release").st_kind = S_REG ||
(stat "/etc/hce-release").st_kind = S_REG ||
- (stat "/etc/kylinsec-release").st_kind = S_REG
+ (stat "/etc/kylinsec-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

@ -10,7 +10,7 @@
Name: supermin
Version: 5.1.19
Release: 17
Release: 18
Summary: A tool for building supermin appliances, required by libguestfs
License: GPLv2+
URL: http://libguestfs.org/
@ -26,6 +26,7 @@ Patch9001: add-pie-and-bind_now-flags.patch
Patch9002: fix-cannot-detect-package-manager-on-hce.patch
Patch9003: fix-supermin-cannot-detect-kylinsecos.patch
Patch9004: add-kylinsecos-to-supermin-support.patch
Patch9005: 0001-fix-cannot-detect-package-manager-on-NestOS.patch
BuildRequires: augeas dnf dnf-plugins-core e2fsprogs-devel
%ifarch loongarch64 sw_64
BuildRequires: glibc-devel
@ -96,6 +97,9 @@ install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/
%{_mandir}/man1/*
%changelog
* Mon Oct 16 2023 lijian <lijian2@kylinos.cn> - 5.1.19-18
- fix cannot detect package manager on NestOS
* Fri Aug 11 2023 yeqinglong <yeqinglong@kylinsec.com.cn> - 5.1.19-17
- add loongarch64 and sw_64 support
- add kylinsec to supermin support