Hi Sebastien,

thanks for having a look at hwinfo. I was just pointed at this bug by
MIA after querying them and offering to help maintain it (I don't really
want to, but I still need it). Your package is a lot more progressed
though, so I'm happy you are doing this.

Regarding libx86emu, I came across the same problem during fixing up the
package. I took the easy route by just disabling it on all platforms
(patch attached), and I cannot make out any missing information in
hwinfo-20.2 . This might be, at least for now, the easier way around
libx86emu.

In addition, I was using the old get-orig-source way of getting a
tarball from the OpenSuSE src.rpm. I don't like it very much, but the
"tarball" already contains the generated changelog and VERSION file, so
you don't have to fix that up manually.

Best Regards,
Bernhard
>From cff15424f3319ba3e9a021fb21dd35b8c0486b06 Mon Sep 17 00:00:00 2001
From: Bernhard Schmidt <bernhard.schm...@lrz.de>
Date: Sat, 30 Nov 2013 20:54:17 +0100
Subject: [PATCH 1/2] debian/patches/disable_vbe_info.patch: disable
 get_vbe_info on all platforms

It depends on libx86emu which is not packaged for Debian yet. I could not make
out any functional differences between hwinfo-16.0-2.2 and hwinfo-20.2 with
this functionality disabled
---
 debian/patches/disable_vbe_info.patch |   42 +++++++++++++++++++++++++++++++++
 debian/patches/series                 |    1 +
 2 files changed, 43 insertions(+)
 create mode 100644 debian/patches/disable_vbe_info.patch

diff --git a/debian/patches/disable_vbe_info.patch b/debian/patches/disable_vbe_info.patch
new file mode 100644
index 0000000..597ea5f
--- /dev/null
+++ b/debian/patches/disable_vbe_info.patch
@@ -0,0 +1,42 @@
+diff --git a/Makefile b/Makefile
+index 60b5a82..a4e84b0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -19,14 +19,6 @@ VERSION := $(shell $(GIT2LOG) --version VERSION ; cat VERSION)
+ 
+ include Makefile.common
+ 
+-# ia64
+-ifneq ($(filter i386 x86_64, $(ARCH)),)
+-SLIBS		+= -lx86emu
+-TLIBS		+= -lx86emu
+-SO_LIBS		+= -lx86emu
+-TSO_LIBS	+= -lx86emu
+-endif
+-
+ SHARED_FLAGS	=
+ OBJS_NO_TINY	= names.o parallel.o modem.o
+ 
+diff --git a/src/hd/bios.c b/src/hd/bios.c
+index 04d730f..3d5bd8e 100644
+--- a/src/hd/bios.c
++++ b/src/hd/bios.c
+@@ -447,7 +447,7 @@ void hd_scan_bios(hd_data_t *hd_data)
+       }
+     }
+ 
+-#if defined(__i386__) || defined (__x86_64__)
++#if 0
+     get_vbe_info(hd_data, vbe);
+ #endif
+ 
+diff --git a/src/hd/mdt.c b/src/hd/mdt.c
+index 780b074..6406e57 100644
+--- a/src/hd/mdt.c
++++ b/src/hd/mdt.c
+@@ -1,4 +1,4 @@
+-#if defined(__i386__) || defined (__x86_64__)
++#if 0
+ 
+ #define _GNU_SOURCE
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 23e0e92..6b28be9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ sh_support.patch
 dbus_pkg_config.patch
 #as-needed.patch
 fix_segfault_in_hd_is_xen_on_amd64
+disable_vbe_info.patch
-- 
1.7.10.4

Reply via email to