- dmidecode-add-logical-non-volatile-device.patch: Add "Logical

non-volatile device" to the memory device types (bsc#1120149).
- Use %doc directly on files instead of installing them explicitly.

OBS-URL: https://build.opensuse.org/package/show/Base:System/dmidecode?expand=0&rev=50
This commit is contained in:
Jean Delvare 2019-01-16 09:26:04 +00:00 committed by Git OBS Bridge
parent 44183134f1
commit 5864d6a83b
3 changed files with 44 additions and 4 deletions

View File

@ -0,0 +1,34 @@
From: Jean Delvare <jdelvare@suse.de>
Date: Wed, 16 Jan 2019 09:04:55 +0100
Subject: dmidecode: Add "Logical non-volatile device" to the memory device types
Git-commit: 74dfb854b8199ddb0a27e89296fa565f4706cb9d
Patch-mainline: yes
References: bsc#1120149
When adding support for non-volative memory, we forgot to add
"Logical non-volatile device" to the list of memory types. This
causes NVDIMM modules to show up as <OUT OF SPEC>. Fix the problem
by adding the missing enumerated value.
Signed-off-by: Jean Delvare <jdelvare@suse.de>
Reviewed-by: Jerry Hoemann <jerry.hoemann@hpe.com>
---
dmidecode.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- a/dmidecode.c
+++ b/dmidecode.c
@@ -2469,10 +2469,11 @@ static const char *dmi_memory_device_typ
"LPDDR",
"LPDDR2",
"LPDDR3",
- "LPDDR4" /* 0x1E */
+ "LPDDR4",
+ "Logical non-volatile device" /* 0x1F */
};
- if (code >= 0x01 && code <= 0x1E)
+ if (code >= 0x01 && code <= 0x1F)
return type[code - 0x01];
return out_of_spec;
}

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jan 16 09:23:52 UTC 2019 - jdelvare@suse.de
- dmidecode-add-logical-non-volatile-device.patch: Add "Logical
non-volatile device" to the memory device types (bsc#1120149).
- Use %doc directly on files instead of installing them explicitly.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 14 16:32:30 CET 2019 - jdelvare@suse.de Mon Jan 14 16:32:30 CET 2019 - jdelvare@suse.de

View File

@ -28,6 +28,7 @@ Source1: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{vers
# https://savannah.nongnu.org/project/memberlist-gpgkeys.php?group=dmidecode # https://savannah.nongnu.org/project/memberlist-gpgkeys.php?group=dmidecode
Source2: %{name}.keyring Source2: %{name}.keyring
Patch1: dmidecode-fix-redfish-hostname-print-length.patch Patch1: dmidecode-fix-redfish-hostname-print-length.patch
Patch2: dmidecode-add-logical-non-volatile-device.patch
Provides: pmtools:%{_sbindir}/dmidecode Provides: pmtools:%{_sbindir}/dmidecode
Obsoletes: pmtools < 20071117 Obsoletes: pmtools < 20071117
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -51,6 +52,7 @@ the BIOS told it to.
%prep %prep
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
%patch2 -p1
%build %build
make CFLAGS="%{optflags}" %{?_smp_mflags} make CFLAGS="%{optflags}" %{?_smp_mflags}
@ -66,16 +68,13 @@ for i in dmidecode vpddecode ownership biosdecode ; do
%endif %endif
install -m 755 $i %{buildroot}%{_sbindir}/ install -m 755 $i %{buildroot}%{_sbindir}/
install -m 644 man/$i.8 %{buildroot}%{_mandir}/man8/ install -m 644 man/$i.8 %{buildroot}%{_mandir}/man8/
install -m 644 AUTHORS NEWS README %{buildroot}%{_docdir}/%{name}/
done done
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{_sbindir}/* %{_sbindir}/*
%dir %{_docdir}/%{name} %dir %{_docdir}/%{name}
%doc %{_docdir}/%{name}/AUTHORS %doc AUTHORS NEWS README
%doc %{_docdir}/%{name}/NEWS
%doc %{_docdir}/%{name}/README
%{_mandir}/man8/* %{_mandir}/man8/*
%license LICENSE %license LICENSE