From 8f98e3ea204bab416a60d79d8be1873fbac4c957 Mon Sep 17 00:00:00 2001 From: Yang Yanchao Date: Sat, 29 Jan 2022 10:24:46 +0800 Subject: [PATCH] add command --compat-uuid Signed-off-by: Yang Yanchao (cherry picked from commit dcf950cc4ae0509e783f4c84ff844b3e7ad9e835) --- bugfix-compat_uuid.patch | 6 +++--- dmidecode.spec | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/bugfix-compat_uuid.patch b/bugfix-compat_uuid.patch index 5a1a42f..eeac37d 100644 --- a/bugfix-compat_uuid.patch +++ b/bugfix-compat_uuid.patch @@ -20,9 +20,9 @@ index a3e9d6c..35c19c2 100644 */ - if (ver >= 0x0206) + if (ver >= 0x0206 && !(opt.flags & FLAG_COMPAT_UUID)) - printf("%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x", - p[3], p[2], p[1], p[0], p[5], p[4], p[7], p[6], - p[8], p[9], p[10], p[11], p[12], p[13], p[14], p[15]); + { + if (print_cb) + print_cb(attr, diff --git a/dmiopt.c b/dmiopt.c index 2f285f3..dede0f9 100644 --- a/dmiopt.c diff --git a/dmidecode.spec b/dmidecode.spec index d4d34ec..85b5ad1 100644 --- a/dmidecode.spec +++ b/dmidecode.spec @@ -1,6 +1,6 @@ Name: dmidecode Version: 3.3 -Release: 1 +Release: 2 Epoch: 1 Summary: DMI data report tool @@ -8,6 +8,8 @@ License: GPLv2+ URL: https://www.nongnu.org/dmidecode/ Source0: http://download.savannah.gnu.org/releases/dmidecode/%{name}-%{version}.tar.xz +Patch6000: bugfix-compat_uuid.patch + BuildRequires: make gcc xz ExclusiveArch: %{ix86} x86_64 ia64 aarch64 amd64 @@ -48,6 +50,9 @@ make %{?_smp_mflags} CFLAGS="%{__global_cflags}" LDFLAGS="%{__global_ldflags}" %{_mandir}/man8/*.8.gz %changelog +* Sat Jan 29 2022 Yang Yanchao - 3.3-2 +- add command --compat-uuid + * Tue Nov 30 2021 zhouwenpei - 3.3-1 - update to 3.3 -- Gitee