Previous patch support_OPENEULER_to_configure.patch detects openEuler by checking content of file /etc/openEuler-release for the ID value. However the right file to check is /etc/os-release. This mistake leads to incorrectly detecting the distro as REDHAT. As upstream already supported openEuler since commit 1d8924c34, backport it with minor changes to properly support openEuler. And after openEuler is correctly detected, appliance package list need to be updated to include the correct package names for openEuler. It was using the list for REDHAT before, which is not fully correct. This fixes issue #IB2MW0. Signed-off-by: Kai Liu <kai.liu@windriver.com>
61 lines
1.4 KiB
Diff
61 lines
1.4 KiB
Diff
From: Kai Liu <kai.liu@windriver.com>
|
|
Date: Fri, 8 Nov 2024 12:44:03 +0800
|
|
Subject: Provide openEuler appliance package list
|
|
|
|
Although upstream already supported distro detecting for openEuler,
|
|
package list for openEuler appliance is still missing.
|
|
|
|
Index: libguestfs-1.49.5/appliance/packagelist.in
|
|
===================================================================
|
|
--- libguestfs-1.49.5.orig/appliance/packagelist.in
|
|
+++ libguestfs-1.49.5/appliance/packagelist.in
|
|
@@ -11,6 +11,7 @@ dnl ARCHLINUX=1 For Archlinux.
|
|
dnl SUSE=1 For OpenSUSE.
|
|
dnl FRUGALWARE=1 For Frugalware.
|
|
dnl MAGEIA=1 For Mageia.
|
|
+dnl OPENEULER=1 For openEuler.
|
|
dnl
|
|
dnl There is also a list of packages which are excluded if they appear
|
|
dnl as dependencies of the packages below. See: excludelist.in
|
|
@@ -211,6 +212,29 @@ ifelse(OPENMANDRIVA,1,
|
|
zstd
|
|
)
|
|
|
|
+ifelse(OPENEULER,1,
|
|
+ clevis
|
|
+ cryptsetup
|
|
+ dhcp
|
|
+ gfs2-utils
|
|
+ grub2
|
|
+ hfsplus-tools
|
|
+ iproute
|
|
+ iputils
|
|
+ kernel
|
|
+ nilfs-utils
|
|
+ ntfs-3g
|
|
+ openssh-clients
|
|
+ policycoreutils
|
|
+ reiserfs-utils
|
|
+ rpm-libs
|
|
+ syslinux-extlinux
|
|
+ systemd dnl for /sbin/reboot and udevd
|
|
+ vim-minimal
|
|
+ xz
|
|
+ zstd
|
|
+)
|
|
+
|
|
include(guestfsd.deps)
|
|
|
|
acl
|
|
@@ -286,6 +310,10 @@ ifelse(MAGEIA,1,
|
|
qemu-img
|
|
which
|
|
)
|
|
+ifelse(OPENEULER,1,
|
|
+ qemu-img
|
|
+ which
|
|
+)
|
|
curl
|
|
kpartx
|
|
dnl (virt-dib) tools optionally used for elements
|