Projects
home:Eustace:branches:Eulaceura:Factory
libguestfs
_service:obs_scm:0004-libguestfs-Support-openEu...
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File _service:obs_scm:0004-libguestfs-Support-openEuler.patch of Package libguestfs
From ea2bbd2f9f334baee64e46cf5739368c9a266668 Mon Sep 17 00:00:00 2001 From: Wang Guoquan <wangguoquan03@foxmail.com> Date: Sun, 8 Sep 2024 00:03:48 +0800 Subject: [PATCH] libguestfs: Support openEuler openEuler is simliar to CentOS, but the ID is not lower-case string which doesn't meet the specifications, as below, NAME="openEuler" VERSION="24.03 (LTS)" ID="openEuler" VERSION_ID="24.03" PRETTY_NAME="openEuler 24.03 (LTS)" ANSI_COLOR="0;31" Considering the impact on the released versions, support 'ID=openEuler' in libguestfs. Signed-off-by: Wang Guoquan <wangguoquan03@foxmail.com> --- daemon/inspect_fs.ml | 4 ++++ daemon/inspect_fs_unix.ml | 1 + daemon/inspect_types.ml | 2 ++ daemon/inspect_types.mli | 1 + generator/actions_inspection.ml | 4 ++++ m4/guestfs-appliance.m4 | 5 +++-- 6 files changed, 15 insertions(+), 2 deletions(-) diff --git a/daemon/inspect_fs.ml b/daemon/inspect_fs.ml index 9c73d97..4ca2433 100644 --- a/daemon/inspect_fs.ml +++ b/daemon/inspect_fs.ml @@ -265,6 +265,7 @@ and check_package_format { distro } = | Some DISTRO_MANDRIVA | Some DISTRO_MEEGO | Some DISTRO_NEOKYLIN + | Some DISTRO_OPENEULER | Some DISTRO_OPENMANDRIVA | Some DISTRO_OPENSUSE | Some DISTRO_ORACLE_LINUX @@ -377,6 +378,9 @@ and check_package_management { distro; version } = | Some DISTRO_VOID_LINUX -> Some PACKAGE_MANAGEMENT_XBPS + | Some DISTRO_OPENEULER-> + Some PACKAGE_MANAGEMENT_DNF + | Some DISTRO_OPENMANDRIVA -> Some PACKAGE_MANAGEMENT_DNF diff --git a/daemon/inspect_fs_unix.ml b/daemon/inspect_fs_unix.ml index 8045ef0..2f5bf6c 100644 --- a/daemon/inspect_fs_unix.ml +++ b/daemon/inspect_fs_unix.ml @@ -151,6 +151,7 @@ and distro_of_os_release_id = function | "kylin" -> Some DISTRO_KYLIN | "mageia" -> Some DISTRO_MAGEIA | "neokylin" -> Some DISTRO_NEOKYLIN + | "openEuler" -> Some DISTRO_OPENEULER | "openmandriva" -> Some DISTRO_OPENMANDRIVA | "opensuse" -> Some DISTRO_OPENSUSE | s when String.is_prefix s "opensuse-" -> Some DISTRO_OPENSUSE diff --git a/daemon/inspect_types.ml b/daemon/inspect_types.ml index 9395c51..e27d9f3 100644 --- a/daemon/inspect_types.ml +++ b/daemon/inspect_types.ml @@ -88,6 +88,7 @@ and distro = | DISTRO_NEOKYLIN | DISTRO_NETBSD | DISTRO_OPENBSD + | DISTRO_OPENEULER | DISTRO_OPENMANDRIVA | DISTRO_OPENSUSE | DISTRO_ORACLE_LINUX @@ -222,6 +223,7 @@ and string_of_distro = function | DISTRO_NEOKYLIN -> "neokylin" | DISTRO_NETBSD -> "netbsd" | DISTRO_OPENBSD -> "openbsd" + | DISTRO_OPENEULER -> "openeuler" | DISTRO_OPENMANDRIVA -> "openmandriva" | DISTRO_OPENSUSE -> "opensuse" | DISTRO_ORACLE_LINUX -> "oraclelinux" diff --git a/daemon/inspect_types.mli b/daemon/inspect_types.mli index 29c76e8..9cf61f3 100644 --- a/daemon/inspect_types.mli +++ b/daemon/inspect_types.mli @@ -95,6 +95,7 @@ and distro = | DISTRO_NEOKYLIN | DISTRO_NETBSD | DISTRO_OPENBSD + | DISTRO_OPENEULER | DISTRO_OPENMANDRIVA | DISTRO_OPENSUSE | DISTRO_ORACLE_LINUX diff --git a/generator/actions_inspection.ml b/generator/actions_inspection.ml index f8b7449..4721033 100644 --- a/generator/actions_inspection.ml +++ b/generator/actions_inspection.ml @@ -250,6 +250,10 @@ NetBSD. OpenBSD. +=item \"openeuler\" + +openEuler. + =item \"openmandriva\" OpenMandriva Lx. diff --git a/m4/guestfs-appliance.m4 b/m4/guestfs-appliance.m4 index a371092..29770c6 100644 --- a/m4/guestfs-appliance.m4 +++ b/m4/guestfs-appliance.m4 @@ -119,7 +119,8 @@ if test "x$ENABLE_APPLIANCE" = "xyes"; then [DISTRO=REDHAT], [OPENSUSE* | SLED | SLES],[DISTRO=SUSE], [ARCH | MANJARO | ARTIX],[DISTRO=ARCHLINUX], - [OPENMANDRIVA],[DISTRO=OPENMANDRIVA]) + [OPENMANDRIVA],[DISTRO=OPENMANDRIVA], + [OPENEULER],[DISTRO=OPENEULER]) AC_MSG_RESULT([$DISTRO (from /etc/os-release)]) elif test -f /etc/openEuler-release; then @@ -150,7 +151,7 @@ if test "x$ENABLE_APPLIANCE" = "xyes"; then AC_SUBST([DISTRO]) fi AM_CONDITIONAL([HAVE_RPM], - [AS_CASE([$DISTRO], [REDHAT | SUSE | OPENMANDRIVA | MAGEIA ], [true], + [AS_CASE([$DISTRO], [REDHAT | SUSE | OPENMANDRIVA | MAGEIA | OPENEULER], [true], [*], [false])]) AM_CONDITIONAL([HAVE_DPKG], [AS_CASE([$DISTRO], [DEBIAN | UBUNTU ], [true], -- 2.43.0
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2