From d76379446878ada8dc80f572e550cb5260a62954da2f51501debeedf381c45a8 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 8 Sep 2008 22:53:04 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hwinfo?expand=0&rev=54 --- hwinfo-2.6.27.patch | 25 +++++++++++++++++++++++++ hwinfo.changes | 5 +++++ hwinfo.spec | 6 +++++- 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 hwinfo-2.6.27.patch diff --git a/hwinfo-2.6.27.patch b/hwinfo-2.6.27.patch new file mode 100644 index 0000000..d8fcc06 --- /dev/null +++ b/hwinfo-2.6.27.patch @@ -0,0 +1,25 @@ +--- src/int10/i10_v86.c ++++ src/int10/i10_v86.c +@@ -34,6 +34,22 @@ + #include "v86bios.h" + #include "AsmMacros.h" + ++#ifndef IF_MASK ++#define IF_MASK X86_EFLAGS_IF ++#endif ++#ifndef VIF_MASK ++#define VIF_MASK X86_EFLAGS_VIF ++#endif ++#ifndef TF_MASK ++#define TF_MASK X86_EFLAGS_TF ++#endif ++#ifndef VIP_MASK ++#define VIP_MASK X86_EFLAGS_VIP ++#endif ++#ifndef NT_MASK ++#define NT_MASK X86_EFLAGS_NT ++#endif ++ + extern int emu_vm86(struct vm86_struct *vm, unsigned debug); + + #define INT2PTR(a) ((a) + (unsigned char *) 0) diff --git a/hwinfo.changes b/hwinfo.changes index af0c5e0..3b2c8af 100644 --- a/hwinfo.changes +++ b/hwinfo.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 9 00:43:45 CEST 2008 - ro@suse.de + +- fix build on x86 with 2.6.67 kernel includes + ------------------------------------------------------------------- Fri Aug 8 11:20:23 CEST 2008 - olh@suse.de diff --git a/hwinfo.spec b/hwinfo.spec index 4d94edf..b52e305 100644 --- a/hwinfo.spec +++ b/hwinfo.spec @@ -29,9 +29,10 @@ PreReq: /sbin/ldconfig %insserv_prereq %fillup_prereq AutoReqProv: on Summary: Hardware Library Version: 15.3 -Release: 13 +Release: 32 Source: hwinfo-15.3.tar.bz2 Patch64: hwinfo.ehea.patch +Patch65: hwinfo-2.6.27.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -57,6 +58,7 @@ system. %prep %setup %patch64 -p1 +%patch65 %build make static @@ -104,6 +106,8 @@ rm -rf %{buildroot} %doc doc/libhd/html %changelog +* Tue Sep 09 2008 ro@suse.de +- fix build on x86 with 2.6.67 kernel includes * Fri Aug 08 2008 olh@suse.de - add inital POWER6 ibmebus support for ehea network (bnc#394602 -LTC44938) * Tue Jul 22 2008 snwint@suse.de