From 6eb08ba5aed6668a5932de800fccd8de35b9bdb0 Mon Sep 17 00:00:00 2001 From: Robert Seaton Date: Thu, 2 Jun 2011 12:02:13 -0500 Subject: Modified patch to match the style of the official patches to the Linux kernel. --- 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-sources/Manifest index ec8a1f7..5782049 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 8876b7cc42cc6c45168d0b80600c6714f032bb11 SHA1 f61c1335898ad9fb95a664ac4642e156e8af4f6e SHA256 4d65fd4e194c3741a0b9c8485f2c876b9256a95753beda595a5263f3af025dcf +AUX glendix_2.6.31.6.patch 81712 RMD160 6da3cda1eb720088d6523f116c08bc4071f56a0a SHA1 1ca6418f0cce58f9f4b6e2fabfac6ec51b55cd5f SHA256 84af323f547ac4dbba57748f23702d2b3038d9788fbbec34967f651abeeab0d8 +DIST deblob-2.6.31 80819 RMD160 20972daf3852336198b5e1ac4f95a9d88f5d1d67 SHA1 41070a790894136913469bdcb3433b3d13b3e797 SHA256 4dce1f711d5098430f15ca0664ad3a1ad83a0ce6faf10d0dc8b8f53f2ab655f0 +DIST deblob-check-2.6.31 247608 RMD160 840bf8a229ea79810519eee6241edb85b78a6562 SHA1 d45a24eb16e5ac956c0fcddbc1ac4d67e326c7b8 SHA256 da1aecdf3ab7f1207b90642d303e52262ccc2ed9e49739b729512b88950d17f3 DIST linux-2.6.31.tar.bz2 61494822 RMD160 c0d88e63740abf0d4f9d82557260a31643f5a01b SHA1 c6e0e6b473ba2b80d164e37cfabf294e783c03d9 SHA256 0acd83f7b85db7ee18c2b0b7505e1ba6fd722c36f49a8870a831c851660e3512 DIST patch-2.6.31.6.bz2 135409 RMD160 8d7bd14f6c96de232b93c5e1294f475e2d0997e4 SHA1 ff0be7d382cd067b9f3ef49ec48728ef0f7c11a0 SHA256 f78dfe70133c4e7987d594579b85634abd412113632c21a7ded08d297e35a974 -EBUILD glendix-sources-2.6.31.6.ebuild 515 RMD160 a49fbf5e8cbc3e05bb534edefbe9c92eb274f569 SHA1 224ea68b6d4e966eb224720c14b0782451978c66 SHA256 de01de9fbb3d03f5aea33a6fcc4f76a21462fde8ffa42669c8043c2576eeba70 +EBUILD glendix-sources-2.6.31.6.ebuild 560 RMD160 2910e990fd1484dc9cb9a873967cf191cd90720d SHA1 81d3301c6512686de9b4fcec0361629e74e9bfc7 SHA256 ee4596e3fde94b78fa047fc0e84d5564826d56db73b171cbb90ec9259d469c30 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 index cd3bec0..ad6089d 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/x86/include/asm/irq_vectors.h ---- linux-2.6.31.6/arch/x86/include/asm/irq_vectors.h 2009-11-10 01:32:31.000000000 +0100 -+++ linux-2.6.31.6/arch/x86/include/asm/irq_vectors.h 2009-11-27 08:51:39.000000000 +0100 +diff -Nur a/arch/x86/include/asm/irq_vectors.h b/arch/x86/include/asm/irq_vectors.h +--- a/arch/x86/include/asm/irq_vectors.h 2009-11-10 01:32:31.000000000 +0100 ++++ b/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_vectors.h ./arch/x86/includ /* * 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 a/arch/x86/Kconfig b/arch/x86/Kconfig +--- a/arch/x86/Kconfig 2009-11-10 01:32:31.000000000 +0100 ++++ b/arch/x86/Kconfig 2009-11-27 08:49:55.000000000 +0100 @@ -2095,3 +2095,5 @@ source "arch/x86/kvm/Kconfig" 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.000000000 +0100 -+++ linux-2.6.31.6/arch/x86/kernel/entry_32.S 2009-11-27 08:49:55.000000000 +0100 +diff -Nur a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S +--- a/arch/x86/kernel/entry_32.S 2009-11-10 01:32:31.000000000 +0100 ++++ b/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=(.-sys_call_table) /* -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:00:00.000000000 +0100 -+++ linux-2.6.31.6/arch/x86/kernel/plan9_syscall_table.S 2009-11-27 08:50:19.000000000 +0100 +diff -Nur a/arch/x86/kernel/plan9_syscall_table.S b/arch/x86/kernel/plan9_syscall_table.S +--- a/arch/x86/kernel/plan9_syscall_table.S 1970-01-01 01:00:00.000000000 +0100 ++++ b/arch/x86/kernel/plan9_syscall_table.S 2009-11-27 08:50:19.000000000 +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_syscall_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/traps.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 a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c +--- a/arch/x86/kernel/traps.c 2009-11-10 01:32:31.000000000 +0100 ++++ b/arch/x86/kernel/traps.c 2009-11-27 08:56:53.000000000 +0100 @@ -67,6 +67,7 @@ #include @@ -131,9 +131,9 @@ diff -Nur ../linux-2.6.31.6/arch/x86/kernel/traps.c ./arch/x86/kernel/traps.c #endif /* -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 a/.config b/.config +--- a/.config 1970-01-01 01:00:00.000000000 +0100 ++++ b/.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=y -diff -Nur ../linux-2.6.31.6/Documentation/lguest/lguest.c ./Documentation/lguest/lguest.c ---- linux-2.6.31.6/Documentation/lguest/lguest.c 2009-11-10 01:32:31.000000000 +0100 -+++ linux-2.6.31.6/Documentation/lguest/lguest.c 2009-11-27 10:21:54.000000000 +0100 +diff -Nur a/Documentation/lguest/lguest.c b/Documentation/lguest/lguest.c +--- a/Documentation/lguest/lguest.c 2009-11-10 01:32:31.000000000 +0100 ++++ b/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/lguest.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 a/fs/binfmt_plan9.c b/fs/binfmt_plan9.c +--- a/fs/binfmt_plan9.c 1970-01-01 01:00:00.000000000 +0100 ++++ b/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 a/fs/binfmt_plan9.h b/fs/binfmt_plan9.h +--- a/fs/binfmt_plan9.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/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 a/fs/Makefile b/fs/Makefile +--- a/fs/Makefile 2009-11-10 01:32:31.000000000 +0100 ++++ b/fs/Makefile 2009-11-27 08:50:19.000000000 +0100 @@ -37,6 +37,8 @@ obj-$(CONFIG_BINFMT_EM86) += binfmt_em86.o obj-$(CONFIG_BINFMT_MISC) += binfmt_misc.o @@ -2620,9 +2620,9 @@ diff -Nur ../linux-2.6.31.6/fs/Makefile ./fs/Makefile # binfmt_script is always there obj-y += binfmt_script.o -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 a/Makefile b/Makefile +--- a/Makefile 2009-11-10 01:32:31.000000000 +0100 ++++ b/Makefile 2009-11-27 08:50:19.000000000 +0100 @@ -639,7 +639,7 @@ @@ -2632,9 +2632,9 @@ diff -Nur ../linux-2.6.31.6/Makefile ./Makefile vmlinux-dirs := $(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 a/plan9/devcons.c b/plan9/devcons.c +--- a/plan9/devcons.c 1970-01-01 01:00:00.000000000 +0100 ++++ b/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 a/plan9/Kconfig b/plan9/Kconfig +--- a/plan9/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ b/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/Kconfig + 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 a/plan9/Makefile b/plan9/Makefile +--- a/plan9/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ b/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) += 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 +0100 -+++ linux-2.6.31.6/plan9/p9_constants.h 2009-11-27 08:50:19.000000000 +0100 +diff -Nur a/plan9/p9_constants.h b/plan9/p9_constants.h +--- a/plan9/p9_constants.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/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 a/plan9/syscalls.c b/plan9/syscalls.c +--- a/plan9/syscalls.c 1970-01-01 01:00:00.000000000 +0100 ++++ b/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="sources" inherit kernel-2 detect_version -DESCRIPTION="Patched sources for the Linux kernel with experimental Plan9 support." -HOMEPAGE="http://www.kernel.org" +DESCRIPTION="Patched sources for the Linux kernel with experimental support for programs from the Plan 9 From Bell Labs research operating system." +HOMEPAGE="http://www.glendix.org http://www.kernel.org" SRC_URI="${KERNEL_URI}" KEYWORDS="x86" IUSE="deblob" src_prepare() { - # Applying Glendix patch... - epatch "${FILESDIR}/glendix_2.6.31.6.patch" + epatch "${FILESDIR}/glendix_${PV}.patch" } \ No newline at end of file -- cgit v1.2.3-18-g5258