r1050 - trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches
Simon Horman
horms@haydn.debian.org
Thu, 12 Aug 2004 18:36:50 -0600
Author: horms
Date: 2004-08-12 18:36:06 -0600 (Thu, 12 Aug 2004)
New Revision: 1050
Modified:
trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6
Log:
CAN-2004-0415: Create dummy files intesad of deleting them as dpkg-source does not cope with file deletion.
Modified: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6 2004-08-13 00:33:58 UTC (rev 1049)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6 2004-08-13 00:36:06 UTC (rev 1050)
@@ -8,14 +8,20 @@
# BitKeeper/deleted/.del-error_log.c~5cdf26cd9a8325fd
# 2004/08/03 19:14:57-03:00 marcelo@logos.cnet +0 -0
# Delete: arch/ppc/platforms/error_log.c
+# *** Updated to create a dummy file as dpk-source does not ***
+# *** handle file deletion Horms 2004/08/12 ***
#
# BitKeeper/deleted/.del-error_log.h~76c5c9436b7dffbc
# 2004/08/03 19:14:57-03:00 marcelo@logos.cnet +0 -0
# Delete: arch/ppc/platforms/error_log.h
+# *** Updated to create a dummy file as dpk-source does not ***
+# *** handle file deletion Horms 2004/08/12 ***
#
# BitKeeper/deleted/.del-proc_rtas.c~ca8a566ec73bac30
# 2004/08/03 19:14:57-03:00 marcelo@logos.cnet +0 -0
# Delete: arch/ppc/platforms/proc_rtas.c
+# *** Updated to create a dummy file as dpk-source does not ***
+# *** handle file deletion Horms 2004/08/12 ***
#
# arch/cris/drivers/eeprom.c
# 2004/07/30 10:29:18-03:00 marcelo@logos.cnet +6 -6
@@ -501,10 +507,108 @@
obj-$(CONFIG_PREP_RESIDUAL) += residual.o
obj-$(CONFIG_GEMINI) += gemini_pci.o gemini_setup.o gemini_prom.o
obj-$(CONFIG_LOPEC) += lopec_setup.o lopec_pci.o
-diff -Nru a/arch/ppc/platforms/error_log.c b/arch/ppc/platforms/error_log.c
---- a/arch/ppc/platforms/error_log.c 2004-08-11 19:29:57 -07:00
-+++ /dev/null Wed Dec 31 16:00:00 196900
-@@ -1,183 +0,0 @@
+--- a/arch/ppc/platforms/error_log.h.orig 2004-08-12 16:56:06.000000000 +0900
++++ b/arch/ppc/platforms/error_log.h 2004-08-12 16:56:18.000000000 +0900
+@@ -1,95 +1 @@
+-#ifndef __ERROR_LOG_H__
+-#define __ERROR_LOG_H__
+-
+-#define VERBOSE_ERRORS 1 /* Maybe I enlarge the kernel too much */
+-#undef VERBOSE_ERRORS
+-
+-/* Event classes */
+-/* XXX: Endianess correct? NOW*/
+-#define INTERNAL_ERROR 0x80000000 /* set bit 0 */
+-#define EPOW_WARNING 0x40000000 /* set bit 1 */
+-#define POWERMGM_EVENTS 0x20000000 /* set bit 2 */
+-
+-/* event-scan returns */
+-#define SEVERITY_FATAL 0x5
+-#define SEVERITY_ERROR 0x4
+-#define SEVERITY_ERROR_SYNC 0x3
+-#define SEVERITY_WARNING 0x2
+-#define SEVERITY_EVENT 0x1
+-#define SEVERITY_NO_ERROR 0x0
+-#define DISP_FULLY_RECOVERED 0x0
+-#define DISP_LIMITED_RECOVERY 0x1
+-#define DISP_NOT_RECOVERED 0x2
+-#define PART_PRESENT 0x0
+-#define PART_NOT_PRESENT 0x1
+-#define INITIATOR_UNKNOWN 0x0
+-#define INITIATOR_CPU 0x1
+-#define INITIATOR_PCI 0x2
+-#define INITIATOR_ISA 0x3
+-#define INITIATOR_MEMORY 0x4
+-#define INITIATOR_POWERMGM 0x5
+-#define TARGET_UNKNOWN 0x0
+-#define TARGET_CPU 0x1
+-#define TARGET_PCI 0x2
+-#define TARGET_ISA 0x3
+-#define TARGET_MEMORY 0x4
+-#define TARGET_POWERMGM 0x5
+-#define TYPE_RETRY 0x01
+-#define TYPE_TCE_ERR 0x02
+-#define TYPE_INTERN_DEV_FAIL 0x03
+-#define TYPE_TIMEOUT 0x04
+-#define TYPE_DATA_PARITY 0x05
+-#define TYPE_ADDR_PARITY 0x06
+-#define TYPE_CACHE_PARITY 0x07
+-#define TYPE_ADDR_INVALID 0x08
+-#define TYPE_ECC_UNCORR 0x09
+-#define TYPE_ECC_CORR 0x0a
+-#define TYPE_EPOW 0x40
+-/* I don't add PowerMGM events right now, this is a different topic */
+-#define TYPE_PMGM_POWER_SW_ON 0x60
+-#define TYPE_PMGM_POWER_SW_OFF 0x61
+-#define TYPE_PMGM_LID_OPEN 0x62
+-#define TYPE_PMGM_LID_CLOSE 0x63
+-#define TYPE_PMGM_SLEEP_BTN 0x64
+-#define TYPE_PMGM_WAKE_BTN 0x65
+-#define TYPE_PMGM_BATTERY_WARN 0x66
+-#define TYPE_PMGM_BATTERY_CRIT 0x67
+-#define TYPE_PMGM_SWITCH_TO_BAT 0x68
+-#define TYPE_PMGM_SWITCH_TO_AC 0x69
+-#define TYPE_PMGM_KBD_OR_MOUSE 0x6a
+-#define TYPE_PMGM_ENCLOS_OPEN 0x6b
+-#define TYPE_PMGM_ENCLOS_CLOSED 0x6c
+-#define TYPE_PMGM_RING_INDICATE 0x6d
+-#define TYPE_PMGM_LAN_ATTENTION 0x6e
+-#define TYPE_PMGM_TIME_ALARM 0x6f
+-#define TYPE_PMGM_CONFIG_CHANGE 0x70
+-#define TYPE_PMGM_SERVICE_PROC 0x71
+-
+-typedef struct _rtas_error_log {
+- unsigned long version:8; /* Architectural version */
+- unsigned long severity:3; /* Severity level of error */
+- unsigned long disposition:2; /* Degree of recovery */
+- unsigned long extended:1; /* extended log present? */
+- unsigned long /* reserved */ :2; /* Reserved for future use */
+- unsigned long initiator:4; /* Initiator of event */
+- unsigned long target:4; /* Target of failed operation */
+- unsigned long type:8; /* General event or error*/
+- unsigned long extended_log_length:32; /* length in bytes */
+-} rtas_error_log;
+-
+-/* ****************************************************************** */
+-#define ppc_rtas_errorlog_check_severity(x) \
+- (_errlog_severity[x.severity])
+-#define ppc_rtas_errorlog_check_target(x) \
+- (_errlog_target[x.target])
+-#define ppc_rtas_errorlog_check_initiator(x) \
+- (_errlog_initiator[x.initiator])
+-#define ppc_rtas_errorlog_check_extended(x) \
+- (_errlog_extended[x.extended])
+-#define ppc_rtas_errorlog_disect_extended(x) \
+- do { /* implement me */ } while(0)
+-extern const char * ppc_rtas_errorlog_check_type (rtas_error_log error_log);
+-extern int ppc_rtas_errorlog_scan(void);
+-
+-
+-#endif /* __ERROR_LOG_H__ */
++/* Dummy File as dpkg-source does not handle file deletion */
+--- a/arch/ppc/platforms/error_log.c.orig 2004-08-12 16:55:49.000000000 +0900
++++ b/arch/ppc/platforms/error_log.c 2004-08-12 16:55:54.000000000 +0900
+@@ -1,183 +1 @@
-/*
- * arch/ppc/kernel/error_log.c
- *
@@ -688,109 +792,10 @@
- return _errlog_type[error_log.type];
-}
-
-diff -Nru a/arch/ppc/platforms/error_log.h b/arch/ppc/platforms/error_log.h
---- a/arch/ppc/platforms/error_log.h 2004-08-11 19:29:57 -07:00
-+++ /dev/null Wed Dec 31 16:00:00 196900
-@@ -1,95 +0,0 @@
--#ifndef __ERROR_LOG_H__
--#define __ERROR_LOG_H__
--
--#define VERBOSE_ERRORS 1 /* Maybe I enlarge the kernel too much */
--#undef VERBOSE_ERRORS
--
--/* Event classes */
--/* XXX: Endianess correct? NOW*/
--#define INTERNAL_ERROR 0x80000000 /* set bit 0 */
--#define EPOW_WARNING 0x40000000 /* set bit 1 */
--#define POWERMGM_EVENTS 0x20000000 /* set bit 2 */
--
--/* event-scan returns */
--#define SEVERITY_FATAL 0x5
--#define SEVERITY_ERROR 0x4
--#define SEVERITY_ERROR_SYNC 0x3
--#define SEVERITY_WARNING 0x2
--#define SEVERITY_EVENT 0x1
--#define SEVERITY_NO_ERROR 0x0
--#define DISP_FULLY_RECOVERED 0x0
--#define DISP_LIMITED_RECOVERY 0x1
--#define DISP_NOT_RECOVERED 0x2
--#define PART_PRESENT 0x0
--#define PART_NOT_PRESENT 0x1
--#define INITIATOR_UNKNOWN 0x0
--#define INITIATOR_CPU 0x1
--#define INITIATOR_PCI 0x2
--#define INITIATOR_ISA 0x3
--#define INITIATOR_MEMORY 0x4
--#define INITIATOR_POWERMGM 0x5
--#define TARGET_UNKNOWN 0x0
--#define TARGET_CPU 0x1
--#define TARGET_PCI 0x2
--#define TARGET_ISA 0x3
--#define TARGET_MEMORY 0x4
--#define TARGET_POWERMGM 0x5
--#define TYPE_RETRY 0x01
--#define TYPE_TCE_ERR 0x02
--#define TYPE_INTERN_DEV_FAIL 0x03
--#define TYPE_TIMEOUT 0x04
--#define TYPE_DATA_PARITY 0x05
--#define TYPE_ADDR_PARITY 0x06
--#define TYPE_CACHE_PARITY 0x07
--#define TYPE_ADDR_INVALID 0x08
--#define TYPE_ECC_UNCORR 0x09
--#define TYPE_ECC_CORR 0x0a
--#define TYPE_EPOW 0x40
--/* I don't add PowerMGM events right now, this is a different topic */
--#define TYPE_PMGM_POWER_SW_ON 0x60
--#define TYPE_PMGM_POWER_SW_OFF 0x61
--#define TYPE_PMGM_LID_OPEN 0x62
--#define TYPE_PMGM_LID_CLOSE 0x63
--#define TYPE_PMGM_SLEEP_BTN 0x64
--#define TYPE_PMGM_WAKE_BTN 0x65
--#define TYPE_PMGM_BATTERY_WARN 0x66
--#define TYPE_PMGM_BATTERY_CRIT 0x67
--#define TYPE_PMGM_SWITCH_TO_BAT 0x68
--#define TYPE_PMGM_SWITCH_TO_AC 0x69
--#define TYPE_PMGM_KBD_OR_MOUSE 0x6a
--#define TYPE_PMGM_ENCLOS_OPEN 0x6b
--#define TYPE_PMGM_ENCLOS_CLOSED 0x6c
--#define TYPE_PMGM_RING_INDICATE 0x6d
--#define TYPE_PMGM_LAN_ATTENTION 0x6e
--#define TYPE_PMGM_TIME_ALARM 0x6f
--#define TYPE_PMGM_CONFIG_CHANGE 0x70
--#define TYPE_PMGM_SERVICE_PROC 0x71
--
--typedef struct _rtas_error_log {
-- unsigned long version:8; /* Architectural version */
-- unsigned long severity:3; /* Severity level of error */
-- unsigned long disposition:2; /* Degree of recovery */
-- unsigned long extended:1; /* extended log present? */
-- unsigned long /* reserved */ :2; /* Reserved for future use */
-- unsigned long initiator:4; /* Initiator of event */
-- unsigned long target:4; /* Target of failed operation */
-- unsigned long type:8; /* General event or error*/
-- unsigned long extended_log_length:32; /* length in bytes */
--} rtas_error_log;
--
--/* ****************************************************************** */
--#define ppc_rtas_errorlog_check_severity(x) \
-- (_errlog_severity[x.severity])
--#define ppc_rtas_errorlog_check_target(x) \
-- (_errlog_target[x.target])
--#define ppc_rtas_errorlog_check_initiator(x) \
-- (_errlog_initiator[x.initiator])
--#define ppc_rtas_errorlog_check_extended(x) \
-- (_errlog_extended[x.extended])
--#define ppc_rtas_errorlog_disect_extended(x) \
-- do { /* implement me */ } while(0)
--extern const char * ppc_rtas_errorlog_check_type (rtas_error_log error_log);
--extern int ppc_rtas_errorlog_scan(void);
--
--
--#endif /* __ERROR_LOG_H__ */
-diff -Nru a/arch/ppc/platforms/proc_rtas.c b/arch/ppc/platforms/proc_rtas.c
---- a/arch/ppc/platforms/proc_rtas.c 2004-08-11 19:29:57 -07:00
-+++ /dev/null Wed Dec 31 16:00:00 196900
-@@ -1,784 +0,0 @@
++/* Dummy File as dpkg-source does not handle file deletion */
+--- a/arch/ppc/platforms/proc_rtas.c.orig 2004-08-12 16:56:33.000000000 +0900
++++ b/arch/ppc/platforms/proc_rtas.c 2004-08-12 16:56:42.000000000 +0900
+@@ -1,784 +1 @@
-/*
- * arch/ppc/kernel/proc_rtas.c
- * Copyright (C) 2000 Tilmann Bitterberg
@@ -1575,6 +1580,7 @@
- *ppos += n;
- return n;
-}
++/* Dummy File as dpkg-source does not handle file deletion */
diff -Nru a/arch/ppc64/kernel/lparcfg.c b/arch/ppc64/kernel/lparcfg.c
--- a/arch/ppc64/kernel/lparcfg.c 2004-08-11 19:29:57 -07:00
+++ b/arch/ppc64/kernel/lparcfg.c 2004-08-11 19:29:57 -07:00