From 7e62b59d45fb5fd7d7df9f16f2b86db138cfb6a1 Mon Sep 17 00:00:00 2001 From: jianli-97 Date: Mon, 16 Oct 2023 14:45:11 +0800 Subject: [PATCH] fix cannot detect package manager on NestOS --- ...not-detect-package-manager-on-NestOS.patch | 36 +++++++++++++++++++ supermin.spec | 6 +++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 0001-fix-cannot-detect-package-manager-on-NestOS.patch diff --git a/0001-fix-cannot-detect-package-manager-on-NestOS.patch b/0001-fix-cannot-detect-package-manager-on-NestOS.patch new file mode 100644 index 0000000..2dc225d --- /dev/null +++ b/0001-fix-cannot-detect-package-manager-on-NestOS.patch @@ -0,0 +1,36 @@ +From 373ce3be8c1fc0835746eca91a4a2f8176df7203 Mon Sep 17 00:00:00 2001 +From: jianli-97 +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 + diff --git a/supermin.spec b/supermin.spec index 6bd440b..e6e28ef 100644 --- a/supermin.spec +++ b/supermin.spec @@ -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 - 5.1.19-18 +- fix cannot detect package manager on NestOS + * Fri Aug 11 2023 yeqinglong - 5.1.19-17 - add loongarch64 and sw_64 support - add kylinsec to supermin support