patched up to upstream commit aad65d8a53

Signed-off-by: Anton Arapov <arapov@gmail.com>
This commit is contained in:
Anton Arapov 2017-06-08 01:06:05 +02:00
parent d2752e850d
commit c362974080
2 changed files with 48 additions and 1 deletions

View File

@ -0,0 +1,42 @@
From aad65d8a53a00d5426990fc8b5af9d749fc879b9 Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@linux.intel.com>
Date: Thu, 1 Jun 2017 14:21:38 +0300
Subject: [PATCH] dmidecode: Add system-family direct string option
This allows users to print system-family using '-s' option.
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Jean Delvare <jdelvare@suse.de>
---
dmiopt.c | 1 +
man/dmidecode.8 | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/dmiopt.c b/dmiopt.c
index da42546..a36cf16 100644
--- a/dmiopt.c
+++ b/dmiopt.c
@@ -156,6 +156,7 @@ static const struct string_keyword opt_string_keyword[] = {
{ "system-version", 1, 0x06 },
{ "system-serial-number", 1, 0x07 },
{ "system-uuid", 1, 0x08 }, /* dmi_system_uuid() */
+ { "system-family", 1, 0x1a },
{ "baseboard-manufacturer", 2, 0x04 },
{ "baseboard-product-name", 2, 0x05 },
{ "baseboard-version", 2, 0x06 },
diff --git a/man/dmidecode.8 b/man/dmidecode.8
index bef204e..e3b6b2a 100644
--- a/man/dmidecode.8
+++ b/man/dmidecode.8
@@ -74,7 +74,7 @@ Only display the value of the \s-1DMI\s0 string identified by \fBKEYWORD\fR.
\fBbios-version\fR, \fBbios-release-date\fR,
\fBsystem-manufacturer\fR, \fBsystem-product-name\fR,
\fBsystem-version\fR, \fBsystem-serial-number\fR,
-\fBsystem-uuid\fR,
+\fBsystem-uuid\fR, \fBsystem-family\fR,
\fBbaseboard-manufacturer\fR, \fBbaseboard-product-name\fR,
\fBbaseboard-version\fR, \fBbaseboard-serial-number\fR,
\fBbaseboard-asset-tag\fR, \fBchassis-manufacturer\fR,
--
2.9.4

View File

@ -1,11 +1,12 @@
Summary: Tool to analyse BIOS DMI data Summary: Tool to analyse BIOS DMI data
Name: dmidecode Name: dmidecode
Version: 3.1 Version: 3.1
Release: 1%{?dist} Release: 2%{?dist}
Epoch: 1 Epoch: 1
Group: System Environment/Base Group: System Environment/Base
License: GPLv2+ License: GPLv2+
Source0: %{name}-%{version}.tar.xz Source0: %{name}-%{version}.tar.xz
Patch0: 0001-dmidecode-Add-system-family-direct-string-option.patch
URL: http://www.nongnu.org/dmidecode/ URL: http://www.nongnu.org/dmidecode/
BuildRequires: automake autoconf BuildRequires: automake autoconf
ExclusiveArch: %{ix86} x86_64 ia64 aarch64 ExclusiveArch: %{ix86} x86_64 ia64 aarch64
@ -23,6 +24,7 @@ I/O ports (e.g. serial, parallel, USB).
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .system-family
%build %build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
@ -43,6 +45,9 @@ make %{?_smp_mflags} DESTDIR=%{buildroot} prefix=%{_prefix} install-bin install-
%{_mandir}/man8/* %{_mandir}/man8/*
%changelog %changelog
* Thu Jun 08 2017 Anton Arapov <aarapov@redhat.com> - 1:3.1-2
- patched up to upstream commit aad65d8a53
* Wed May 24 2017 Anton Arapov <aarapov@redhat.com> - 1:3.1-1 * Wed May 24 2017 Anton Arapov <aarapov@redhat.com> - 1:3.1-1
- updated to upstream v3.1 - updated to upstream v3.1
- Supported SMBIOS spec up to v3.1.1 - Supported SMBIOS spec up to v3.1.1