rpms/libsmbios
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixes Bug 852719: Dell Open Manage falis to start when libsmbios in EPEL branch is used.

Browse Source 
- Patch re-enables display of "OEM String" in smbios-sys-info-lite.
This commit is contained in:
gunnersrini 2015-09-01 14:13:27 +05:30
parent f63002acf9
commit 55c530865e
2 changed files with 80 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
0001-reverting-the-patch-3304b513.patch Normal file
View File

@ -0,0 +1,73 @@
From 7f0779b2c71ff40ecc5c1d917c5391da824a80e3 Mon Sep 17 00:00:00 2001
From: SriniG <srinivas_g_gowda@dell.com>
Date: Mon, 23 Jun 2014 16:19:59 +0530
Subject: [PATCH] reverting the patch 3304b513. During installation, OM
installer checks for "OEM String". Re-enabling the patch to disable OME
String for smbios-sys-info-lite
---
src/bin/smbios-sys-info-lite.c | 34 ++++++++++++++++++++--------------
1 file changed, 20 insertions(+), 14 deletions(-)
diff --git a/src/bin/smbios-sys-info-lite.c b/src/bin/smbios-sys-info-lite.c
index 6ee44ce..75b2452 100644
--- a/src/bin/smbios-sys-info-lite.c
+++ b/src/bin/smbios-sys-info-lite.c
@@ -35,6 +35,9 @@
#define gettext_noop(String) String
#define N_(String) gettext_noop (String)
+/* 0x0B is the OEM Strings smbios structure */
+#define SMBIOS_TBL_OEM_Strings 0x0B
+
struct options opts[] =
{
{ 254, "memory_file", N_("Debug: Memory dump file to use instead of physical memory"), "m", 1 },
@@ -42,6 +45,22 @@ struct options opts[] =
{ 0, NULL, NULL, NULL, 0 }
};
+/* Print out all the OEM strings */
+static int print_oem_strings()
+{
+ int i=0;
+ smbios_for_each_struct_type(s, SMBIOS_TBL_OEM_Strings) {
+ const char *str = 0;
+ i=1; // SMBIOS strings always start at index 1.
+ while(1) {
+ str = smbios_struct_get_string_number(s, i);
+ if(!str) break;
+ printf(_("OEM String %d: %s\n"), i, str);
+ i++;
+ }
+ }
+}
+
int
main (int argc, char **argv)
{
@@ -154,20 +173,7 @@ main (int argc, char **argv)
printf(_("Is Dell: %d\n"), (sysid!=0));
-#if 0
- // Print out all the OEM strings
- // 0x0B is the OEM Strings smbios structure
- smbios_for_each_struct_type(s, 0x0B) {
- const char *str = 0;
- int i=1; // SMBIOS strings always start at index 1.
- while(1) {
- str = smbios_struct_get_string_number(s, i);
- if(!str) break;
- printf(_("OEM String %d: %s\n"), i, str);
- i++;
- }
- }
-#endif
+ print_oem_strings();
return retval;
}
--
2.4.3

8
libsmbios.spec
View File

@ -99,11 +99,12 @@
Name: %{release_name}
Version: %{release_version}
Release: 13%{?dist}
Release: 14%{?dist}
License: GPLv2+ or OSL 2.1
Summary: Libsmbios C/C++ shared libraries
Group: System Environment/Libraries
Source: http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-%{version}/libsmbios-%{version}.tar.bz2
Patch0: 0001-reverting-the-patch-3304b513.patch
URL: http://linux.dell.com/libsmbios/main
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: strace libxml2-devel gcc-c++ gettext doxygen %{valgrind_BR} %{cppunit_BR} %{fdupes_BR} %{pkgconfig_BR} %{python_devel_BR}
@ -214,6 +215,7 @@ substitutions in yum repository configuration files on Dell systems.
: '########################################'
: '########################################'
%setup -q -n libsmbios-%{version}
%patch0 -p1
find . -type d -exec chmod -f 755 {} \;
find doc src -type f -exec chmod -f 644 {} \;
chmod 755 src/cppunit/*.sh
@ -408,6 +410,10 @@ rm -rf %{buildroot}
%defattr(-,root,root,-)
%changelog
* Tue Sep 1 2015 Srinivas G Gowda <srinivas_g_gowda@dell.com> - 2.2.28-14
- Fixes Bug 852719: Dell Open Manage falis to start when libsmbios in EPEL branch is used.
- Patch re-enables display of "OEM String" in smbios-sys-info-lite.
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.28-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild