From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QRFNk-0005bq-4e for garchives@archives.gentoo.org; Tue, 31 May 2011 03:12:36 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4A8021C00F; Tue, 31 May 2011 03:12:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E35A01C00F for ; Tue, 31 May 2011 03:12:28 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 679EA1B4006 for ; Tue, 31 May 2011 03:12:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id BA1E680508 for ; Tue, 31 May 2011 03:12:27 +0000 (UTC) From: "Robert Seaton" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robert Seaton" Message-ID: <543a76a0155ae1018092e71404ecb84d4f410081.rps@gentoo> Subject: [gentoo-commits] proj/glentoo-overlay:master commit in: sys-kernel/glendix-sources/files/, sys-kernel/glendix-sources/ X-VCS-Repository: proj/glentoo-overlay X-VCS-Files: sys-kernel/glendix-sources/Manifest sys-kernel/glendix-sources/files/glendix_2.6.31.6.patch sys-kernel/glendix-sources/glendix-sources-2.6.31.6.ebuild X-VCS-Directories: sys-kernel/glendix-sources/files/ sys-kernel/glendix-sources/ X-VCS-Committer: rps X-VCS-Committer-Name: Robert Seaton X-VCS-Revision: 543a76a0155ae1018092e71404ecb84d4f410081 Date: Tue, 31 May 2011 03:12:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: e063cc7f7fd621b00046eb0457a5da41 commit: 543a76a0155ae1018092e71404ecb84d4f410081 Author: Robert Seaton dupage edu> AuthorDate: Tue May 31 03:11:23 2011 +0000 Commit: Robert Seaton dupage edu> CommitDate: Tue May 31 03:11:23 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/glentoo-overl= ay.git;a=3Dcommit;h=3D543a76a0 tidy up ebuild --- sys-kernel/glendix-sources/Manifest | 6 +- .../glendix-sources/files/glendix_2.6.31.6.patch | 96 ++++++++++----= ------ .../glendix-sources-2.6.31.6.ebuild | 7 +- 3 files changed, 55 insertions(+), 54 deletions(-) diff --git a/sys-kernel/glendix-sources/Manifest b/sys-kernel/glendix-sou= rces/Manifest index ec8a1f7..74cacd0 100644 --- a/sys-kernel/glendix-sources/Manifest +++ b/sys-kernel/glendix-sources/Manifest @@ -1,4 +1,6 @@ -AUX glendix_2.6.31.6.patch 82384 RMD160 8876b7cc42cc6c45168d0b80600c6714= f032bb11 SHA1 f61c1335898ad9fb95a664ac4642e156e8af4f6e SHA256 4d65fd4e194= c3741a0b9c8485f2c876b9256a95753beda595a5263f3af025dcf +AUX glendix_2.6.31.6.patch 81712 RMD160 b925557fb2318b4955561404c148d858= 1a2b45c0 SHA1 818ec43dad5de7346602891333d7761504f5ec19 SHA256 d14dea919c5= b8ede67c8c59f221729639dae485b45dfe1576d6fcec67cee35ea +DIST deblob-2.6.31 80819 RMD160 20972daf3852336198b5e1ac4f95a9d88f5d1d67= SHA1 41070a790894136913469bdcb3433b3d13b3e797 SHA256 4dce1f711d5098430f1= 5ca0664ad3a1ad83a0ce6faf10d0dc8b8f53f2ab655f0 +DIST deblob-check-2.6.31 247608 RMD160 840bf8a229ea79810519eee6241edb85b= 78a6562 SHA1 d45a24eb16e5ac956c0fcddbc1ac4d67e326c7b8 SHA256 da1aecdf3ab7= f1207b90642d303e52262ccc2ed9e49739b729512b88950d17f3 DIST linux-2.6.31.tar.bz2 61494822 RMD160 c0d88e63740abf0d4f9d82557260a3= 1643f5a01b SHA1 c6e0e6b473ba2b80d164e37cfabf294e783c03d9 SHA256 0acd83f7b= 85db7ee18c2b0b7505e1ba6fd722c36f49a8870a831c851660e3512 DIST patch-2.6.31.6.bz2 135409 RMD160 8d7bd14f6c96de232b93c5e1294f475e2d= 0997e4 SHA1 ff0be7d382cd067b9f3ef49ec48728ef0f7c11a0 SHA256 f78dfe70133c4= e7987d594579b85634abd412113632c21a7ded08d297e35a974 -EBUILD glendix-sources-2.6.31.6.ebuild 515 RMD160 a49fbf5e8cbc3e05bb534e= defbe9c92eb274f569 SHA1 224ea68b6d4e966eb224720c14b0782451978c66 SHA256 d= e01de9fbb3d03f5aea33a6fcc4f76a21462fde8ffa42669c8043c2576eeba70 +EBUILD glendix-sources-2.6.31.6.ebuild 560 RMD160 2910e990fd1484dc9cb9a8= 73967cf191cd90720d SHA1 81d3301c6512686de9b4fcec0361629e74e9bfc7 SHA256 e= e4596e3fde94b78fa047fc0e84d5564826d56db73b171cbb90ec9259d469c30 diff --git a/sys-kernel/glendix-sources/files/glendix_2.6.31.6.patch b/sy= s-kernel/glendix-sources/files/glendix_2.6.31.6.patch index cd3bec0..27b1dcb 100644 --- a/sys-kernel/glendix-sources/files/glendix_2.6.31.6.patch +++ b/sys-kernel/glendix-sources/files/glendix_2.6.31.6.patch @@ -1,6 +1,6 @@ -diff -Nur ../linux-2.6.31.6/arch/x86/include/asm/irq_vectors.h ./arch/x8= 6/include/asm/irq_vectors.h ---- linux-2.6.31.6/arch/x86/include/asm/irq_vectors.h 2009-11-10 01:32:3= 1.000000000 +0100 -+++ linux-2.6.31.6/arch/x86/include/asm/irq_vectors.h 2009-11-27 08:51:3= 9.000000000 +0100 +diff -Nur ./arch/x86/include/asm/irq_vectors.h ./arch/x86/include/asm/ir= q_vectors.h +--- ./arch/x86/include/asm/irq_vectors.h 2009-11-10 01:32:31.000000000 += 0100 ++++ ./arch/x86/include/asm/irq_vectors.h 2009-11-27 08:51:39.000000000 += 0100 @@ -39,6 +39,7 @@ #else # define IA32_SYSCALL_VECTOR 0x80 @@ -9,18 +9,18 @@ diff -Nur ../linux-2.6.31.6/arch/x86/include/asm/irq_ve= ctors.h ./arch/x86/includ =20 /* * Reserve the lowest usable priority level 0x20 - 0x2f for triggering -diff -Nur ../linux-2.6.31.6/arch/x86/Kconfig ./arch/x86/Kconfig ---- linux-2.6.31.6/arch/x86/Kconfig 2009-11-10 01:32:31.000000000 +0100 -+++ linux-2.6.31.6/arch/x86/Kconfig 2009-11-27 08:49:55.000000000 +0100 +diff -Nur ./arch/x86/Kconfig ./arch/x86/Kconfig +--- ./arch/x86/Kconfig 2009-11-10 01:32:31.000000000 +0100 ++++ ./arch/x86/Kconfig 2009-11-27 08:49:55.000000000 +0100 @@ -2095,3 +2095,5 @@ source "arch/x86/kvm/Kconfig" =20 source "lib/Kconfig" + +source "plan9/Kconfig" -diff -Nur ../linux-2.6.31.6/arch/x86/kernel/entry_32.S ./arch/x86/kernel= /entry_32.S ---- linux-2.6.31.6/arch/x86/kernel/entry_32.S 2009-11-10 01:32:31.000000= 000 +0100 -+++ linux-2.6.31.6/arch/x86/kernel/entry_32.S 2009-11-27 08:49:55.000000= 000 +0100 +diff -Nur ./arch/x86/kernel/entry_32.S ./arch/x86/kernel/entry_32.S +--- ./arch/x86/kernel/entry_32.S 2009-11-10 01:32:31.000000000 +0100 ++++ ./arch/x86/kernel/entry_32.S 2009-11-27 08:49:55.000000000 +0100 @@ -513,6 +513,20 @@ PTGS_TO_GS_EX ENDPROC(ia32_sysenter_target) @@ -51,9 +51,9 @@ diff -Nur ../linux-2.6.31.6/arch/x86/kernel/entry_32.S = ./arch/x86/kernel/entry_3 syscall_table_size=3D(.-sys_call_table) =20 /* -diff -Nur ../linux-2.6.31.6/arch/x86/kernel/plan9_syscall_table.S ./arch= /x86/kernel/plan9_syscall_table.S ---- linux-2.6.31.6/arch/x86/kernel/plan9_syscall_table.S 1970-01-01 01:0= 0:00.000000000 +0100 -+++ linux-2.6.31.6/arch/x86/kernel/plan9_syscall_table.S 2009-11-27 08:5= 0:19.000000000 +0100 +diff -Nur ./arch/x86/kernel/plan9_syscall_table.S ./arch/x86/kernel/plan= 9_syscall_table.S +--- ./arch/x86/kernel/plan9_syscall_table.S 1970-01-01 01:00:00.00000000= 0 +0100 ++++ ./arch/x86/kernel/plan9_syscall_table.S 2009-11-27 08:50:19.00000000= 0 +0100 @@ -0,0 +1,54 @@ +ENTRY(plan9_syscall_table) + .long sys_plan9_unimplemented /* 0 */ @@ -109,9 +109,9 @@ diff -Nur ../linux-2.6.31.6/arch/x86/kernel/plan9_sys= call_table.S ./arch/x86/ker + .long sys_plan9_pread /* 50 */ + .long sys_plan9_pwrite +END(plan9_syscall_table) -diff -Nur ../linux-2.6.31.6/arch/x86/kernel/traps.c ./arch/x86/kernel/tr= aps.c ---- linux-2.6.31.6/arch/x86/kernel/traps.c 2009-11-10 01:32:31.000000000= +0100 -+++ linux-2.6.31.6/arch/x86/kernel/traps.c 2009-11-27 08:56:53.000000000= +0100 +diff -Nur ./arch/x86/kernel/traps.c ./arch/x86/kernel/traps.c +--- ./arch/x86/kernel/traps.c 2009-11-10 01:32:31.000000000 +0100 ++++ ./arch/x86/kernel/traps.c 2009-11-27 08:56:53.000000000 +0100 @@ -67,6 +67,7 @@ #include =20 @@ -131,9 +131,9 @@ diff -Nur ../linux-2.6.31.6/arch/x86/kernel/traps.c .= /arch/x86/kernel/traps.c #endif =20 /* -diff -Nur ../linux-2.6.31.6/.config ./.config ---- linux-2.6.31.6/.config 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.6/.config 2009-11-27 10:24:02.000000000 +0100 +diff -Nur ./.config ./.config +--- ./.config 1970-01-01 01:00:00.000000000 +0100 ++++ ./.config 2009-11-27 10:24:02.000000000 +0100 @@ -0,0 +1,2184 @@ +# +# Automatically generated make config: don't edit @@ -2319,9 +2319,9 @@ diff -Nur ../linux-2.6.31.6/.config ./.config +# Plan 9 support +# +CONFIG_BINFMT_PLAN9=3Dy -diff -Nur ../linux-2.6.31.6/Documentation/lguest/lguest.c ./Documentatio= n/lguest/lguest.c ---- linux-2.6.31.6/Documentation/lguest/lguest.c 2009-11-10 01:32:31.000= 000000 +0100 -+++ linux-2.6.31.6/Documentation/lguest/lguest.c 2009-11-27 10:21:54.000= 000000 +0100 +diff -Nur ./Documentation/lguest/lguest.c ./Documentation/lguest/lguest.= c +--- ./Documentation/lguest/lguest.c 2009-11-10 01:32:31.000000000 +0100 ++++ ./Documentation/lguest/lguest.c 2009-11-27 10:21:54.000000000 +0100 @@ -18,7 +18,6 @@ #include #include @@ -2330,9 +2330,9 @@ diff -Nur ../linux-2.6.31.6/Documentation/lguest/lg= uest.c ./Documentation/lguest #include #include #include -diff -Nur ../linux-2.6.31.6/fs/binfmt_plan9.c ./fs/binfmt_plan9.c ---- linux-2.6.31.6/fs/binfmt_plan9.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.6/fs/binfmt_plan9.c 2009-11-27 08:50:19.000000000 +0100 +diff -Nur ./fs/binfmt_plan9.c ./fs/binfmt_plan9.c +--- ./fs/binfmt_plan9.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./fs/binfmt_plan9.c 2009-11-27 08:50:19.000000000 +0100 @@ -0,0 +1,227 @@ +/* + * Binary loader for Plan 9's a.out executable format @@ -2561,9 +2561,9 @@ diff -Nur ../linux-2.6.31.6/fs/binfmt_plan9.c ./fs/= binfmt_plan9.c +MODULE_AUTHOR ("Anant Narayanan "); +MODULE_DESCRIPTION ("Binary loader for Plan9's a.out executable format"= ); + -diff -Nur ../linux-2.6.31.6/fs/binfmt_plan9.h ./fs/binfmt_plan9.h ---- linux-2.6.31.6/fs/binfmt_plan9.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.6/fs/binfmt_plan9.h 2009-11-27 08:50:19.000000000 +0100 +diff -Nur ./fs/binfmt_plan9.h ./fs/binfmt_plan9.h +--- ./fs/binfmt_plan9.h 1970-01-01 01:00:00.000000000 +0100 ++++ ./fs/binfmt_plan9.h 2009-11-27 08:50:19.000000000 +0100 @@ -0,0 +1,43 @@ +/* + * Binary loader for Plan 9's a.out executable format @@ -2608,9 +2608,9 @@ diff -Nur ../linux-2.6.31.6/fs/binfmt_plan9.h ./fs/= binfmt_plan9.h +#define TXT_ADDR(x) HDR_SIZE + x.text /* TEXT Address */ +#define DAT_ADDR(x) STR_ADDR + PAGE_ALIGN(TXT_ADDR(x)) /* DATA & BSS */ + -diff -Nur ../linux-2.6.31.6/fs/Makefile ./fs/Makefile ---- linux-2.6.31.6/fs/Makefile 2009-11-10 01:32:31.000000000 +0100 -+++ linux-2.6.31.6/fs/Makefile 2009-11-27 08:50:19.000000000 +0100 +diff -Nur ./fs/Makefile ./fs/Makefile +--- ./fs/Makefile 2009-11-10 01:32:31.000000000 +0100 ++++ ./fs/Makefile 2009-11-27 08:50:19.000000000 +0100 @@ -37,6 +37,8 @@ obj-$(CONFIG_BINFMT_EM86) +=3D binfmt_em86.o obj-$(CONFIG_BINFMT_MISC) +=3D binfmt_misc.o @@ -2620,9 +2620,9 @@ diff -Nur ../linux-2.6.31.6/fs/Makefile ./fs/Makefi= le # binfmt_script is always there obj-y +=3D binfmt_script.o =20 -diff -Nur ../linux-2.6.31.6/Makefile ./Makefile ---- linux-2.6.31.6/Makefile 2009-11-10 01:32:31.000000000 +0100 -+++ linux-2.6.31.6/Makefile 2009-11-27 08:50:19.000000000 +0100 +diff -Nur ./Makefile ./Makefile +--- ./Makefile 2009-11-10 01:32:31.000000000 +0100 ++++ ./Makefile 2009-11-27 08:50:19.000000000 +0100 @@ -639,7 +639,7 @@ =20 =20 @@ -2632,9 +2632,9 @@ diff -Nur ../linux-2.6.31.6/Makefile ./Makefile =20 vmlinux-dirs :=3D $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ -diff -Nur ../linux-2.6.31.6/plan9/devcons.c ./plan9/devcons.c ---- linux-2.6.31.6/plan9/devcons.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.6/plan9/devcons.c 2009-11-27 08:50:19.000000000 +0100 +diff -Nur ./plan9/devcons.c ./plan9/devcons.c +--- ./plan9/devcons.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./plan9/devcons.c 2009-11-27 08:50:19.000000000 +0100 @@ -0,0 +1,65 @@ +/** + * Plan 9 '#c' emulation. @@ -2701,9 +2701,9 @@ diff -Nur ../linux-2.6.31.6/plan9/devcons.c ./plan9= /devcons.c + +module_init(cons_init); +module_exit(cons_exit); -diff -Nur ../linux-2.6.31.6/plan9/Kconfig ./plan9/Kconfig ---- linux-2.6.31.6/plan9/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.6/plan9/Kconfig 2009-11-27 08:50:19.000000000 +0100 +diff -Nur ./plan9/Kconfig ./plan9/Kconfig +--- ./plan9/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ ./plan9/Kconfig 2009-11-27 08:50:19.000000000 +0100 @@ -0,0 +1,8 @@ +menu "Plan 9 support" + @@ -2713,9 +2713,9 @@ diff -Nur ../linux-2.6.31.6/plan9/Kconfig ./plan9/K= config + This will compile support for Plan 9 a.out (to be used with Glendix) + +endmenu -diff -Nur ../linux-2.6.31.6/plan9/Makefile ./plan9/Makefile ---- linux-2.6.31.6/plan9/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.6/plan9/Makefile 2009-11-27 08:50:19.000000000 +0100 +diff -Nur ./plan9/Makefile ./plan9/Makefile +--- ./plan9/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ ./plan9/Makefile 2009-11-27 08:50:19.000000000 +0100 @@ -0,0 +1,8 @@ +# +# Makefile for Plan 9 system support @@ -2725,9 +2725,9 @@ diff -Nur ../linux-2.6.31.6/plan9/Makefile ./plan9/= Makefile + +obj-$(CONFIG_BINFMT_PLAN9) +=3D syscalls.o devcons.o + -diff -Nur ../linux-2.6.31.6/plan9/p9_constants.h ./plan9/p9_constants.h ---- linux-2.6.31.6/plan9/p9_constants.h 1970-01-01 01:00:00.000000000 +0= 100 -+++ linux-2.6.31.6/plan9/p9_constants.h 2009-11-27 08:50:19.000000000 +0= 100 +diff -Nur ./plan9/p9_constants.h ./plan9/p9_constants.h +--- ./plan9/p9_constants.h 1970-01-01 01:00:00.000000000 +0100 ++++ ./plan9/p9_constants.h 2009-11-27 08:50:19.000000000 +0100 @@ -0,0 +1,18 @@ +/* + * Plan 9 constants @@ -2747,9 +2747,9 @@ diff -Nur ../linux-2.6.31.6/plan9/p9_constants.h ./= plan9/p9_constants.h +#define RFREND 8192 +#define RFNOMNT 16384 + -diff -Nur ../linux-2.6.31.6/plan9/syscalls.c ./plan9/syscalls.c ---- linux-2.6.31.6/plan9/syscalls.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.6/plan9/syscalls.c 2009-11-27 09:50:45.000000000 +0100 +diff -Nur ./plan9/syscalls.c ./plan9/syscalls.c +--- ./plan9/syscalls.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./plan9/syscalls.c 2009-11-27 09:50:45.000000000 +0100 @@ -0,0 +1,378 @@ +/* + * Copyright (C) 2008 Anant Narayanan 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 index ea74d6d..5e5fcf1 100644 --- a/sys-kernel/glendix-sources/glendix-sources-2.6.31.6.ebuild +++ b/sys-kernel/glendix-sources/glendix-sources-2.6.31.6.ebuild @@ -9,14 +9,13 @@ ETYPE=3D"sources" inherit kernel-2 detect_version =20 -DESCRIPTION=3D"Patched sources for the Linux kernel with experimental Pl= an9 support." -HOMEPAGE=3D"http://www.kernel.org" +DESCRIPTION=3D"Patched sources for the Linux kernel with experimental su= pport for programs from the Plan 9 From Bell Labs research operating sy= stem." +HOMEPAGE=3D"http://www.glendix.org http://www.kernel.org" SRC_URI=3D"${KERNEL_URI}" =20 KEYWORDS=3D"x86" IUSE=3D"deblob" =20 src_prepare() { - # Applying Glendix patch... - epatch "${FILESDIR}/glendix_2.6.31.6.patch"=20 + epatch "${FILESDIR}/glendix_${PV}.patch" } \ No newline at end of file