From fea08342f4f25c9e7a889c71bc112d4a32d93d04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Mon, 11 Dec 2017 19:47:14 +0300 Subject: [PATCH] libsmbios fix --- hardware/misc/libsmbios/actions.py | 22 +++++++++++++++------- hardware/misc/libsmbios/pspec.xml | 20 +++++++++++++------- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/hardware/misc/libsmbios/actions.py b/hardware/misc/libsmbios/actions.py index 19f21d5a99..085d99ff70 100644 --- a/hardware/misc/libsmbios/actions.py +++ b/hardware/misc/libsmbios/actions.py @@ -10,23 +10,31 @@ from pisi.actionsapi import get from pisi.actionsapi import shelltools def setup(): - shelltools.system("./autogen.sh") + shelltools.system("./autogen.sh --no-configure") #autotools.autoreconf("-fi") - #autotools.configure() + shelltools.makedirs("build") + shelltools.cd("build") + shelltools.system("../configure --prefix=/usr --sbindir=/usr/sbin --sysconfdir=/etc --disable-static --enable-libsmbios_cxx") + + pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + def build(): + shelltools.cd("build") autotools.make() def install(): + shelltools.cd("build") autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.insinto("/usr/include", "src/include/smbios") + pisitools.insinto("/usr/include", "../src/include/smbios") # Symlink to /usr/sbin/DellWirelessCtl for the new HAL pisitools.dosym("/usr/sbin/smbios-wireless-ctl", "/usr/sbin/DellWirelessCtl") # Remove yum specific stuff - #pisitools.removeDir("/etc/yum") + pisitools.removeDir("/etc/yum") #pisitools.removeDir("/usr/bin") - #pisitools.removeDir("/usr/lib/yum-plugins") - - pisitools.dodoc( "NEWS", "TODO") + pisitools.removeDir("/usr/lib/yum-plugins") + + shelltools.cd("..") + pisitools.dodoc("NEWS", "TODO") diff --git a/hardware/misc/libsmbios/pspec.xml b/hardware/misc/libsmbios/pspec.xml index 61d4e949f1..bdc572a096 100644 --- a/hardware/misc/libsmbios/pspec.xml +++ b/hardware/misc/libsmbios/pspec.xml @@ -28,13 +28,13 @@ libgcc - /usr/local/etc - /usr/share - /usr/local/lib + /etc /usr/sbin - /usr/local/sbin + /usr/lib /usr/share/doc - /usr/local/share + /usr/share/man/man3 + /usr/share/smbios-utils + /usr/share/locale @@ -46,12 +46,18 @@ /usr/include/smbios - /usr/lib/pkgconfig - /usr/share/man/man3 + /usr/lib/pkgconfig + + 2017-12-11 + 2.3.3 + Rebuild. + Ertuğrul Erata + ertugrulerata@gmail.com + 2017-04-29 2.3.3