Re: Dosemu 1.3.2 and linux 2.6.7 headers

[Hufnus <tonyb@thekrnl.sysdev.org>]

On Wed, 13 Jul 2005 11:35:03 +1200 (NZST)
Bart Oldeman <bartoldeman@users.sourceforge.net> wrote:

> On Tue, 12 Jul 2005, Hufnus wrote:
> 
> > On Tue, 12 Jul 2005 12:07:21 -0800
> > Hufnus <tonyb@sysdev.org> wrote:
> >
> > > Anybody runing 1.3.2 or trying with Linux 2.6 ????
> > >
> > > So I tried to compile with Linux 2.6.7 headers, but the make
> > > gets some obsolete warnings and then fails with many parse
> > > errors in /usr/include/linux/mod_devicetable.h related to
> > > symbols like__u32 etc....
> > >
> > > Now, if I relink 'ln -sf linux-2.4.31 linux' it still complains
> > > about using -malign-????? is obsolete to use -falign-????? but
> > > it builds fine.
> >
> > I know I am using Skackware's default symbolic link
> > /usr/include/linux -> /usr/src/linux-2.6.7/include/linux !!!
> 
> This is not its default symbolic link. You must have created it
> yourself, manually.
> 
> > My question is what should I do ....
> >
> I've go a deja vu feeling here, this has been discussed before.
> You need to install Slackware's kernel-headers package (it's in the
> d series, over here for instance:
> ftp://ftp.slackware.com/pub/slackware/slackware-current/slackware/d/kernel-headers-2.4.31-i386-1.tgz
> They contain sanitized 2.4.31 headers that were used to compile
> glibc, and that is what user space (incl dosemu) sometimes sees
> indirectly.
> 
> Just don't mess with /usr/include/linux, unless you really know
> what you are doing and are willing to recompile glibc.
> 
> Bart

Looking at those kernel headers vs the kernel distribution ones,
I guess that should work.  Unfortunately I am usually in a higher
kernel than Slackware-current is, so always get in trouble.

Looking at /usr/include/linux headers, I think there is a bug in
<linux/pci.h>.  It #includes <linux/mod_devicetable.h>, at the
top and outside of an #ifdef __KERNEL__  which is located further
down, where #include <linux/types.h> is also present.  It seems
to me that inside the #ifdef __KERNEL__ is where it should be placed.

I tested just modifying <linux pci.h>, rather than having to modify
/usr/include/linux/mod_devicetable.h and dosemu's src/emu.c to add
the types.h and make it compile correctly and it worked too!

Maybe the kernel guys will pick that change up, if it carries no
other implications ...

TonyB

--
  __      __  _     I N C.               http://www.sysdev.org
/ __|\\// __||  \  __   __          /         tonyb@sysdev.org
\__ \ \/\__ \||)|/ O_)\/ /        \/  System Tools / Utilities
|___/ || ___/|_ /\___|\_/        WIntel / Linux Device Drivers