r886 - in trunk/kernel-2.4/sparc/kernel-image-sparc-2.6: . debian/patches
Author: joshk
Date: 2004-07-13 23:55:43 -0600 (Tue, 13 Jul 2004)
New Revision: 886
Removed:
trunk/kernel-2.4/sparc/kernel-image-sparc-2.6/debian/patches/01_sparc64_i2c.dpatch
trunk/kernel-2.4/sparc/kernel-image-sparc-2.6/debian/patches/02_sparc64_use_CC.dpatch
trunk/kernel-2.4/sparc/kernel-image-sparc-2.6/debian/patches/03_sparc64_lvalue_casts.dpatch
trunk/kernel-2.4/sparc/kernel-image-sparc-2.6/debian/patches/04_sparc32_use_ld_-V.dpatch
trunk/kernel-2.4/sparc/kernel-image-sparc-2.6/debian/patches/05_esp_is_GPL.dpatch
trunk/kernel-2.4/sparc/kernel-image-sparc-2.6/patches-obsolete/
Log:
remove these
Deleted: trunk/kernel-2.4/sparc/kernel-image-sparc-2.6/debian/patches/01_sparc64_i2c.dpatch
===================================================================
--- trunk/kernel-2.4/sparc/kernel-image-sparc-2.6/debian/patches/01_sparc64_i2c.dpatch 2004-07-14 05:54:48 UTC (rev 885)
+++ trunk/kernel-2.4/sparc/kernel-image-sparc-2.6/debian/patches/01_sparc64_i2c.dpatch 2004-07-14 05:55:43 UTC (rev 886)
@@ -1,35 +0,0 @@
-#! /bin/sh -e
-## 01_sparc64_i2c.dpatch by Joshua Kwan <joshk@triplehelix.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: enable I2C for sparc64 to resolve module dep issues
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
---- kernel-source-2.4.26/arch/sparc64/config.in~ 2004-04-19 12:13:17.000000000 -0400
-+++ kernel-source-2.4.26/arch/sparc64/config.in 2004-04-19 12:13:39.000000000 -0400
-@@ -21,6 +21,8 @@
- mainmenu_option next_comment
- comment 'General setup'
-
-+source drivers/i2c/Config.in
-+
- tristate 'UltraSPARC-III bootbus i2c controller driver' CONFIG_BBC_I2C
-
- define_bool CONFIG_VT y
Deleted: trunk/kernel-2.4/sparc/kernel-image-sparc-2.6/debian/patches/02_sparc64_use_CC.dpatch
===================================================================
--- trunk/kernel-2.4/sparc/kernel-image-sparc-2.6/debian/patches/02_sparc64_use_CC.dpatch 2004-07-14 05:54:48 UTC (rev 885)
+++ trunk/kernel-2.4/sparc/kernel-image-sparc-2.6/debian/patches/02_sparc64_use_CC.dpatch 2004-07-14 05:55:43 UTC (rev 886)
@@ -1,36 +0,0 @@
-#! /bin/sh -e
-## 02_sparc64_use_CC.dpatch by <joshk@triplehelix.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use $(CC) variable when figuring out whether to use sparc64-linux-gcc
-## DP: or not.
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
---- kernel-source-2.4.26/arch/sparc64/Makefile 2004-04-25 16:41:16.000000000 -0700
-+++ kernel-source-2.4.26/arch/sparc64/Makefile~ 2004-04-25 16:40:52.000000000 -0700
-@@ -12,7 +12,7 @@
- # line...
- SHELL =/bin/bash
-
--CC := $(shell if gcc -m64 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo gcc; else echo sparc64-linux-gcc; fi )
-+CC := $(shell if $(CC) -m64 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo $(CC); else echo sparc64-linux-gcc; fi )
-
- NEW_GCC := $(shell if $(CC) -m64 -mcmodel=medlow -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo y; else echo n; fi; )
- NEW_GAS := $(shell if $(LD) -V 2>&1 | grep 'elf64_sparc' > /dev/null; then echo y; else echo n; fi)
Deleted: trunk/kernel-2.4/sparc/kernel-image-sparc-2.6/debian/patches/03_sparc64_lvalue_casts.dpatch
===================================================================
--- trunk/kernel-2.4/sparc/kernel-image-sparc-2.6/debian/patches/03_sparc64_lvalue_casts.dpatch 2004-07-14 05:54:48 UTC (rev 885)
+++ trunk/kernel-2.4/sparc/kernel-image-sparc-2.6/debian/patches/03_sparc64_lvalue_casts.dpatch 2004-07-14 05:55:43 UTC (rev 886)
@@ -1,62 +0,0 @@
-#! /bin/sh -e
-## 03_sparc64_lvalue_casts.dpatch by <joshk@triplehelix.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix lvalue casts in asm-sparc64/pgalloc.h.
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-
---- kernel-source-2.4.26/include/asm-sparc64/pgalloc.h~ 2004-04-25 17:01:53.000000000 -0700
-+++ kernel-source-2.4.26/include/asm-sparc64/pgalloc.h 2004-04-25 17:08:16.000000000 -0700
-@@ -147,11 +147,11 @@
- struct page *page = virt_to_page(pgd);
-
- if (!page->pprev_hash) {
-- (unsigned long *)page->next_hash = pgd_quicklist;
-+ page->next_hash = (struct page *)pgd_quicklist;
- pgd_quicklist = (unsigned long *)page;
- }
-- (unsigned long)page->pprev_hash |=
-- (((unsigned long)pgd & (PAGE_SIZE / 2)) ? 2 : 1);
-+ page->pprev_hash = (struct page **)(((unsigned long)page->pprev_hash) |
-+ (((unsigned long)pgd & (PAGE_SIZE / 2)) ? 2 : 1));
- pgd_cache_size++;
- }
-
-@@ -169,7 +169,7 @@
- off = PAGE_SIZE / 2;
- mask &= ~2;
- }
-- (unsigned long)ret->pprev_hash = mask;
-+ ret->pprev_hash = (struct page **)mask;
- if (!mask)
- pgd_quicklist = (unsigned long *)ret->next_hash;
- ret = (struct page *)(__page_address(ret) + off);
-@@ -180,8 +180,8 @@
- if (page) {
- ret = (struct page *)page_address(page);
- clear_page(ret);
-- (unsigned long)page->pprev_hash = 2;
-- (unsigned long *)page->next_hash = pgd_quicklist;
-+ page->pprev_hash = (struct page **) 2UL;
-+ page->next_hash = (struct page *) pgd_quicklist;
- pgd_quicklist = (unsigned long *)page;
- pgd_cache_size++;
- }
Deleted: trunk/kernel-2.4/sparc/kernel-image-sparc-2.6/debian/patches/04_sparc32_use_ld_-V.dpatch
===================================================================
--- trunk/kernel-2.4/sparc/kernel-image-sparc-2.6/debian/patches/04_sparc32_use_ld_-V.dpatch 2004-07-14 05:54:48 UTC (rev 885)
+++ trunk/kernel-2.4/sparc/kernel-image-sparc-2.6/debian/patches/04_sparc32_use_ld_-V.dpatch 2004-07-14 05:55:43 UTC (rev 886)
@@ -1,36 +0,0 @@
-#! /bin/sh -e
-## 04_sparc32_use_ld_-V.dpatch by <joshk@triplehelix.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use ld -V for the $(NEW_GAS) check.
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
---- kernel-source-2.4.26/arch/sparc/Makefile~ 2004-04-26 09:33:48.000000000 -0700
-+++ kernel-source-2.4.26/arch/sparc/Makefile 2004-04-26 09:34:23.000000000 -0700
-@@ -16,7 +16,7 @@
- # debugging of the kernel to get the proper debugging information.
-
- IS_EGCS := $(shell if $(CC) -m32 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo y; else echo n; fi; )
--NEW_GAS := $(shell if $(LD) --version 2>&1 | grep 'elf64_sparc' > /dev/null; then echo y; else echo n; fi)
-+NEW_GAS := $(shell if $(LD) -V 2>&1 | grep 'elf64_sparc' > /dev/null; then echo y; else echo n; fi)
-
- ifeq ($(NEW_GAS),y)
- AS := $(AS) -32
Deleted: trunk/kernel-2.4/sparc/kernel-image-sparc-2.6/debian/patches/05_esp_is_GPL.dpatch
===================================================================
--- trunk/kernel-2.4/sparc/kernel-image-sparc-2.6/debian/patches/05_esp_is_GPL.dpatch 2004-07-14 05:54:48 UTC (rev 885)
+++ trunk/kernel-2.4/sparc/kernel-image-sparc-2.6/debian/patches/05_esp_is_GPL.dpatch 2004-07-14 05:55:43 UTC (rev 886)
@@ -1,33 +0,0 @@
-#! /bin/sh -e
-## 05_esp_is_GPL.dpatch by Joshua Kwan <joshk@triplehelix.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: 2.6 has GPLed esp.c, we'll do it here too. Taints the kernel otherwise
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
---- kernel-source-2.4.26/drivers/scsi/esp.c~ 2004-07-06 01:34:22.000000000 -0700
-+++ kernel-source-2.4.26/drivers/scsi/esp.c 2004-07-06 01:35:00.000000000 -0700
-@@ -4368,4 +4368,6 @@
-
- #include "scsi_module.c"
-
-+MODULE_LICENSE("GPL");
-+
- EXPORT_NO_SYMBOLS;
Reply to: