Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (532ec10dfacc4e08dcf5ff2d13b7990f43739cfe)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <v.merkatz AT gmx.net>
  • To: "sm-commit AT lists.ibiblio.org" <sm-commit AT lists.ibiblio.org>
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (532ec10dfacc4e08dcf5ff2d13b7990f43739cfe)
  • Date: Tue, 11 Sep 2007 23:19:35 +0200

On Tue, Sep 11, 2007 at 09:19:01PM +0200, Ladislav Hagara wrote:
> Is it OK?
> Really from 2007-04-01?

That's when I did the change, just merged it today :)

> I use vanilla kernel and I am able to compile net-tools (from 2007-04-01
> surely several times).

It's kernel headers that are the issue, not the kernel. If you replace
/usr/include/{asm,linux}/* with the ones from the kernel itself, it
fails without the patch. Since we plan to do that some time soon, as our
kernel headers are horribly outdated, I decided to just push the change,
especially as it doesn't hurt any.

> --
> Ladislav Hagara
>
>
> > GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:
> >
> > net/net-tools/HISTORY | 4 ++++
> > net/net-tools/PRE_BUILD | 3 +++
> > net/net-tools/kernel-headers.patch | 10 ++++++++++
> > 3 files changed, 17 insertions(+)
> >
> > New commits:
> > commit 532ec10dfacc4e08dcf5ff2d13b7990f43739cfe
> > Author: Arwed von Merkatz <v.merkatz AT gmx.net>
> > Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
> >
> > net-tools: patch so it works with vanilla kernel headers
> >
> > diff --git a/net/net-tools/HISTORY b/net/net-tools/HISTORY
> > index 1ad754e..7a11807 100644
> > --- a/net/net-tools/HISTORY
> > +++ b/net/net-tools/HISTORY
> > @@ -12,6 +12,10 @@
> > * ifup, ifdown: fixing the stupidity with these things, bug 13773
> > * DETAILS: PATCHLEVEL++
> >
> > +2007-04-01 Arwed v. Merkatz <v.merkatz AT gmx.net>
> > + * PRE_BUILD, kernel-headers.patch: patch to make it compile with
> > + vanilla kernel headers
> > +
> > 2007-03-09 Thomas Orgis <sobukus AT sourcemage.org>
> > * ifdown, DETAILS: fix ifdown to work with bash 3.2
> > (no quoting of regex pattern), PATCHLEVEL++
> > diff --git a/net/net-tools/PRE_BUILD b/net/net-tools/PRE_BUILD
> > new file mode 100755
> > index 0000000..3733546
> > --- /dev/null
> > +++ b/net/net-tools/PRE_BUILD
> > @@ -0,0 +1,3 @@
> > +default_pre_build &&
> > +cd $SOURCE_DIRECTORY &&
> > +patch -p0 < $SPELL_DIRECTORY/kernel-headers.patch
> > diff --git a/net/net-tools/kernel-headers.patch
> > b/net/net-tools/kernel-headers.patch
> > new file mode 100644
> > index 0000000..2cd83bb
> > --- /dev/null
> > +++ b/net/net-tools/kernel-headers.patch
> > @@ -0,0 +1,10 @@
> > +--- lib/fddi.c.orig 2007-04-01 10:41:24.000000000 +0200
> > ++++ lib/fddi.c 2007-04-01 10:41:33.000000000 +0200
> > +@@ -27,6 +27,7 @@
> > + #error "Disable HW Type FDDI"
> > + #endif
> > + #if __GLIBC__ >= 2
> > ++#define __be16 __u16
> > + #include <netinet/if_fddi.h>
> > + #else
> > + #include <linux/if_fddi.h>
> > _______________________________________________
> > SM-Commit mailing list
> > SM-Commit AT lists.ibiblio.org
> > http://lists.ibiblio.org/mailman/listinfo/sm-commit
> > .
> >
> >

--
Arwed v. Merkatz Source Mage GNU/Linux developer
http://www.sourcemage.org




Archive powered by MHonArc 2.6.24.

Top of Page