Gentoo Archives: gentoo-user

From: Daniel Barkalow <barkalow@××××××××.org>
To: gentoo-user@l.g.o
Subject: Re: [gentoo-user] zd1211 patch?
Date: Tue, 08 May 2007 23:11:17
Message-Id: Pine.LNX.4.64.0705081851080.18541@iabervon.org
In Reply to: Re: [gentoo-user] zd1211 patch? by Arnau Bria
1 On Tue, 8 May 2007, Arnau Bria wrote:
2
3 > On Tue, 8 May 2007 17:22:32 +0200
4 > Alan McKinnon wrote:
5 >
6 > Hi!
7 >
8 > > On Tuesday 08 May 2007, Arnau Bria wrote:
9 > > > For what I understand, I must modify zd1211-83.ebuild, and rebuild
10 > > > the ebuild with:
11 > > > ebuild zd1211-83.ebuild digest (which worked fine)
12 > > >
13 > > > but, what should be the content of /tmp/net_dev.patch?¿?
14 > >
15 > > You list two patches.
16 > >
17 > > The one for the ebuild you should apply to the ebuild manually
18 > > using 'patch', but you seem to have successfully done that already.
19 > Yep,
20 >
21 > > Then copy the first patch (net_dev.patch)
22 > Ok, but, what is the content of net_dev.patch? if I put:
23 > # cat files/net_dev.patch
24 > EXTRA_CFLAGS += -O2 -Wall -Wstrict-prototypes -pipe
25 > #EXTRA_CFLAGS += -Wa,-a,-ad -g
26 > -EXTRA_CFLAGS += -DZDCONF_WE_STAT_SUPPORT=1
27 > +EXTRA_CFLAGS += -DZDCONF_WE_STAT_SUPPORT=0
28 > EXTRA_CFLAGS += -DHOST_IF_USB
29 > EXTRA_CFLAGS += -DAMAC
30 > EXTRA_CFLAGS += -DGCCK
31
32 You need to copy the whole patch file exactly, including whitespace. Go to
33 https://bugs.gentoo.org/attachment.cgi?id=108347 and save as netdev.patch.
34
35 (This paragraph isn't critical, but if you want to understand patch/diff...)
36 In particular, you seem to have lost the "diff" line, the --- and +++
37 lines (which tell it what file to patch), the @@ ... @@ line (which tells
38 it where to look for the thing to change), the blank line that shouldn't
39 be changed, and the space characters in the first columns of the context
40 lines that tell it that those are context instead of changes.
41
42 So "patch" has decided that the contents of that file are too damaged for
43 it to use. In particular, it has no chance without any of the first three
44 lines, because it doesn't know what file to use and can't guess.
45
46 -Daniel
47 *This .sig left intentionally blank*