debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Fix FTBFS issues for ARM. 

svn path=/dists/trunk/linux-2.6/; revision=8810
This commit is contained in:
Gordon Farquharson 2007-05-29 03:07:44 +00:00
parent 750ec0ba1a
commit 47d02c03c9
7 changed files with 758 additions and 841 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -31,7 +31,12 @@ linux-2.6 (2.6.22~rc3-1~experimental.1) UNRELEASED; urgency=low
[ dann frazier ]
* Add Xen licensing info to the copyright file. (closes: #368912)
-- maximilian attems <maks@debian.org> Sat, 26 May 2007 22:47:13 +0200
[ Gordon Farquharson ]
* arm/ixp4xx: Update NPE driver for 2.6.22.
* arm: Mark CHELSIO_T3, NETXEN_NIC, BCM43XX, and VIDEO_BT848 as broken
on ARM.
-- Gordon Farquharson <gordonfarquharson@gmail.com> Mon, 28 May 2007 20:54:23 -0600
linux-2.6 (2.6.21-3) UNRELEASED; urgency=low

43
debian/patches/bugfix/arm/disable-broken-config-options-1.patch vendored Normal file
View File

@ -0,0 +1,43 @@
diff -Naur a/drivers/net/Kconfig b/drivers/net/Kconfig
--- a/drivers/net/Kconfig 2007-05-21 22:04:46.000000000 -0600
+++ b/drivers/net/Kconfig 2007-05-21 21:06:52.000000000 -0600
@@ -2363,7 +2363,7 @@
config CHELSIO_T3
tristate "Chelsio Communications T3 10Gb Ethernet support"
- depends on PCI
+ depends on PCI && (!ARM || BROKEN)
select FW_LOADER
help
This driver supports Chelsio T3-based gigabit and 10Gb Ethernet
@@ -2472,7 +2472,7 @@
config NETXEN_NIC
tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC"
- depends on PCI && (!SPARC32 || BROKEN)
+ depends on PCI && (!SPARC32 || BROKEN) && (!ARM || BROKEN)
help
This enables the support for NetXen's Gigabit Ethernet card.
diff -Naur a/drivers/net/wireless/bcm43xx/Kconfig b/drivers/net/wireless/bcm43xx/Kconfig
--- a/drivers/net/wireless/bcm43xx/Kconfig 2007-05-20 00:58:33.000000000 -0600
+++ b/drivers/net/wireless/bcm43xx/Kconfig 2007-05-21 21:56:15.000000000 -0600
@@ -1,6 +1,6 @@
config BCM43XX
tristate "Broadcom BCM43xx wireless support"
- depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && WLAN_80211 && EXPERIMENTAL
+ depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && WLAN_80211 && EXPERIMENTAL && (!ARM || BROKEN)
select WIRELESS_EXT
select FW_LOADER
select HW_RANDOM
diff -Naur a/drivers/media/video/bt8xx/Kconfig b/drivers/media/video/bt8xx/Kconfig
--- a/drivers/media/video/bt8xx/Kconfig 2007-04-25 21:08:32.000000000 -0600
+++ b/drivers/media/video/bt8xx/Kconfig 2007-05-28 18:12:26.000000000 -0600
@@ -1,6 +1,6 @@
config VIDEO_BT848
tristate "BT848 Video For Linux"
- depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L1
+ depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L1 && (!ARM || BROKEN)
select I2C_ALGOBIT
select FW_LOADER
select VIDEO_BTCX

78
debian/patches/bugfix/arm/disable-broken-config-options.patch vendored
View File

@ -1,78 +0,0 @@
diff -Naur linux-2.6-2.6.20~rc6.orig/drivers/media/dvb/b2c2/Kconfig linux-2.6-2.6.20~rc6/drivers/media/dvb/b2c2/Kconfig
--- linux-2.6-2.6.20~rc6.orig/drivers/media/dvb/b2c2/Kconfig 2007-01-27 12:04:34.000000000 -0700
+++ linux-2.6-2.6.20~rc6/drivers/media/dvb/b2c2/Kconfig 2007-01-29 21:46:10.000000000 -0700
@@ -1,6 +1,6 @@
config DVB_B2C2_FLEXCOP
tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters"
- depends on DVB_CORE && I2C
+ depends on DVB_CORE && I2C && (!ARM || BROKEN)
select DVB_PLL
select DVB_STV0299 if !DVB_FE_CUSTOMISE
select DVB_MT352 if !DVB_FE_CUSTOMISE
diff -Naur linux-2.6-2.6.20~rc6.orig/drivers/media/dvb/ttpci/Kconfig linux-2.6-2.6.20~rc6/drivers/media/dvb/ttpci/Kconfig
--- linux-2.6-2.6.20~rc6.orig/drivers/media/dvb/ttpci/Kconfig 2007-01-27 12:04:34.000000000 -0700
+++ linux-2.6-2.6.20~rc6/drivers/media/dvb/ttpci/Kconfig 2007-01-29 21:44:25.000000000 -0700
@@ -60,7 +60,7 @@
config DVB_BUDGET
tristate "Budget cards"
- depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
+ depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 && (!ARM || BROKEN)
select VIDEO_SAA7146
select DVB_PLL
select DVB_STV0299 if !DVB_FE_CUSTOMISE
@@ -128,7 +128,7 @@
config DVB_BUDGET_PATCH
tristate "AV7110 cards with Budget Patch"
- depends on DVB_CORE && DVB_BUDGET && VIDEO_V4L1
+ depends on DVB_CORE && DVB_BUDGET && VIDEO_V4L1 && (!ARM || BROKEN)
select DVB_AV7110
select DVB_PLL
select DVB_STV0299 if !DVB_FE_CUSTOMISE
diff -Naur linux-2.6-2.6.20~rc6.orig/drivers/media/video/bt8xx/Kconfig linux-2.6-2.6.20~rc6/drivers/media/video/bt8xx/Kconfig
--- linux-2.6-2.6.20~rc6.orig/drivers/media/video/bt8xx/Kconfig 2006-11-29 14:57:37.000000000 -0700
+++ linux-2.6-2.6.20~rc6/drivers/media/video/bt8xx/Kconfig 2007-01-29 22:09:17.000000000 -0700
@@ -1,6 +1,6 @@
config VIDEO_BT848
tristate "BT848 Video For Linux"
- depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L1
+ depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L1 && (!ARM || BROKEN)
select I2C_ALGOBIT
select FW_LOADER
select VIDEO_BTCX
diff -Naur linux-2.6-2.6.20~rc6.orig/drivers/net/wireless/bcm43xx/Kconfig linux-2.6-2.6.20~rc6/drivers/net/wireless/bcm43xx/Kconfig
--- linux-2.6-2.6.20~rc6.orig/drivers/net/wireless/bcm43xx/Kconfig 2006-11-29 14:57:37.000000000 -0700
+++ linux-2.6-2.6.20~rc6/drivers/net/wireless/bcm43xx/Kconfig 2007-01-29 22:07:26.000000000 -0700
@@ -1,6 +1,6 @@
config BCM43XX
tristate "Broadcom BCM43xx wireless support"
- depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && NET_RADIO && EXPERIMENTAL
+ depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && NET_RADIO && EXPERIMENTAL && (!ARM || BROKEN)
select FW_LOADER
select HW_RANDOM
---help---
diff -Naur linux-2.6-2.6.20~rc6.orig/drivers/scsi/Kconfig linux-2.6-2.6.20~rc6/drivers/scsi/Kconfig
--- linux-2.6-2.6.20~rc6.orig/drivers/scsi/Kconfig 2007-01-27 12:04:35.000000000 -0700
+++ linux-2.6-2.6.20~rc6/drivers/scsi/Kconfig 2007-01-29 22:08:55.000000000 -0700
@@ -360,7 +360,7 @@
config SCSI_ACARD
tristate "ACARD SCSI support"
- depends on PCI && SCSI
+ depends on PCI && SCSI && (!ARM || BROKEN)
help
This driver supports the ACARD SCSI host adapter.
Support Chip <ATP870 ATP876 ATP880 ATP885>
diff -Naur linux-2.6-2.6.20~rc6.orig/drivers/video/Kconfig linux-2.6-2.6.20~rc6/drivers/video/Kconfig
--- linux-2.6-2.6.20~rc6.orig/drivers/video/Kconfig 2007-01-27 12:04:36.000000000 -0700
+++ linux-2.6-2.6.20~rc6/drivers/video/Kconfig 2007-01-29 22:08:21.000000000 -0700
@@ -1149,7 +1149,7 @@
config FB_SAVAGE
tristate "S3 Savage support"
- depends on FB && PCI && EXPERIMENTAL
+ depends on FB && PCI && EXPERIMENTAL && (!ARM || BROKEN)
select FB_MODE_HELPERS
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA

24
debian/patches/bugfix/arm/disable-broken-config-options2.patch vendored
View File

@ -1,24 +0,0 @@
diff -Naur linux-2.6-2.6.20.orig/drivers/mtd/nand/Kconfig linux-2.6-2.6.20/drivers/mtd/nand/Kconfig
--- linux-2.6-2.6.20.orig/drivers/mtd/nand/Kconfig 2007-02-04 11:44:54.000000000 -0700
+++ linux-2.6-2.6.20/drivers/mtd/nand/Kconfig 2007-04-18 22:02:18.000000000 -0600
@@ -223,7 +223,7 @@
config MTD_NAND_CAFE
tristate "NAND support for OLPC CAFÉ chip"
- depends on MTD_NAND && PCI
+ depends on MTD_NAND && PCI && (!ARM || BROKEN)
help
Use NAND flash attached to the CAFÉ chip designed for the $100
laptop.
diff -Naur linux-2.6-2.6.20.orig/drivers/net/Kconfig linux-2.6-2.6.20/drivers/net/Kconfig
--- linux-2.6-2.6.20.orig/drivers/net/Kconfig 2007-04-18 22:16:48.000000000 -0600
+++ linux-2.6-2.6.20/drivers/net/Kconfig 2007-04-18 22:16:29.000000000 -0600
@@ -2484,7 +2484,7 @@
config NETXEN_NIC
tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC"
- depends on PCI && (!SPARC32 || BROKEN)
+ depends on PCI && (!SPARC32 || BROKEN) && (!ARM || BROKEN)
help
This enables the support for NetXen's Gigabit Ethernet card.

11
debian/patches/bugfix/arm/disable-broken-config-options3.patch vendored
View File

@ -1,11 +0,0 @@
--- linux-2.6-2.6.20/drivers/net/Kconfig~ 2007-04-25 14:10:24.000000000 +0000
+++ linux-2.6-2.6.20/drivers/net/Kconfig 2007-04-25 14:11:20.000000000 +0000
@@ -2373,7 +2373,7 @@
config CHELSIO_T3
tristate "Chelsio Communications T3 10Gb Ethernet support"
- depends on PCI
+ depends on PCI && (!ARM || BROKEN)
select FW_LOADER
help
This driver supports Chelsio T3-based gigabit and 10Gb Ethernet

1430
debian/patches/features/arm/ixp4xx_npe_driver-0.3.1.patch → debian/patches/features/arm/ixp4xx-npe-driver-0.3.1.patch vendored
View File

File diff suppressed because it is too large Load Diff

6
debian/patches/series/1~experimental.1 vendored
View File

@ -27,13 +27,11 @@
+ features/arm/ixp4xx-net-driver-improve-mac-handling.patch
+ bugfix/drivers-bus_to_virt.patch
+ bugfix/sparc/drivers_net-broken.patch
#+ bugfix/arm/disable-broken-config-options.patch
#+ bugfix/arm/disable-broken-config-options2.patch
#+ bugfix/arm/disable-broken-config-options3.patch
+ bugfix/arm/rtc-rs5c372-n2100.patch
+ bugfix/forcedeth-napi-broken.patch
#+ bugfix/powerpc/drivers_macintosh-broken.patch
+ bugfix/ia64/hardcode-arch-script-output.patch
+ features/fintek-f75375.patch
+ features/alpha/isa-mapping-support.patch
+ bugfix/powerpc/libgcc-__ucmpdi2.patch
+ bugfix/powerpc/libgcc-__ucmpdi2.patch
+ bugfix/arm/disable-broken-config-options-1.patch