1 |
Mark Knecht wrote: |
2 |
> On 7/7/05, Christian Heim <christian.th.heim@×××.de> wrote: |
3 |
> |
4 |
> Hi Christian, |
5 |
> Thanks for the response. There were just two problems, as best I |
6 |
> can tell. One was in the upper level makefile which the second was in |
7 |
> a more tecnical piece of code. I'm providing the output here more for |
8 |
> conversation and not really asking for technical help on changing |
9 |
> code. This is just for my learning. |
10 |
> |
11 |
> In the first one it appears that Gentoo does an extra version so I |
12 |
> can probably fake my way around this but changing the patch file |
13 |
> itself to expect the Gentoo kernel I want to patch. Is that a |
14 |
> reasonable strategy? |
15 |
|
16 |
Make, if I understood you right, you would like to do the prempt stuff |
17 |
ontop of gentoo-sources, right ? |
18 |
|
19 |
Well then simply do the following: |
20 |
|
21 |
# emerge a fresh copy of gentoo-sources |
22 |
$ emerge gentoo-sources |
23 |
|
24 |
# create a copy (or call it a fork ;)) of this kernel-directory |
25 |
$ cd /usr/src |
26 |
$ rsync -rt --progress linux-2.6.12-gentoo-r4/* linux-2.6.12-gentoo-r4.orig |
27 |
|
28 |
# now go on and apply your patch to the |
29 |
linux-2.6.12-gentoo-r4-directory. Once you are done, just go back to |
30 |
/usr/src and create a diff between plain gentoo-sources and your |
31 |
prempt-patched gentoo-sources. |
32 |
|
33 |
$ cd /usr/src |
34 |
$ diff -Nrup linux-2.6.12-gentoo-r4.orig linux-2.6.12-gentoo-r4 > |
35 |
gentoo-sources-2.6.12-r4-prempt.patch |
36 |
|
37 |
> In the first one it appears that Gentoo does an extra version so I |
38 |
> can probably fake my way around this but changing the patch file |
39 |
> itself to expect the Gentoo kernel I want to patch. Is that a |
40 |
> reasonable strategy? |
41 |
|
42 |
See above ;) |
43 |
|
44 |
> In the second, since it's apparently just a difference in brakets |
45 |
> I'm more curious about why gentoo-sources would differ from what Ingo |
46 |
> was apparently expectinb in the kernel config file, but again it seems |
47 |
> pretty minor. Would you agree? |
48 |
|
49 |
Yeah, those rejects are really pretty minor. I guess these brakets |
50 |
differences result from vesafb. But that's only a guess. |
51 |
|
52 |
> Thanks, |
53 |
> Mark |
54 |
> |
55 |
> Makefile.rej: |
56 |
> *************** |
57 |
> *** 1,7 **** |
58 |
> VERSION = 2 |
59 |
> PATCHLEVEL = 6 |
60 |
> SUBLEVEL = 12 |
61 |
> - EXTRAVERSION = |
62 |
> NAME=Woozy Numbat |
63 |
> |
64 |
> # *DOCUMENTATION* |
65 |
> --- 1,7 ---- |
66 |
> VERSION = 2 |
67 |
> PATCHLEVEL = 6 |
68 |
> SUBLEVEL = 12 |
69 |
> + EXTRAVERSION = -RT-V0.7.51-11 |
70 |
> NAME=Woozy Numbat |
71 |
> |
72 |
> # *DOCUMENTATION* |
73 |
> |
74 |
> |
75 |
> drivers/video/console/fbcon.c.rej: |
76 |
> |
77 |
> *************** |
78 |
> *** 1092,1101 **** |
79 |
> struct display *p = &fb_display[vc->vc_num]; |
80 |
> struct fbcon_ops *ops = info->fbcon_par; |
81 |
> |
82 |
> - if (!fbcon_is_inactive(vc, info)) |
83 |
> ops->putcs(vc, info, s, count, real_y(p, ypos), xpos, |
84 |
> get_color(vc, info, scr_readw(s), 1), |
85 |
> get_color(vc, info, scr_readw(s), 0)); |
86 |
> } |
87 |
> |
88 |
> static void fbcon_putc(struct vc_data *vc, int c, int ypos, int xpos) |
89 |
> --- 1091,1101 ---- |
90 |
> struct display *p = &fb_display[vc->vc_num]; |
91 |
> struct fbcon_ops *ops = info->fbcon_par; |
92 |
> |
93 |
> + if (!fbcon_is_inactive(vc, info)) { |
94 |
> ops->putcs(vc, info, s, count, real_y(p, ypos), xpos, |
95 |
> get_color(vc, info, scr_readw(s), 1), |
96 |
> get_color(vc, info, scr_readw(s), 0)); |
97 |
> + } |
98 |
> } |
99 |
> |
100 |
> static void fbcon_putc(struct vc_data *vc, int c, int ypos, int xpos) |
101 |
> |
102 |
|
103 |
Regards Christian |
104 |
-- |
105 |
gentoo-user@g.o mailing list |