diff --git a/9003-fix-cannot-detect-package-manager-on-KylinOS.patch b/9003-fix-cannot-detect-package-manager-on-KylinOS.patch new file mode 100644 index 0000000..71bceea --- /dev/null +++ b/9003-fix-cannot-detect-package-manager-on-KylinOS.patch @@ -0,0 +1,34 @@ +From 3186a6bc327687fa1d1a941fe631d22788aac570 Mon Sep 17 00:00:00 2001 +From: yueyuankun +Date: Wed, 17 Apr 2024 15:41:17 +0800 +Subject: [PATCH] fix cannot detect package manager on KylinOS + +--- + 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 1e16bbe..c232bff 100644 +--- a/src/ph_rpm.ml ++++ b/src/ph_rpm.ml +@@ -32,14 +32,15 @@ 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"; "nestos" ] || ++ (List.mem (Os_release.get_id ()) [ "fedora"; "rhel"; "centos"; "openEuler"; "anolis"; "uos"; "nestos" ; "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/UnionTech-release").st_kind = S_REG || + (stat "/etc/anolis-release").st_kind = S_REG || +- (stat "/etc/openEuler-release-nestos-for-virt").st_kind = S_REG ++ (stat "/etc/openEuler-release-nestos-for-virt").st_kind = S_REG || ++ (stat "/etc/kylin-release").st_kind = S_REG + with Unix_error _ -> false) + + let opensuse_detect () = +-- +2.33.0 + diff --git a/supermin.spec b/supermin.spec index 256eb55..f2c4514 100644 --- a/supermin.spec +++ b/supermin.spec @@ -1,6 +1,6 @@ Name: supermin Version: 5.3.3 -Release: 4 +Release: 5 Summary: A tool for building supermin appliances, required by libguestfs License: GPLv2+ URL: http://libguestfs.org/ @@ -11,6 +11,7 @@ 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 +Patch9003: 9003-fix-cannot-detect-package-manager-on-KylinOS.patch %ifarch riscv64 Patch9100: 9100-src-format_ext2_kernel.ml-Rename-function-file-kerne.patch Patch9101: 9101-src-Uncompress-kernel-on-RISC-V.patch @@ -79,6 +80,9 @@ install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/ %{_mandir}/man1/* %changelog +* Mon Apr 22 2024 yueyuankun - 5.3.3-5 +- fix cannot detect package manager on KylinOS + * Mon Apr 22 2024 laokz - 5.3.3-4 - riscv64: use musl instead of unsupported dietlibc