Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Robert Seaton <seatonr@××××××.edu>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/glentoo-overlay:master commit in: sys-kernel/glendix-sources/files/, sys-kernel/glendix-sources/
Date: Tue, 31 May 2011 03:12:36
Message-Id: 543a76a0155ae1018092e71404ecb84d4f410081.rps@gentoo
1 commit: 543a76a0155ae1018092e71404ecb84d4f410081
2 Author: Robert Seaton <seatonr <AT> dupage <DOT> edu>
3 AuthorDate: Tue May 31 03:11:23 2011 +0000
4 Commit: Robert Seaton <seatonr <AT> dupage <DOT> edu>
5 CommitDate: Tue May 31 03:11:23 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/glentoo-overlay.git;a=commit;h=543a76a0
7
8 tidy up ebuild
9
10 ---
11 sys-kernel/glendix-sources/Manifest | 6 +-
12 .../glendix-sources/files/glendix_2.6.31.6.patch | 96 ++++++++++----------
13 .../glendix-sources-2.6.31.6.ebuild | 7 +-
14 3 files changed, 55 insertions(+), 54 deletions(-)
15
16 diff --git a/sys-kernel/glendix-sources/Manifest b/sys-kernel/glendix-sources/Manifest
17 index ec8a1f7..74cacd0 100644
18 --- a/sys-kernel/glendix-sources/Manifest
19 +++ b/sys-kernel/glendix-sources/Manifest
20 @@ -1,4 +1,6 @@
21 -AUX glendix_2.6.31.6.patch 82384 RMD160 8876b7cc42cc6c45168d0b80600c6714f032bb11 SHA1 f61c1335898ad9fb95a664ac4642e156e8af4f6e SHA256 4d65fd4e194c3741a0b9c8485f2c876b9256a95753beda595a5263f3af025dcf
22 +AUX glendix_2.6.31.6.patch 81712 RMD160 b925557fb2318b4955561404c148d8581a2b45c0 SHA1 818ec43dad5de7346602891333d7761504f5ec19 SHA256 d14dea919c5b8ede67c8c59f221729639dae485b45dfe1576d6fcec67cee35ea
23 +DIST deblob-2.6.31 80819 RMD160 20972daf3852336198b5e1ac4f95a9d88f5d1d67 SHA1 41070a790894136913469bdcb3433b3d13b3e797 SHA256 4dce1f711d5098430f15ca0664ad3a1ad83a0ce6faf10d0dc8b8f53f2ab655f0
24 +DIST deblob-check-2.6.31 247608 RMD160 840bf8a229ea79810519eee6241edb85b78a6562 SHA1 d45a24eb16e5ac956c0fcddbc1ac4d67e326c7b8 SHA256 da1aecdf3ab7f1207b90642d303e52262ccc2ed9e49739b729512b88950d17f3
25 DIST linux-2.6.31.tar.bz2 61494822 RMD160 c0d88e63740abf0d4f9d82557260a31643f5a01b SHA1 c6e0e6b473ba2b80d164e37cfabf294e783c03d9 SHA256 0acd83f7b85db7ee18c2b0b7505e1ba6fd722c36f49a8870a831c851660e3512
26 DIST patch-2.6.31.6.bz2 135409 RMD160 8d7bd14f6c96de232b93c5e1294f475e2d0997e4 SHA1 ff0be7d382cd067b9f3ef49ec48728ef0f7c11a0 SHA256 f78dfe70133c4e7987d594579b85634abd412113632c21a7ded08d297e35a974
27 -EBUILD glendix-sources-2.6.31.6.ebuild 515 RMD160 a49fbf5e8cbc3e05bb534edefbe9c92eb274f569 SHA1 224ea68b6d4e966eb224720c14b0782451978c66 SHA256 de01de9fbb3d03f5aea33a6fcc4f76a21462fde8ffa42669c8043c2576eeba70
28 +EBUILD glendix-sources-2.6.31.6.ebuild 560 RMD160 2910e990fd1484dc9cb9a873967cf191cd90720d SHA1 81d3301c6512686de9b4fcec0361629e74e9bfc7 SHA256 ee4596e3fde94b78fa047fc0e84d5564826d56db73b171cbb90ec9259d469c30
29
30 diff --git a/sys-kernel/glendix-sources/files/glendix_2.6.31.6.patch b/sys-kernel/glendix-sources/files/glendix_2.6.31.6.patch
31 index cd3bec0..27b1dcb 100644
32 --- a/sys-kernel/glendix-sources/files/glendix_2.6.31.6.patch
33 +++ b/sys-kernel/glendix-sources/files/glendix_2.6.31.6.patch
34 @@ -1,6 +1,6 @@
35 -diff -Nur ../linux-2.6.31.6/arch/x86/include/asm/irq_vectors.h ./arch/x86/include/asm/irq_vectors.h
36 ---- linux-2.6.31.6/arch/x86/include/asm/irq_vectors.h 2009-11-10 01:32:31.000000000 +0100
37 -+++ linux-2.6.31.6/arch/x86/include/asm/irq_vectors.h 2009-11-27 08:51:39.000000000 +0100
38 +diff -Nur ./arch/x86/include/asm/irq_vectors.h ./arch/x86/include/asm/irq_vectors.h
39 +--- ./arch/x86/include/asm/irq_vectors.h 2009-11-10 01:32:31.000000000 +0100
40 ++++ ./arch/x86/include/asm/irq_vectors.h 2009-11-27 08:51:39.000000000 +0100
41 @@ -39,6 +39,7 @@
42 #else
43 # define IA32_SYSCALL_VECTOR 0x80
44 @@ -9,18 +9,18 @@ diff -Nur ../linux-2.6.31.6/arch/x86/include/asm/irq_vectors.h ./arch/x86/includ
45
46 /*
47 * Reserve the lowest usable priority level 0x20 - 0x2f for triggering
48 -diff -Nur ../linux-2.6.31.6/arch/x86/Kconfig ./arch/x86/Kconfig
49 ---- linux-2.6.31.6/arch/x86/Kconfig 2009-11-10 01:32:31.000000000 +0100
50 -+++ linux-2.6.31.6/arch/x86/Kconfig 2009-11-27 08:49:55.000000000 +0100
51 +diff -Nur ./arch/x86/Kconfig ./arch/x86/Kconfig
52 +--- ./arch/x86/Kconfig 2009-11-10 01:32:31.000000000 +0100
53 ++++ ./arch/x86/Kconfig 2009-11-27 08:49:55.000000000 +0100
54 @@ -2095,3 +2095,5 @@
55 source "arch/x86/kvm/Kconfig"
56
57 source "lib/Kconfig"
58 +
59 +source "plan9/Kconfig"
60 -diff -Nur ../linux-2.6.31.6/arch/x86/kernel/entry_32.S ./arch/x86/kernel/entry_32.S
61 ---- linux-2.6.31.6/arch/x86/kernel/entry_32.S 2009-11-10 01:32:31.000000000 +0100
62 -+++ linux-2.6.31.6/arch/x86/kernel/entry_32.S 2009-11-27 08:49:55.000000000 +0100
63 +diff -Nur ./arch/x86/kernel/entry_32.S ./arch/x86/kernel/entry_32.S
64 +--- ./arch/x86/kernel/entry_32.S 2009-11-10 01:32:31.000000000 +0100
65 ++++ ./arch/x86/kernel/entry_32.S 2009-11-27 08:49:55.000000000 +0100
66 @@ -513,6 +513,20 @@
67 PTGS_TO_GS_EX
68 ENDPROC(ia32_sysenter_target)
69 @@ -51,9 +51,9 @@ diff -Nur ../linux-2.6.31.6/arch/x86/kernel/entry_32.S ./arch/x86/kernel/entry_3
70 syscall_table_size=(.-sys_call_table)
71
72 /*
73 -diff -Nur ../linux-2.6.31.6/arch/x86/kernel/plan9_syscall_table.S ./arch/x86/kernel/plan9_syscall_table.S
74 ---- linux-2.6.31.6/arch/x86/kernel/plan9_syscall_table.S 1970-01-01 01:00:00.000000000 +0100
75 -+++ linux-2.6.31.6/arch/x86/kernel/plan9_syscall_table.S 2009-11-27 08:50:19.000000000 +0100
76 +diff -Nur ./arch/x86/kernel/plan9_syscall_table.S ./arch/x86/kernel/plan9_syscall_table.S
77 +--- ./arch/x86/kernel/plan9_syscall_table.S 1970-01-01 01:00:00.000000000 +0100
78 ++++ ./arch/x86/kernel/plan9_syscall_table.S 2009-11-27 08:50:19.000000000 +0100
79 @@ -0,0 +1,54 @@
80 +ENTRY(plan9_syscall_table)
81 + .long sys_plan9_unimplemented /* 0 */
82 @@ -109,9 +109,9 @@ diff -Nur ../linux-2.6.31.6/arch/x86/kernel/plan9_syscall_table.S ./arch/x86/ker
83 + .long sys_plan9_pread /* 50 */
84 + .long sys_plan9_pwrite
85 +END(plan9_syscall_table)
86 -diff -Nur ../linux-2.6.31.6/arch/x86/kernel/traps.c ./arch/x86/kernel/traps.c
87 ---- linux-2.6.31.6/arch/x86/kernel/traps.c 2009-11-10 01:32:31.000000000 +0100
88 -+++ linux-2.6.31.6/arch/x86/kernel/traps.c 2009-11-27 08:56:53.000000000 +0100
89 +diff -Nur ./arch/x86/kernel/traps.c ./arch/x86/kernel/traps.c
90 +--- ./arch/x86/kernel/traps.c 2009-11-10 01:32:31.000000000 +0100
91 ++++ ./arch/x86/kernel/traps.c 2009-11-27 08:56:53.000000000 +0100
92 @@ -67,6 +67,7 @@
93 #include <asm/traps.h>
94
95 @@ -131,9 +131,9 @@ diff -Nur ../linux-2.6.31.6/arch/x86/kernel/traps.c ./arch/x86/kernel/traps.c
96 #endif
97
98 /*
99 -diff -Nur ../linux-2.6.31.6/.config ./.config
100 ---- linux-2.6.31.6/.config 1970-01-01 01:00:00.000000000 +0100
101 -+++ linux-2.6.31.6/.config 2009-11-27 10:24:02.000000000 +0100
102 +diff -Nur ./.config ./.config
103 +--- ./.config 1970-01-01 01:00:00.000000000 +0100
104 ++++ ./.config 2009-11-27 10:24:02.000000000 +0100
105 @@ -0,0 +1,2184 @@
106 +#
107 +# Automatically generated make config: don't edit
108 @@ -2319,9 +2319,9 @@ diff -Nur ../linux-2.6.31.6/.config ./.config
109 +# Plan 9 support
110 +#
111 +CONFIG_BINFMT_PLAN9=y
112 -diff -Nur ../linux-2.6.31.6/Documentation/lguest/lguest.c ./Documentation/lguest/lguest.c
113 ---- linux-2.6.31.6/Documentation/lguest/lguest.c 2009-11-10 01:32:31.000000000 +0100
114 -+++ linux-2.6.31.6/Documentation/lguest/lguest.c 2009-11-27 10:21:54.000000000 +0100
115 +diff -Nur ./Documentation/lguest/lguest.c ./Documentation/lguest/lguest.c
116 +--- ./Documentation/lguest/lguest.c 2009-11-10 01:32:31.000000000 +0100
117 ++++ ./Documentation/lguest/lguest.c 2009-11-27 10:21:54.000000000 +0100
118 @@ -18,7 +18,6 @@
119 #include <sys/types.h>
120 #include <sys/stat.h>
121 @@ -2330,9 +2330,9 @@ diff -Nur ../linux-2.6.31.6/Documentation/lguest/lguest.c ./Documentation/lguest
122 #include <fcntl.h>
123 #include <stdbool.h>
124 #include <errno.h>
125 -diff -Nur ../linux-2.6.31.6/fs/binfmt_plan9.c ./fs/binfmt_plan9.c
126 ---- linux-2.6.31.6/fs/binfmt_plan9.c 1970-01-01 01:00:00.000000000 +0100
127 -+++ linux-2.6.31.6/fs/binfmt_plan9.c 2009-11-27 08:50:19.000000000 +0100
128 +diff -Nur ./fs/binfmt_plan9.c ./fs/binfmt_plan9.c
129 +--- ./fs/binfmt_plan9.c 1970-01-01 01:00:00.000000000 +0100
130 ++++ ./fs/binfmt_plan9.c 2009-11-27 08:50:19.000000000 +0100
131 @@ -0,0 +1,227 @@
132 +/*
133 + * Binary loader for Plan 9's a.out executable format
134 @@ -2561,9 +2561,9 @@ diff -Nur ../linux-2.6.31.6/fs/binfmt_plan9.c ./fs/binfmt_plan9.c
135 +MODULE_AUTHOR ("Anant Narayanan <anant@×××.in>");
136 +MODULE_DESCRIPTION ("Binary loader for Plan9's a.out executable format");
137 +
138 -diff -Nur ../linux-2.6.31.6/fs/binfmt_plan9.h ./fs/binfmt_plan9.h
139 ---- linux-2.6.31.6/fs/binfmt_plan9.h 1970-01-01 01:00:00.000000000 +0100
140 -+++ linux-2.6.31.6/fs/binfmt_plan9.h 2009-11-27 08:50:19.000000000 +0100
141 +diff -Nur ./fs/binfmt_plan9.h ./fs/binfmt_plan9.h
142 +--- ./fs/binfmt_plan9.h 1970-01-01 01:00:00.000000000 +0100
143 ++++ ./fs/binfmt_plan9.h 2009-11-27 08:50:19.000000000 +0100
144 @@ -0,0 +1,43 @@
145 +/*
146 + * Binary loader for Plan 9's a.out executable format
147 @@ -2608,9 +2608,9 @@ diff -Nur ../linux-2.6.31.6/fs/binfmt_plan9.h ./fs/binfmt_plan9.h
148 +#define TXT_ADDR(x) HDR_SIZE + x.text /* TEXT Address */
149 +#define DAT_ADDR(x) STR_ADDR + PAGE_ALIGN(TXT_ADDR(x)) /* DATA & BSS */
150 +
151 -diff -Nur ../linux-2.6.31.6/fs/Makefile ./fs/Makefile
152 ---- linux-2.6.31.6/fs/Makefile 2009-11-10 01:32:31.000000000 +0100
153 -+++ linux-2.6.31.6/fs/Makefile 2009-11-27 08:50:19.000000000 +0100
154 +diff -Nur ./fs/Makefile ./fs/Makefile
155 +--- ./fs/Makefile 2009-11-10 01:32:31.000000000 +0100
156 ++++ ./fs/Makefile 2009-11-27 08:50:19.000000000 +0100
157 @@ -37,6 +37,8 @@
158 obj-$(CONFIG_BINFMT_EM86) += binfmt_em86.o
159 obj-$(CONFIG_BINFMT_MISC) += binfmt_misc.o
160 @@ -2620,9 +2620,9 @@ diff -Nur ../linux-2.6.31.6/fs/Makefile ./fs/Makefile
161 # binfmt_script is always there
162 obj-y += binfmt_script.o
163
164 -diff -Nur ../linux-2.6.31.6/Makefile ./Makefile
165 ---- linux-2.6.31.6/Makefile 2009-11-10 01:32:31.000000000 +0100
166 -+++ linux-2.6.31.6/Makefile 2009-11-27 08:50:19.000000000 +0100
167 +diff -Nur ./Makefile ./Makefile
168 +--- ./Makefile 2009-11-10 01:32:31.000000000 +0100
169 ++++ ./Makefile 2009-11-27 08:50:19.000000000 +0100
170 @@ -639,7 +639,7 @@
171
172
173 @@ -2632,9 +2632,9 @@ diff -Nur ../linux-2.6.31.6/Makefile ./Makefile
174
175 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
176 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
177 -diff -Nur ../linux-2.6.31.6/plan9/devcons.c ./plan9/devcons.c
178 ---- linux-2.6.31.6/plan9/devcons.c 1970-01-01 01:00:00.000000000 +0100
179 -+++ linux-2.6.31.6/plan9/devcons.c 2009-11-27 08:50:19.000000000 +0100
180 +diff -Nur ./plan9/devcons.c ./plan9/devcons.c
181 +--- ./plan9/devcons.c 1970-01-01 01:00:00.000000000 +0100
182 ++++ ./plan9/devcons.c 2009-11-27 08:50:19.000000000 +0100
183 @@ -0,0 +1,65 @@
184 +/**
185 + * Plan 9 '#c' emulation.
186 @@ -2701,9 +2701,9 @@ diff -Nur ../linux-2.6.31.6/plan9/devcons.c ./plan9/devcons.c
187 +
188 +module_init(cons_init);
189 +module_exit(cons_exit);
190 -diff -Nur ../linux-2.6.31.6/plan9/Kconfig ./plan9/Kconfig
191 ---- linux-2.6.31.6/plan9/Kconfig 1970-01-01 01:00:00.000000000 +0100
192 -+++ linux-2.6.31.6/plan9/Kconfig 2009-11-27 08:50:19.000000000 +0100
193 +diff -Nur ./plan9/Kconfig ./plan9/Kconfig
194 +--- ./plan9/Kconfig 1970-01-01 01:00:00.000000000 +0100
195 ++++ ./plan9/Kconfig 2009-11-27 08:50:19.000000000 +0100
196 @@ -0,0 +1,8 @@
197 +menu "Plan 9 support"
198 +
199 @@ -2713,9 +2713,9 @@ diff -Nur ../linux-2.6.31.6/plan9/Kconfig ./plan9/Kconfig
200 + This will compile support for Plan 9 a.out (to be used with Glendix)
201 +
202 +endmenu
203 -diff -Nur ../linux-2.6.31.6/plan9/Makefile ./plan9/Makefile
204 ---- linux-2.6.31.6/plan9/Makefile 1970-01-01 01:00:00.000000000 +0100
205 -+++ linux-2.6.31.6/plan9/Makefile 2009-11-27 08:50:19.000000000 +0100
206 +diff -Nur ./plan9/Makefile ./plan9/Makefile
207 +--- ./plan9/Makefile 1970-01-01 01:00:00.000000000 +0100
208 ++++ ./plan9/Makefile 2009-11-27 08:50:19.000000000 +0100
209 @@ -0,0 +1,8 @@
210 +#
211 +# Makefile for Plan 9 system support
212 @@ -2725,9 +2725,9 @@ diff -Nur ../linux-2.6.31.6/plan9/Makefile ./plan9/Makefile
213 +
214 +obj-$(CONFIG_BINFMT_PLAN9) += syscalls.o devcons.o
215 +
216 -diff -Nur ../linux-2.6.31.6/plan9/p9_constants.h ./plan9/p9_constants.h
217 ---- linux-2.6.31.6/plan9/p9_constants.h 1970-01-01 01:00:00.000000000 +0100
218 -+++ linux-2.6.31.6/plan9/p9_constants.h 2009-11-27 08:50:19.000000000 +0100
219 +diff -Nur ./plan9/p9_constants.h ./plan9/p9_constants.h
220 +--- ./plan9/p9_constants.h 1970-01-01 01:00:00.000000000 +0100
221 ++++ ./plan9/p9_constants.h 2009-11-27 08:50:19.000000000 +0100
222 @@ -0,0 +1,18 @@
223 +/*
224 + * Plan 9 constants
225 @@ -2747,9 +2747,9 @@ diff -Nur ../linux-2.6.31.6/plan9/p9_constants.h ./plan9/p9_constants.h
226 +#define RFREND 8192
227 +#define RFNOMNT 16384
228 +
229 -diff -Nur ../linux-2.6.31.6/plan9/syscalls.c ./plan9/syscalls.c
230 ---- linux-2.6.31.6/plan9/syscalls.c 1970-01-01 01:00:00.000000000 +0100
231 -+++ linux-2.6.31.6/plan9/syscalls.c 2009-11-27 09:50:45.000000000 +0100
232 +diff -Nur ./plan9/syscalls.c ./plan9/syscalls.c
233 +--- ./plan9/syscalls.c 1970-01-01 01:00:00.000000000 +0100
234 ++++ ./plan9/syscalls.c 2009-11-27 09:50:45.000000000 +0100
235 @@ -0,0 +1,378 @@
236 +/*
237 + * Copyright (C) 2008 Anant Narayanan <anant@×××.in>
238
239 diff --git a/sys-kernel/glendix-sources/glendix-sources-2.6.31.6.ebuild b/sys-kernel/glendix-sources/glendix-sources-2.6.31.6.ebuild
240 index ea74d6d..5e5fcf1 100644
241 --- a/sys-kernel/glendix-sources/glendix-sources-2.6.31.6.ebuild
242 +++ b/sys-kernel/glendix-sources/glendix-sources-2.6.31.6.ebuild
243 @@ -9,14 +9,13 @@ ETYPE="sources"
244 inherit kernel-2
245 detect_version
246
247 -DESCRIPTION="Patched sources for the Linux kernel with experimental Plan9 support."
248 -HOMEPAGE="http://www.kernel.org"
249 +DESCRIPTION="Patched sources for the Linux kernel with experimental support for programs from the Plan 9 From Bell Labs research operating system."
250 +HOMEPAGE="http://www.glendix.org http://www.kernel.org"
251 SRC_URI="${KERNEL_URI}"
252
253 KEYWORDS="x86"
254 IUSE="deblob"
255
256 src_prepare() {
257 - # Applying Glendix patch...
258 - epatch "${FILESDIR}/glendix_2.6.31.6.patch"
259 + epatch "${FILESDIR}/glendix_${PV}.patch"
260 }
261 \ No newline at end of file
Report Message
Find on MARC Find on Google Groups