From eca8ad823627d3513d3833225891fed971b35ce37052b7481d25145f4d1cbbc8 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 22 Feb 2015 12:13:48 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/Base:System/libsmbios?expand=0&rev=18 --- libsmbios-pic-assembler.patch | 28 ++++++++++++++++++++++++++++ libsmbios.spec | 4 +++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 libsmbios-pic-assembler.patch diff --git a/libsmbios-pic-assembler.patch b/libsmbios-pic-assembler.patch new file mode 100644 index 0000000..001ddee --- /dev/null +++ b/libsmbios-pic-assembler.patch @@ -0,0 +1,28 @@ +Index: libsmbios-2.2.28/src/bin/dellMediaDirectCtl.cpp +=================================================================== +--- libsmbios-2.2.28.orig/src/bin/dellMediaDirectCtl.cpp ++++ libsmbios-2.2.28/src/bin/dellMediaDirectCtl.cpp +@@ -196,17 +196,21 @@ void _callSmi(smiRegs *r, u8 port) + + __asm__ __volatile__ ( + // magic port ++ "push %%ebx\n\t" ++ "mov %0, %%ebx\n\t" + "outb %%al, %%dx \n\t" ++ "mov %%ebx,%1\n\t" ++ "pop %%ebx\n\t" + + : /* output args */ + "=a" (r->eax), +- "=b" (r->ebx), ++ "=g" (r->ebx), + "=c" (r->ecx), + "=S" (r->esi), + "=D" (r->edi) + : /* input args */ + "0" (r->eax), +- "1" (r->ebx), ++ "g" (r->ebx), + "2" (r->ecx), + "3" (r->esi), + "4" (r->edi), diff --git a/libsmbios.spec b/libsmbios.spec index 2a8ec57..b752dcc 100644 --- a/libsmbios.spec +++ b/libsmbios.spec @@ -1,7 +1,7 @@ # # spec file for package libsmbios # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,6 +29,7 @@ Group: System/Management Url: http://linux.dell.com/libsmbios/main/ Source0: http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-%{version}/%{name}-%{version}.tar.bz2 Patch1: %{name}-2.2.28-fix-bashisms.patch +Patch2: %{name}-pic-assembler.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: doxygen @@ -125,6 +126,7 @@ substitutions in yum repository configuration files on Dell systems. %prep %setup -q %patch1 -p1 +%patch2 -p1 %build %configure --disable-rpath From 24df3f606c75fa643ad4e158f9b7404f7b84f9b62f9405752e243619e1563765 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 22 Feb 2015 13:08:13 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Base:System/libsmbios?expand=0&rev=19 --- libsmbios-pic-assembler.patch | 36 ++++++++++------------------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/libsmbios-pic-assembler.patch b/libsmbios-pic-assembler.patch index 001ddee..0202470 100644 --- a/libsmbios-pic-assembler.patch +++ b/libsmbios-pic-assembler.patch @@ -1,28 +1,12 @@ -Index: libsmbios-2.2.28/src/bin/dellMediaDirectCtl.cpp +Index: libsmbios-2.2.28/src/bin/Makefile.am =================================================================== ---- libsmbios-2.2.28.orig/src/bin/dellMediaDirectCtl.cpp -+++ libsmbios-2.2.28/src/bin/dellMediaDirectCtl.cpp -@@ -196,17 +196,21 @@ void _callSmi(smiRegs *r, u8 port) +--- libsmbios-2.2.28.orig/src/bin/Makefile.am ++++ libsmbios-2.2.28/src/bin/Makefile.am +@@ -73,6 +73,7 @@ if BUILD_MEDIA_DIRECT + sbin_PROGRAMS += out/dellMediaDirectCtl + out_dellMediaDirectCtl_SOURCES = src/bin/dellMediaDirectCtl.cpp + out_dellMediaDirectCtl_LDADD = out/libsmbios.la out/libgetopt.la $(AM_LDADD) ++out_dellMediaDirectCtl_CFLAGS = -fno-PIE + endif - __asm__ __volatile__ ( - // magic port -+ "push %%ebx\n\t" -+ "mov %0, %%ebx\n\t" - "outb %%al, %%dx \n\t" -+ "mov %%ebx,%1\n\t" -+ "pop %%ebx\n\t" - - : /* output args */ - "=a" (r->eax), -- "=b" (r->ebx), -+ "=g" (r->ebx), - "=c" (r->ecx), - "=S" (r->esi), - "=D" (r->edi) - : /* input args */ - "0" (r->eax), -- "1" (r->ebx), -+ "g" (r->ebx), - "2" (r->ecx), - "3" (r->esi), - "4" (r->edi), + # dellBiosUpdate uses private headers... this is bad. From 1ae2a87ce4b3243d5ce55bcca35a053d1aefb9d6fb8606203e6bfd7ed5e2af48 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 22 Feb 2015 19:52:20 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Base:System/libsmbios?expand=0&rev=20 --- libsmbios.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/libsmbios.spec b/libsmbios.spec index b752dcc..0292f58 100644 --- a/libsmbios.spec +++ b/libsmbios.spec @@ -29,7 +29,6 @@ Group: System/Management Url: http://linux.dell.com/libsmbios/main/ Source0: http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-%{version}/%{name}-%{version}.tar.bz2 Patch1: %{name}-2.2.28-fix-bashisms.patch -Patch2: %{name}-pic-assembler.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: doxygen @@ -126,7 +125,6 @@ substitutions in yum repository configuration files on Dell systems. %prep %setup -q %patch1 -p1 -%patch2 -p1 %build %configure --disable-rpath From 72150e1face1fc1eb7a9f2d3e358fea50cc769c2c3a1e0457fc060b571e7fa4a Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 22 Feb 2015 19:52:42 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Base:System/libsmbios?expand=0&rev=21 --- libsmbios-pic-assembler.patch | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 libsmbios-pic-assembler.patch diff --git a/libsmbios-pic-assembler.patch b/libsmbios-pic-assembler.patch deleted file mode 100644 index 0202470..0000000 --- a/libsmbios-pic-assembler.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: libsmbios-2.2.28/src/bin/Makefile.am -=================================================================== ---- libsmbios-2.2.28.orig/src/bin/Makefile.am -+++ libsmbios-2.2.28/src/bin/Makefile.am -@@ -73,6 +73,7 @@ if BUILD_MEDIA_DIRECT - sbin_PROGRAMS += out/dellMediaDirectCtl - out_dellMediaDirectCtl_SOURCES = src/bin/dellMediaDirectCtl.cpp - out_dellMediaDirectCtl_LDADD = out/libsmbios.la out/libgetopt.la $(AM_LDADD) -+out_dellMediaDirectCtl_CFLAGS = -fno-PIE - endif - - # dellBiosUpdate uses private headers... this is bad. From bc187c206abf05904fcdedb83425071a2503d3b0dd9b79e3f23b784033d975e1 Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Wed, 6 Jul 2016 16:57:21 +0000 Subject: [PATCH 5/5] Accepting request 407002 from home:trenn:branches:Base:System - Update to latest version 2.3.0 supporting smbios 3.0 - Remove old compatibility binaries OBS-URL: https://build.opensuse.org/request/show/407002 OBS-URL: https://build.opensuse.org/package/show/Base:System/libsmbios?expand=0&rev=22 --- libsmbios-2.2.28.tar.bz2 | 3 --- libsmbios-2.3.0.tar.xz | 3 +++ libsmbios.changes | 6 ++++++ libsmbios.spec | 22 +++++----------------- 4 files changed, 14 insertions(+), 20 deletions(-) delete mode 100644 libsmbios-2.2.28.tar.bz2 create mode 100644 libsmbios-2.3.0.tar.xz diff --git a/libsmbios-2.2.28.tar.bz2 b/libsmbios-2.2.28.tar.bz2 deleted file mode 100644 index 413128b..0000000 --- a/libsmbios-2.2.28.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd247fd43296df3352435b090dd789a22a89c4b316e98b46b915323290a3e350 -size 943292 diff --git a/libsmbios-2.3.0.tar.xz b/libsmbios-2.3.0.tar.xz new file mode 100644 index 0000000..3e5bfe8 --- /dev/null +++ b/libsmbios-2.3.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c71f040df170f6b55a874f292929792449ba1fad6029ba18544ed04a88343c1c +size 830840 diff --git a/libsmbios.changes b/libsmbios.changes index dbfb899..557b646 100644 --- a/libsmbios.changes +++ b/libsmbios.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 6 16:31:44 UTC 2016 - trenn@suse.de + +- Update to latest version 2.3.0 supporting smbios 3.0 +- Remove old compatibility binaries + ------------------------------------------------------------------- Sun Nov 30 04:12:00 UTC 2014 - Led diff --git a/libsmbios.spec b/libsmbios.spec index 0292f58..1ea82fe 100644 --- a/libsmbios.spec +++ b/libsmbios.spec @@ -1,7 +1,7 @@ # # spec file for package libsmbios # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,14 +20,14 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Name: libsmbios -Version: 2.2.28 +Version: 2.3.0 Release: 0 Summary: Libraries to get information from standard BIOS tables License: GPL-2.0+ or OSL-2.1 Group: System/Management Url: http://linux.dell.com/libsmbios/main/ -Source0: http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-%{version}/%{name}-%{version}.tar.bz2 +Source0: http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-%{version}/%{name}-%{version}.tar.xz Patch1: %{name}-2.2.28-fix-bashisms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -166,13 +166,6 @@ rm -rf %{buildroot}%{_datadir}/locale/en@quot/ %find_lang %{name}-2.2-x86_64 -# Backwards compatible symlinks -ln -s %{_sbindir}/dellWirelessCtl %{buildroot}%{_bindir}/dellWirelessCtl -ln -s smbios-lcd-brightness %{buildroot}%{_sbindir}/dellLcdBrightness -ln -s smbios-rbu-bios-update %{buildroot}%{_sbindir}/dellBiosUpdate -ln -s smbios-sys-info %{buildroot}%{_sbindir}/getSystemId -ln -s smbios-wireless-ctl %{buildroot}%{_sbindir}/dellWirelessCtl - %fdupes -s %{buildroot} %clean @@ -217,6 +210,8 @@ rm -rf %{buildroot} %{_sbindir}/smbios-state-byte-ctl %{_sbindir}/smbios-sys-info-lite %{_sbindir}/smbios-upflag-ctl +%{_sbindir}/smbios-keyboard-ctl +%{_sbindir}/smbios-thermal-ctl %files -n smbios-utils-python %defattr(-,root,root,-) @@ -224,8 +219,6 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/libsmbios %config(noreplace) %{_sysconfdir}/libsmbios/* %defattr(555,root,root,-) -# used by HAL in old location, so keep it around until HAL is updated -%{_bindir}/dellWirelessCtl # python utilities %{_sbindir}/smbios-lcd-brightness %{_sbindir}/smbios-passwd @@ -234,11 +227,6 @@ rm -rf %{buildroot} %{_sbindir}/smbios-token-ctl %{_sbindir}/smbios-wakeup-ctl %{_sbindir}/smbios-wireless-ctl -# backwards compatible symlinks -%{_sbindir}/dellBiosUpdate -%{_sbindir}/dellLcdBrightness -%{_sbindir}/dellWirelessCtl -%{_sbindir}/getSystemId %defattr(-,root,root,-) %{_datadir}/smbios-utils/