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

Merge /dists/sid/linux-2.6. 

svn path=/dists/trunk/linux-2.6/; revision=8229
This commit is contained in:
Bastian Blank 2007-01-27 19:52:51 +00:00
parent d6425b5265
commit 88c56779b8
47 changed files with 3452 additions and 5136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/arch/alpha/config vendored
View File

@ -243,6 +243,7 @@ CONFIG_IDEDMA_AUTO=y
# CONFIG_BLK_DEV_HD is not set
CONFIG_AIC7XXX_CMDS_PER_DEVICE=8
CONFIG_SCSI_IN2000=m
CONFIG_SCSI_ARCMSR=m
CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
@ -1545,7 +1546,6 @@ CONFIG_LOG_BUF_SHIFT=14
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_FS is not set
CONFIG_EARLY_PRINTK=y
# CONFIG_DEBUG_RWLOCK is not set
# CONFIG_DEBUG_SEMAPHORE is not set

3
debian/arch/amd64/config vendored
View File

@ -502,7 +502,6 @@ CONFIG_NS83820=m
CONFIG_HAMACHI=m
CONFIG_YELLOWFIN=m
CONFIG_R8169=m
CONFIG_SK98LIN=m
CONFIG_VIA_VELOCITY=m
CONFIG_TIGON3=m
CONFIG_BNX2=m
@ -1358,7 +1357,6 @@ CONFIG_LOG_BUF_SHIFT=16
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_FS is not set
# CONFIG_IOMMU_DEBUG is not set
# CONFIG_KPROBES is not set
CONFIG_CRC_CCITT=m
@ -1440,3 +1438,4 @@ CONFIG_SENSORS_K8TEMP=m
CONFIG_CRYPTO_TWOFISH_X86_64=m
CONFIG_ARCH_POPULATES_NODE_MAP=y
CONFIG_BLK_DEV_IDEPNP=y
CONFIG_USB_APPLETOUCH=m

3
debian/arch/arm/config.footbridge vendored
View File

@ -651,7 +651,7 @@ CONFIG_NET_PCI=y
# CONFIG_EEPRO100 is not set
# CONFIG_E100 is not set
# CONFIG_FEALNX is not set
# CONFIG_NATSEMI is not set
CONFIG_NATSEMI=m
CONFIG_NE2K_PCI=m
# CONFIG_8139CP is not set
# CONFIG_8139TOO is not set
@ -673,7 +673,6 @@ CONFIG_NE2K_PCI=m
# CONFIG_R8169 is not set
CONFIG_SIS190=m
CONFIG_SKGE=m
# CONFIG_SK98LIN is not set
# CONFIG_VIA_VELOCITY is not set
# CONFIG_TIGON3 is not set
# CONFIG_BNX2 is not set

59
debian/arch/arm/config.iop32x vendored
View File

@ -310,8 +310,8 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
CONFIG_IP_NF_CONNTRACK=m
CONFIG_IP_NF_CT_ACCT=y
CONFIG_IP_NF_CONNTRACK_MARK=y
# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
# CONFIG_IP_NF_CONNTRACK_NETLINK is not set
CONFIG_IP_NF_CONNTRACK_EVENTS=y
CONFIG_IP_NF_CONNTRACK_NETLINK=m
# CONFIG_IP_NF_CT_PROTO_SCTP is not set
CONFIG_IP_NF_FTP=m
CONFIG_IP_NF_IRC=m
@ -391,6 +391,12 @@ CONFIG_IP_NF_ARP_MANGLE=m
#
# CONFIG_TIPC is not set
CONFIG_ATM=m
CONFIG_ATM_CLIP=m
# CONFIG_ATM_CLIP_NO_ICMP is not set
CONFIG_ATM_LANE=m
CONFIG_ATM_MPOA=m
CONFIG_ATM_BR2684=m
# CONFIG_ATM_BR2684_IPFILTER is not set
CONFIG_BRIDGE=m
CONFIG_VLAN_8021Q=m
CONFIG_DECNET=m
@ -470,7 +476,8 @@ CONFIG_IEEE80211=m
CONFIG_IEEE80211_CRYPT_WEP=m
CONFIG_IEEE80211_CRYPT_CCMP=m
# CONFIG_IEEE80211_CRYPT_TKIP is not set
# CONFIG_IEEE80211_SOFTMAC is not set
CONFIG_IEEE80211_SOFTMAC=m
# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
CONFIG_WIRELESS_EXT=y
#
@ -713,7 +720,7 @@ CONFIG_SCSI_SAS_ATTRS=m
#
# SCSI low-level drivers
#
# CONFIG_ISCSI_TCP is not set
CONFIG_ISCSI_TCP=m
# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
# CONFIG_SCSI_3W_9XXX is not set
# CONFIG_SCSI_ACARD is not set
@ -865,7 +872,7 @@ CONFIG_R8169_VLAN=y
CONFIG_SIS190=m
CONFIG_SKGE=m
# CONFIG_SKY2 is not set
CONFIG_SK98LIN=m
# CONFIG_SK98LIN is not set
CONFIG_TIGON3=m
CONFIG_BNX2=m
@ -908,16 +915,26 @@ CONFIG_TMD_HERMES=m
CONFIG_NORTEL_HERMES=m
CONFIG_PCI_HERMES=m
CONFIG_ATMEL=m
# CONFIG_PCI_ATMEL is not set
CONFIG_PCI_ATMEL=m
#
# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
#
# CONFIG_PRISM54 is not set
CONFIG_HOSTAP=m
# CONFIG_HOSTAP_FIRMWARE is not set
CONFIG_HOSTAP_FIRMWARE=y
# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
CONFIG_HOSTAP_PLX=m
# CONFIG_HOSTAP_PCI is not set
CONFIG_HOSTAP_PCI=m
CONFIG_BCM43XX=m
CONFIG_BCM43XX_DEBUG=y
CONFIG_BCM43XX_DMA=y
CONFIG_BCM43XX_PIO=y
CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
# CONFIG_BCM43XX_DMA_MODE is not set
# CONFIG_BCM43XX_PIO_MODE is not set
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
CONFIG_NET_WIRELESS=y
#
@ -935,6 +952,7 @@ CONFIG_PPP_DEFLATE=m
CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_MPPE=m
CONFIG_PPPOE=m
CONFIG_PPPOATM=m
CONFIG_SLIP=m
CONFIG_SLIP_COMPRESSED=y
CONFIG_SLIP_SMART=y
@ -1526,8 +1544,8 @@ CONFIG_USB_DEVICEFS=y
# USB Host Controller Drivers
#
CONFIG_USB_EHCI_HCD=m
# CONFIG_USB_EHCI_SPLIT_ISO is not set
# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
CONFIG_USB_EHCI_SPLIT_ISO=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_ISP116X_HCD=m
CONFIG_USB_OHCI_HCD=m
# CONFIG_USB_OHCI_BIG_ENDIAN is not set
@ -1722,7 +1740,26 @@ CONFIG_USB_G_SERIAL=m
# Real Time Clock
#
CONFIG_RTC_LIB=y
# CONFIG_RTC_CLASS is not set
CONFIG_RTC_CLASS=y
CONFIG_RTC_HCTOSYS=y
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
#
# RTC interfaces
#
CONFIG_RTC_INTF_SYSFS=y
CONFIG_RTC_INTF_PROC=y
CONFIG_RTC_INTF_DEV=y
#
# RTC drivers
#
# CONFIG_RTC_DRV_X1205 is not set
# CONFIG_RTC_DRV_DS1672 is not set
# CONFIG_RTC_DRV_PCF8563 is not set
CONFIG_RTC_DRV_RS5C372=y
# CONFIG_RTC_DRV_M48T86 is not set
# CONFIG_RTC_DRV_TEST is not set
#
# File systems

123
debian/arch/arm/config.ixp4xx vendored
View File

@ -429,6 +429,12 @@ CONFIG_TIPC_PORTS=8191
CONFIG_TIPC_LOG=0
# CONFIG_TIPC_DEBUG is not set
CONFIG_ATM=m
CONFIG_ATM_CLIP=m
# CONFIG_ATM_CLIP_NO_ICMP is not set
CONFIG_ATM_LANE=m
CONFIG_ATM_MPOA=m
CONFIG_ATM_BR2684=m
# CONFIG_ATM_BR2684_IPFILTER is not set
CONFIG_BRIDGE=m
CONFIG_VLAN_8021Q=m
CONFIG_DECNET=m
@ -693,7 +699,7 @@ CONFIG_SCSI_SAS_ATTRS=m
#
# SCSI low-level drivers
#
# CONFIG_ISCSI_TCP is not set
CONFIG_ISCSI_TCP=m
# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
# CONFIG_SCSI_3W_9XXX is not set
# CONFIG_SCSI_ACARD is not set
@ -847,7 +853,6 @@ CONFIG_IXP4XX_CRYPTO=m
# CONFIG_SIS190 is not set
# CONFIG_SKGE is not set
# CONFIG_SKY2 is not set
# CONFIG_SK98LIN is not set
# CONFIG_TIGON3 is not set
# CONFIG_BNX2 is not set
@ -915,6 +920,7 @@ CONFIG_PPP_DEFLATE=m
CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_MPPE=m
CONFIG_PPPOE=m
CONFIG_PPPOATM=m
CONFIG_SLIP=m
CONFIG_SLIP_COMPRESSED=y
CONFIG_SLIP_SMART=y
@ -1089,12 +1095,12 @@ CONFIG_I2C_IXP4XX=y
#
# Miscellaneous I2C Chip support
#
# CONFIG_SENSORS_DS1337 is not set
CONFIG_SENSORS_DS1337=m
CONFIG_SENSORS_DS1374=m
CONFIG_SENSORS_EEPROM=y
# CONFIG_SENSORS_PCF8574 is not set
CONFIG_SENSORS_PCF8574=m
CONFIG_SENSORS_PCA9539=m
# CONFIG_SENSORS_PCF8591 is not set
CONFIG_SENSORS_PCF8591=m
# CONFIG_SENSORS_RTC8564 is not set
CONFIG_SENSORS_MAX6875=m
CONFIG_RTC_X1205_I2C=m
@ -1143,31 +1149,31 @@ CONFIG_W1_SLAVE_DS2433=m
#
CONFIG_HWMON=y
CONFIG_HWMON_VID=m
# CONFIG_SENSORS_ADM1021 is not set
# CONFIG_SENSORS_ADM1025 is not set
# CONFIG_SENSORS_ADM1026 is not set
# CONFIG_SENSORS_ADM1031 is not set
CONFIG_SENSORS_ADM1021=m
CONFIG_SENSORS_ADM1025=m
CONFIG_SENSORS_ADM1026=m
CONFIG_SENSORS_ADM1031=m
CONFIG_SENSORS_ADM9240=m
# CONFIG_SENSORS_ASB100 is not set
CONFIG_SENSORS_ATXP1=m
# CONFIG_SENSORS_DS1621 is not set
CONFIG_SENSORS_DS1621=m
# CONFIG_SENSORS_F71805F is not set
# CONFIG_SENSORS_FSCHER is not set
# CONFIG_SENSORS_FSCPOS is not set
# CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_IT87 is not set
# CONFIG_SENSORS_LM63 is not set
# CONFIG_SENSORS_LM75 is not set
# CONFIG_SENSORS_LM77 is not set
# CONFIG_SENSORS_LM78 is not set
# CONFIG_SENSORS_LM80 is not set
# CONFIG_SENSORS_LM83 is not set
# CONFIG_SENSORS_LM85 is not set
# CONFIG_SENSORS_LM87 is not set
# CONFIG_SENSORS_LM90 is not set
# CONFIG_SENSORS_LM92 is not set
# CONFIG_SENSORS_MAX1619 is not set
CONFIG_SENSORS_LM63=m
CONFIG_SENSORS_LM75=m
CONFIG_SENSORS_LM77=m
CONFIG_SENSORS_LM78=m
CONFIG_SENSORS_LM80=m
CONFIG_SENSORS_LM83=m
CONFIG_SENSORS_LM85=m
CONFIG_SENSORS_LM87=m
CONFIG_SENSORS_LM90=m
CONFIG_SENSORS_LM92=m
CONFIG_SENSORS_MAX1619=m
# CONFIG_SENSORS_PC87360 is not set
# CONFIG_SENSORS_SIS5595 is not set
# CONFIG_SENSORS_SMSC47M1 is not set
@ -1206,6 +1212,9 @@ CONFIG_LEDS_TRIGGER_TIMER=y
# Multimedia devices
#
CONFIG_VIDEO_DEV=m
CONFIG_VIDEO_V4L1=y
CONFIG_VIDEO_V4L1_COMPAT=y
CONFIG_VIDEO_V4L2=y
#
# Video Capture Adapters
@ -1215,10 +1224,17 @@ CONFIG_VIDEO_DEV=m
# Video Capture Adapters
#
# CONFIG_VIDEO_ADV_DEBUG is not set
# CONFIG_VIDEO_BT848 is not set
CONFIG_VIDEO_VIVI=m
CONFIG_VIDEO_BT848=m
# CONFIG_VIDEO_BT848_DVB is not set
# CONFIG_VIDEO_SAA6588 is not set
# CONFIG_VIDEO_BWQCAM is not set
CONFIG_VIDEO_CQCAM=m
# CONFIG_VIDEO_W9966 is not set
CONFIG_VIDEO_CPIA=m
# CONFIG_VIDEO_CPIA_USB is not set
# CONFIG_VIDEO_CPIA_PP is not set
CONFIG_VIDEO_CPIA_USB=m
CONFIG_VIDEO_CPIA2=m
CONFIG_VIDEO_SAA5246A=m
CONFIG_VIDEO_SAA5249=m
CONFIG_TUNER_3036=m
@ -1229,6 +1245,7 @@ CONFIG_VIDEO_ZORAN_DC10=m
CONFIG_VIDEO_ZORAN_DC30=m
CONFIG_VIDEO_ZORAN_LML33=m
CONFIG_VIDEO_ZORAN_LML33R10=m
CONFIG_VIDEO_ZORAN_AVS6EYES=m
CONFIG_VIDEO_SAA7134=m
CONFIG_VIDEO_SAA7134_ALSA=m
# CONFIG_VIDEO_SAA7134_DVB is not set
@ -1238,12 +1255,48 @@ CONFIG_VIDEO_HEXIUM_ORION=m
CONFIG_VIDEO_HEXIUM_GEMINI=m
CONFIG_VIDEO_CX88=m
# CONFIG_VIDEO_CX88_ALSA is not set
CONFIG_VIDEO_CX88_BLACKBIRD=m
# CONFIG_VIDEO_CX88_DVB is not set
CONFIG_VIDEO_CX88_VP3054=m
#
# Encoders and Decoders
#
CONFIG_VIDEO_MSP3400=m
CONFIG_VIDEO_CS53L32A=m
CONFIG_VIDEO_TLV320AIC23B=m
CONFIG_VIDEO_WM8775=m
CONFIG_VIDEO_WM8739=m
CONFIG_VIDEO_CX2341X=m
CONFIG_VIDEO_CX25840=m
CONFIG_VIDEO_SAA711X=m
CONFIG_VIDEO_SAA7127=m
CONFIG_VIDEO_UPD64031A=m
CONFIG_VIDEO_UPD64083=m
#
# V4L USB devices
#
CONFIG_VIDEO_PVRUSB2=m
CONFIG_VIDEO_PVRUSB2_24XXX=y
CONFIG_VIDEO_PVRUSB2_SYSFS=y
# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
CONFIG_VIDEO_EM28XX=m
CONFIG_VIDEO_USBVIDEO=m
CONFIG_USB_VICAM=m
CONFIG_USB_IBMCAM=m
CONFIG_USB_KONICAWC=m
CONFIG_USB_QUICKCAM_MESSENGER=m
CONFIG_USB_ET61X251=m
CONFIG_VIDEO_OVCAMCHIP=m
CONFIG_VIDEO_AUDIO_DECODER=m
CONFIG_VIDEO_DECODER=m
CONFIG_USB_W9968CF=m
CONFIG_USB_OV511=m
CONFIG_USB_SE401=m
CONFIG_USB_SN9C102=m
CONFIG_USB_STV680=m
CONFIG_USB_ZC0301=m
CONFIG_USB_PWC=m
# CONFIG_USB_PWC_DEBUG is not set
#
# Radio Adapters
@ -1251,6 +1304,7 @@ CONFIG_VIDEO_DECODER=m
# CONFIG_RADIO_GEMTEK_PCI is not set
# CONFIG_RADIO_MAXIRADIO is not set
# CONFIG_RADIO_MAESTRO is not set
# CONFIG_USB_DSBR is not set
#
# Digital Video Broadcasting Devices
@ -1562,21 +1616,6 @@ CONFIG_USB_APPLETOUCH=m
CONFIG_USB_MDC800=m
CONFIG_USB_MICROTEK=m
#
# USB Multimedia devices
#
# CONFIG_USB_VICAM is not set
# CONFIG_USB_DSBR is not set
# CONFIG_USB_ET61X251 is not set
# CONFIG_USB_IBMCAM is not set
# CONFIG_USB_KONICAWC is not set
# CONFIG_USB_OV511 is not set
# CONFIG_USB_SE401 is not set
# CONFIG_USB_SN9C102 is not set
# CONFIG_USB_STV680 is not set
# CONFIG_USB_W9968CF is not set
# CONFIG_USB_PWC is not set
#
# USB Network Adapters
#
@ -1590,7 +1629,7 @@ CONFIG_USB_NET_CDCETHER=m
# CONFIG_USB_NET_GL620A is not set
CONFIG_USB_NET_NET1080=m
CONFIG_USB_NET_PLUSB=m
# CONFIG_USB_NET_RNDIS_HOST is not set
CONFIG_USB_NET_RNDIS_HOST=m
CONFIG_USB_NET_CDC_SUBSET=m
CONFIG_USB_ALI_M5632=y
CONFIG_USB_AN2720=y

1
debian/arch/arm/config.versatile vendored
View File

@ -784,7 +784,6 @@ CONFIG_ACENIC=m
# CONFIG_SIS190 is not set
# CONFIG_SKGE is not set
# CONFIG_SKY2 is not set
# CONFIG_SK98LIN is not set
# CONFIG_TIGON3 is not set
# CONFIG_BNX2 is not set

3
debian/arch/config vendored
View File

@ -124,6 +124,7 @@ CONFIG_SND_HDSPM=m
CONFIG_SENSORS_PCA9539=m
# CONFIG_HWMON_DEBUG_CHIP is not set
CONFIG_SKGE=m
# CONFIG_SK98LIN is not set
CONFIG_USB_GADGET_SELECTED=y
CONFIG_USB_ISP116X_HCD=m
CONFIG_DVB_LGDT330X=m
@ -852,7 +853,7 @@ CONFIG_HZ_250=y
CONFIG_HZ=250
CONFIG_MAGIC_SYSRQ=y
# CONFIG_DEBUG_KERNEL is not set
# CONFIG_DEBUG_FS is not set
CONFIG_DEBUG_FS=y
# CONFIG_UNWIND_INFO is not set
# CONFIG_DEBUG_RODATA is not set
# CONFIG_DEBUG_VM is not set

2
debian/arch/hppa/config vendored
View File

@ -701,6 +701,7 @@ CONFIG_TMPFS=y
# CONFIG_TMPFS_XATTR is not set
# CONFIG_HUGETLB_PAGE is not set
CONFIG_RAMFS=y
# CONFIG_XFS_FS is not set
# CONFIG_ADFS_FS is not set
# CONFIG_AFFS_FS is not set
# CONFIG_ASFS_FS is not set
@ -749,7 +750,6 @@ CONFIG_LOG_BUF_SHIFT=15
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_IOREMAP is not set
# CONFIG_DEBUG_FS is not set
CONFIG_CRC_CCITT=m
CONFIG_CRC32=y
CONFIG_LIBCRC32C=m

2
debian/arch/hppa/defines vendored
View File

@ -18,9 +18,11 @@ class: multiprocessor 32-bit PA-RISC
[parisc64]
class: 64-bit PA-RISC
override-host-type: hppa64-linux-gnu
[parisc64-smp]
class: multiprocessor 64-bit PA-RISC
override-host-type: hppa64-linux-gnu
[relations]
gcc-4.1: gcc-4.1, binutils-hppa64, gcc-4.1-hppa64

8
debian/arch/i386/config vendored
View File

@ -640,7 +640,6 @@ CONFIG_HAMACHI=m
CONFIG_YELLOWFIN=m
CONFIG_R8169=m
CONFIG_R8169_VLAN=y
CONFIG_SK98LIN=m
CONFIG_VIA_VELOCITY=m
CONFIG_TIGON3=m
CONFIG_BNX2=m
@ -836,6 +835,12 @@ CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
CONFIG_ISDN_CAPI_CAPIFS=m
CONFIG_ISDN_CAPI_CAPIDRV=m
CONFIG_CAPI_AVM=y
CONFIG_ISDN_DRV_AVMB1_B1ISA=m
CONFIG_ISDN_DRV_AVMB1_B1PCI=m
CONFIG_ISDN_DRV_AVMB1_T1ISA=m
CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
CONFIG_ISDN_DRV_AVMB1_T1PCI=m
CONFIG_ISDN_DRV_AVMB1_C4=m
CONFIG_CAPI_EICON=y
CONFIG_ISDN_DIVAS=m
CONFIG_ISDN_DIVAS_BRIPCI=y
@ -1596,7 +1601,6 @@ CONFIG_EFI_PARTITION=y
CONFIG_PROFILING=y
CONFIG_OPROFILE=m
# CONFIG_KPROBES is not set
# CONFIG_4KSTACKS is not set
CONFIG_X86_FIND_SMP_CONFIG=y
CONFIG_X86_MPPARSE=y
CONFIG_CRYPTO_AES_586=m

8
debian/arch/i386/config.486 vendored
View File

@ -61,14 +61,6 @@ CONFIG_MADGEMC=m
CONFIG_ISDN_DRV_LOOP=m
CONFIG_HYSDN=m
CONFIG_HYSDN_CAPI=y
CONFIG_ISDN_DRV_AVMB1_B1ISA=m
CONFIG_ISDN_DRV_AVMB1_B1PCI=m
CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
CONFIG_ISDN_DRV_AVMB1_T1ISA=m
CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
CONFIG_ISDN_DRV_AVMB1_T1PCI=m
CONFIG_ISDN_DRV_AVMB1_C4=m
CONFIG_COMPUTONE=m
CONFIG_DIGIEPCA=m
CONFIG_MOXA_INTELLIO=m

6
debian/arch/i386/config.686 vendored
View File

@ -41,12 +41,6 @@ CONFIG_HAVE_DEC_LOCK=y
# CONFIG_PCMCIA_XIRTULIP is not set
# CONFIG_ISDN_DRV_LOOP is not set
# CONFIG_HYSDN is not set
# CONFIG_ISDN_DRV_AVMB1_B1ISA is not set
# CONFIG_ISDN_DRV_AVMB1_B1PCI is not set
# CONFIG_ISDN_DRV_AVMB1_T1ISA is not set
# CONFIG_ISDN_DRV_AVMB1_B1PCMCIA is not set
# CONFIG_ISDN_DRV_AVMB1_T1PCI is not set
# CONFIG_ISDN_DRV_AVMB1_C4 is not set
# CONFIG_COMPUTONE is not set
# CONFIG_DIGIEPCA is not set
# CONFIG_MOXA_INTELLIO is not set

6
debian/arch/i386/config.686-bigmem vendored
View File

@ -43,12 +43,6 @@ CONFIG_HAVE_DEC_LOCK=y
# CONFIG_PCMCIA_XIRTULIP is not set
# CONFIG_ISDN_DRV_LOOP is not set
# CONFIG_HYSDN is not set
# CONFIG_ISDN_DRV_AVMB1_B1ISA is not set
# CONFIG_ISDN_DRV_AVMB1_B1PCI is not set
# CONFIG_ISDN_DRV_AVMB1_T1ISA is not set
# CONFIG_ISDN_DRV_AVMB1_B1PCMCIA is not set
# CONFIG_ISDN_DRV_AVMB1_T1PCI is not set
# CONFIG_ISDN_DRV_AVMB1_C4 is not set
# CONFIG_COMPUTONE is not set
# CONFIG_DIGIEPCA is not set
# CONFIG_MOXA_INTELLIO is not set

12
debian/arch/i386/config.k7 vendored
View File

@ -42,12 +42,12 @@ CONFIG_HAVE_DEC_LOCK=y
# CONFIG_PCMCIA_XIRTULIP is not set
# CONFIG_ISDN_DRV_LOOP is not set
# CONFIG_HYSDN is not set
# CONFIG_ISDN_DRV_AVMB1_B1ISA is not set
# CONFIG_ISDN_DRV_AVMB1_B1PCI is not set
# CONFIG_ISDN_DRV_AVMB1_T1ISA is not set
# CONFIG_ISDN_DRV_AVMB1_B1PCMCIA is not set
# CONFIG_ISDN_DRV_AVMB1_T1PCI is not set
# CONFIG_ISDN_DRV_AVMB1_C4 is not set
CONFIG_ISDN_DRV_AVMB1_B1ISA=m
CONFIG_ISDN_DRV_AVMB1_B1PCI=m
CONFIG_ISDN_DRV_AVMB1_T1ISA=m
CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
CONFIG_ISDN_DRV_AVMB1_T1PCI=m
CONFIG_ISDN_DRV_AVMB1_C4=m
# CONFIG_COMPUTONE is not set
# CONFIG_DIGIEPCA is not set
# CONFIG_MOXA_INTELLIO is not set

8
debian/arch/i386/xen-vserver/defines vendored
View File

@ -13,8 +13,12 @@ suggests: grub (>= 0.97-16)
type: plain-xen
[xen]
flavour: i386
flavour: i386-pae
[686]
class: i686
longclass: i686 and compatible
[686_image]
configs: i386/config.686
configs: i386/config.686-bigmem

16
debian/arch/i386/xen/defines vendored
View File

@ -1,21 +1,23 @@
[base]
flavours:
686
k7
[image]
configs: i386/xen/config _xen/config
configs:
i386/xen/config
_xen/config
initramfs-generators: initramfs-tools
recommends: libc6-xen
suggests: grub (>= 0.97-16)
type: plain-xen
[xen]
flavour: i386
flavour: i386-pae
[686]
class: i686
longclass: i686 and compatible
[686_image]
configs: i386/config.686
[k7_image]
configs: i386/config.k7
configs: i386/config.686-bigmem

6
debian/arch/ia64/config vendored
View File

@ -236,6 +236,7 @@ CONFIG_BLK_DEV_PDC202XX_NEW=m
# CONFIG_PDC202XX_FORCE is not set
CONFIG_BLK_DEV_SVWKS=m
CONFIG_BLK_DEV_SGIIOC4=m
CONFIG_BLK_DEV_SGIIOC3=m
CONFIG_BLK_DEV_SIIMAGE=m
CONFIG_BLK_DEV_SLC90E66=m
CONFIG_BLK_DEV_TRM290=m
@ -654,6 +655,7 @@ CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_SERIAL_SGI_L1_CONSOLE=y
CONFIG_SERIAL_JSM=m
CONFIG_SERIAL_SGI_IOC4=m
CONFIG_SERIAL_SGI_IOC3=m
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
@ -685,7 +687,7 @@ CONFIG_RAW_DRIVER=m
# CONFIG_HPET is not set
CONFIG_MAX_RAW_DEVS=256
CONFIG_HANGCHECK_TIMER=m
# CONFIG_MMTIMER is not set
CONFIG_MMTIMER=m
CONFIG_I2C=m
CONFIG_I2C_CHARDEV=m
CONFIG_I2C_ALGOBIT=m
@ -1122,6 +1124,7 @@ CONFIG_MMC_BLOCK=m
CONFIG_INFINIBAND=m
CONFIG_INFINIBAND_MTHCA=m
CONFIG_INFINIBAND_IPOIB=m
CONFIG_SGI_IOC4=m
CONFIG_SGI_IOC3=m
CONFIG_JBD=m
CONFIG_FS_MBCACHE=m
@ -1223,7 +1226,6 @@ CONFIG_LOG_BUF_SHIFT=16
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_FS is not set
# CONFIG_KPROBES is not set
CONFIG_IA64_GRANULE_16MB=y
# CONFIG_IA64_GRANULE_64MB is not set

14
debian/arch/m68k/config.atari vendored
View File

@ -47,8 +47,10 @@ CONFIG_PPP_FILTER=y
CONFIG_PPP_ASYNC=m
CONFIG_PPP_SYNC_TTY=m
CONFIG_KEYBOARD_ATKBD=y
CONFIG_KEYBOARD_ATARI=y
# CONFIG_KEYBOARD_SUNKBD is not set
CONFIG_MOUSE_PS2=y
CONFIG_MOUSE_ATARI=y
# CONFIG_MOUSE_SERIAL is not set
# CONFIG_INPUT_JOYSTICK is not set
CONFIG_INPUT_MISC=y
@ -70,6 +72,7 @@ CONFIG_FB=y
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_TILEBLITTING is not set
CONFIG_FB_ATARI=y
CONFIG_FB_ATY=y
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_VIRTUAL is not set
@ -101,3 +104,14 @@ CONFIG_NCPFS_OS2_NS=y
# CONFIG_PARTITION_ADVANCED is not set
CONFIG_ATARI_PARTITION=y
CONFIG_CRC32=y
# enable new ethernet drivers
CONFIG_ATARI_ROM_ISA=y
CONFIG_ARANYM=y
CONFIG_NATFEAT=y
# Atari SCSI driver is buggy
# CONFIG_ATARI_SCSI is not set
# enable ethernet
CONFIG_NET_ETHERNET=y
CONFIG_ATARILANCE=y
CONFIG_ATARI_NFETH=y
CONFIG_ATARI_ETHERNEC=m

2
debian/arch/m68k/config.mac vendored
View File

@ -39,7 +39,7 @@ CONFIG_MAC_SCSI=y
CONFIG_SCSI_MAC_ESP=y
CONFIG_ADB=y
# switched off the next four CONFIG_ADB_* as requested by Finn Thain
CONFIG_ADB_MACII=n
CONFIG_ADB_MACII=y
CONFIG_ADB_MACIISI=n
CONFIG_ADB_IOP=n
CONFIG_ADB_PMU68K=n

2
debian/arch/m68k/defines vendored
View File

@ -2,7 +2,7 @@
compiler: gcc-3.3
flavours:
amiga
# atari
atari
# bvme6000
# hp
mac

1
debian/arch/mips/config.r5k-ip32 vendored
View File

@ -685,7 +685,6 @@ CONFIG_SGI_O2MACE_ETH=y
# CONFIG_SIS190 is not set
# CONFIG_SKGE is not set
# CONFIG_SKY2 is not set
# CONFIG_SK98LIN is not set
# CONFIG_TIGON3 is not set
# CONFIG_BNX2 is not set

7
debian/arch/mipsel/config.r5k-cobalt vendored
View File

@ -603,11 +603,7 @@ CONFIG_SCSI_INITIO=m
CONFIG_SCSI_INIA100=m
# CONFIG_SCSI_PPA is not set
# CONFIG_SCSI_IMM is not set
CONFIG_SCSI_SYM53C8XX_2=m
CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
# CONFIG_SCSI_SYM53C8XX_2 is not set
CONFIG_SCSI_IPR=m
# CONFIG_SCSI_IPR_TRACE is not set
# CONFIG_SCSI_IPR_DUMP is not set
@ -767,7 +763,6 @@ CONFIG_VIA_RHINE=m
# CONFIG_SIS190 is not set
# CONFIG_SKGE is not set
# CONFIG_SKY2 is not set
# CONFIG_SK98LIN is not set
# CONFIG_VIA_VELOCITY is not set
# CONFIG_TIGON3 is not set
# CONFIG_BNX2 is not set

2
debian/arch/mipsel/config.sb1-bcm91250a vendored
View File

@ -816,7 +816,7 @@ CONFIG_R8169=m
CONFIG_SIS190=m
CONFIG_SKGE=m
CONFIG_SKY2=m
CONFIG_SK98LIN=m
# CONFIG_SK98LIN is not set
CONFIG_VIA_VELOCITY=m
CONFIG_TIGON3=m
CONFIG_BNX2=m

2
debian/arch/mipsel/config.sb1a-bcm91480b vendored
View File

@ -812,7 +812,7 @@ CONFIG_R8169=m
CONFIG_SIS190=m
CONFIG_SKGE=m
CONFIG_SKY2=m
CONFIG_SK98LIN=m
# CONFIG_SK98LIN is not set
CONFIG_VIA_VELOCITY=m
CONFIG_TIGON3=m
CONFIG_BNX2=m

1
debian/arch/powerpc/config vendored
View File

@ -248,6 +248,7 @@ CONFIG_ADB_PMU=y
CONFIG_PMAC_PBOOK=y
CONFIG_PMAC_APM_EMU=m
CONFIG_PMAC_BACKLIGHT=y
CONFIG_PMAC_BACKLIGHT_LEGACY=y
CONFIG_ADB_MACIO=y
CONFIG_INPUT_ADBHID=y
CONFIG_MAC_EMUMOUSEBTN=y

1
debian/arch/sparc/config.sparc32 vendored
View File

@ -73,7 +73,6 @@ CONFIG_BLK_DEV_LOOP=m
# CONFIG_DRM is not set
# CONFIG_SCSI_DPT_I2O is not set
# CONFIG_TIGON3 is not set
# CONFIG_SK98LIN is not set
# CONFIG_IXGB is not set
# CONFIG_SUN_VIDEOPIX is not set
# CONFIG_VIDEO_DEV is not set

54
debian/bin/gencontrol.py vendored
View File

@ -7,7 +7,6 @@ from debian_linux.debian import *
class gencontrol(debian_linux.gencontrol.gencontrol):
def __init__(self):
super(gencontrol, self).__init__()
self.changelog = read_changelog()
self.process_changelog()
def do_main_setup(self, vars, makeflags, extra):
@ -91,15 +90,13 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
('kpkg-arch', 'KPKG_ARCH'),
('kpkg-subarch', 'KPKG_SUBARCH'),
('localversion', 'LOCALVERSION'),
('override-host-type', 'OVERRIDE_HOST_TYPE'),
('type', 'TYPE'),
):
if vars.has_key(i[0]):
makeflags[i[1]] = vars[i[0]]
def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
image_type_modulesextra = self.templates["control.image.type-modulesextra"]
image_type_modulesinline = self.templates["control.image.type-modulesinline"]
image_type_standalone = self.templates["control.image.type-standalone"]
headers = self.templates["control.headers"]
config_entry_base = self.config.merge('base', arch, subarch, flavour)
@ -113,23 +110,34 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
item.arches = [arch]
packages['source']['Build-Depends'].extend(relations_compiler_build_dep)
image_depends = package_relation_list()
image_relations = {
'conflicts': package_relation_list(),
'depends': package_relation_list(),
}
if vars.get('initramfs', True):
generators = vars['initramfs-generators']
config_entry_commands_initramfs = self.config.merge('commands-image-initramfs-generators', arch, subarch, flavour)
commands = [config_entry_commands_initramfs[i] for i in generators if config_entry_commands_initramfs.has_key(i)]
makeflags['INITRD_CMD'] = ' '.join(commands)
l = package_relation_group()
l.extend(generators)
image_depends.append(l)
l_depends = package_relation_group()
for i in generators:
i = config_entry_relations.get(i, i)
l_depends.append(i)
a = package_relation(i)
if a.operator is not None:
a.operator = -a.operator
image_relations['conflicts'].append(package_relation_group([a]))
image_relations['depends'].append(l_depends)
packages_dummy = []
packages_own = []
if vars['type'] == 'plain-s390-tape':
image = image_type_standalone
image = self.templates["control.image.type-standalone"]
build_modules = False
elif vars['type'] == 'plain-xen':
image = image_type_modulesextra
image = self.templates["control.image.type-modulesextra"]
build_modules = True
config_entry_xen = self.config.merge('xen', arch, subarch, flavour)
p = self.process_packages(self.templates['control.xen-linux-system'], vars)
l = package_relation_group()
@ -139,15 +147,17 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
p[0]['Depends'].append(l)
packages_dummy.extend(p)
else:
image = image_type_modulesinline
build_modules = True
image = self.templates["control.image.type-%s" % vars['type']]
#image = self.templates["control.image.type-modulesinline"]
if not vars.has_key('desc'):
vars['desc'] = None
packages_own.append(self.process_real_image(image[0], {'depends': image_depends}, config_entry_relations, vars))
packages_own.append(self.process_real_image(image[0], image_relations, config_entry_relations, vars))
packages_own.extend(self.process_packages(image[1:], vars))
if image in (image_type_modulesextra, image_type_modulesinline):
if build_modules:
makeflags['MODULES'] = True
package_headers = self.process_package(headers[0], vars)
package_headers['Depends'].extend(relations_compiler)
@ -207,8 +217,9 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
vars = {
'home': '/usr/src/kernel-patches/all/%s/debian' % self.version['linux']['upstream'],
'revisions': ' '.join([i['Version']['debian'] for i in self.changelog[::-1]]),
'source': "%(upstream)s-%(debian)s" % self.version['linux'],
'upstream': self.version['linux']['upstream'],
}
vars.update(self.version['linux'])
apply = self.substitute(apply, vars)
unpatch = self.substitute(unpatch, vars)
@ -217,6 +228,14 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
file('debian/bin/patch.unpatch', 'w').write(unpatch)
def process_changelog(self):
in_changelog = read_changelog()
act_upstream = in_changelog[0]['Version']['linux']['upstream']
changelog = []
for i in in_changelog:
if i['Version']['linux']['upstream'] != act_upstream:
break
changelog.append(i)
self.changelog = changelog
self.version = self.changelog[0]['Version']
if self.version['linux']['modifier'] is not None:
self.abiname = ''
@ -239,12 +258,7 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
def process_real_tree(self, in_entry, vars):
entry = self.process_package(in_entry, vars)
tmp = self.changelog[0]['Version']['linux']['upstream']
versions = []
for i in self.changelog:
if i['Version']['linux']['upstream'] != tmp:
break
versions.insert(0, i['Version']['linux'])
versions = [i['Version']['linux'] for i in self.changelog[::-1]]
for i in (('Depends', 'Provides')):
value = package_relation_list()
value.extend(entry.get(i, []))

249
debian/changelog vendored
View File

@ -23,7 +23,234 @@ linux-2.6 (2.6.20~rc6-1~experimental.1) UNRELEASED; urgency=low
-- Bastian Blank <waldi@debian.org> Mon, 4 Dec 2006 07:16:41 +0100
linux-2.6 (2.6.18-6) UNRELEASED; urgency=low
linux-2.6 (2.6.18.dfsg.1-9) unstable; urgency=low
[ Martin Michlmayr ]
* arm/iop32x: Enable CONFIG_IP_NF_CONNTRACK_EVENTS and _NETLINK.
* arm/ixp4xx: Enable some more I2C sensor modules.
* arm/ixp4xx: Enable CONFIG_USB_NET_RNDIS_HOST.
* arm/footbridge: Enable CONFIG_NATSEMI.
* Revert mm/msync patches because they cause filesystem corruption
(closes: #401006, #401980, #402707) ...
* ... and add an alternative msync patch from Hugh Dickins that
doesn't depend on the mm changes (closes: #394392).
* mips: provide pci_get_legacy_ide_irq needed by some IDE drivers
(see #404950).
* arm: Implement flush_anon_page(), which is needed for FUSE
(closes: #402876) and possibly dm-crypt/LUKS (see #403426).
* arm: Turn off PCI burst on the Cyber2010, otherwise X11 on
Netwinder will crash.
* arm/iop32x: Enable CONFIG_IEEE80211_SOFTMAC and drivers based
on it.
* arm/ixp4xx: Upgrade to version 0.3.1 of the IXP4xx NPE Ethernet
driver. This version fixes stuck connections, e.g. with scp and
NFS (closes: #404447).
* arm/ixp4xx: Enable CONFIG_VIDEO_CPIA_USB.
* arm/ixp4xx: Enable CONFIG_ISCSI_TCP.
* arm/iop32x: Likewise.
[ Bastian Blank ]
* Bump ABI to 4.
* Update vserver patch to 2.0.2.2-rc9. (closes: #402743, #403790)
* Update xen patch to changeset 36186 from Fedora 2.6.18 branch.
* i386/xen: Build only the pae version. (closes: #390862)
* hppa: Override host type when necessary.
* Fix tg3 reset. (closes: #405085)
[ dann frazier ]
* Fix potential fragmentation attacks in ip6_tables (CVE-2006-4572)
* Backport a number of fixes for the cciss driver
- Fix a bug with 1TB disks caused by converting total_size to an int
- Claim devices that are of the HP RAID class and have a valid cciss sig
- Make NR_CMDS a per-controller define - most can do 1024 commands, but
the E200 family can only support 128
- Change the SSID on the E500 as a workaround for a firmware bug
- Disable prefetch on the P600 controller. An ASIC bug may result in
prefetching beyond the end of physical memory
- Increase blk_queue_max_sectors from 512 to 2048 to increase performance
- Map out more memor for the PCI config table, required to reach offset
0x214 to disable DMA on the P600
- Set a default raid level on a volume that either does not support
reading the geometry or reports an invalid geometry for whatever reason
to avoid problems with buggy firmware
- Revert change that replaed XFER_READ/XFER_WRITE macros with
h->cciss_read/h->cciss_write that caused command timeouts on older
controllers on ia32 (closes: #402787)
* Fix mincore hang (CVE-2006-4814)
* ia64: turn on IOC4 modules for SGI Altix systems. Thanks to Stephane Larose
for suggesting this.
* Add versioned build dep on findutils to make sure the system find command
supports the -execdir action (closes: #405150)
* Hardcode the output of the scripts under arch/ia64/scripts as executed
in an etch environment so that we can build out of tree modules correctly
(closes: #392592)
* Update unusual_devs entry for ipod to fix an eject issue (closes: #406124)
* Re-add verify_pmtmr_rate, resolving problems seen on older K6 ASUS
boards where the ACPI PM timer runs too fast (closes: #394753)
* Avoid condition where /proc/swaps header may not be printed
(closes: #292318)
* [hppa] disable XFS until it works (closes: #350482)
[ Norbert Tretkowski ]
* libata: handle 0xff status properly. (closes: #391867)
* alpha: enabled CONFIG_SCSI_ARCMSR. (closes: #401187)
* removed BROKEN_ON_SMP dependency from I2C_ELEKTOR. (closes: #402253)
[ Christian T. Steigies ]
* m68k/atari: enable keyboard, mouse and fb drivers
* m68k/atari: fixes for ethernec and video driver by Michael Schmitz
* m68k/atari: fixes for scsi driver by Michael Schmitz
* m68k/mac: fixes for mace and cuda driver by Finn Thain
* m68k/atari: fixes for ide driver by Michael Schmitz
* m68k/atari: fixes for ide driver by Michael Schmitz
* m68k/atari: fixes for ethernec and atakeyb driver by Michael Schmitz, build ethernec as module
* m68k/mac: fixes for mace and adb driver by Finn Thain
[ maximilian attems ]
* Add stable release 2.6.18.6:
- EBTABLES: Fix wraparounds in ebt_entries verification.
- EBTABLES: Verify that ebt_entries have zero ->distinguisher.
- EBTABLES: Deal with the worst-case behaviour in loop checks.
- EBTABLES: Prevent wraparounds in checks for entry components' sizes.
- skip data conversion in compat_sys_mount when data_page is NULL
- bonding: incorrect bonding state reported via ioctl
- x86-64: Mark rdtsc as sync only for netburst, not for core2
(closes: #406767)
- dm crypt: Fix data corruption with dm-crypt over RAID5 (closes: #402812)
- forcedeth: Disable INTx when enabling MSI in forcedeth
- PKT_SCHED act_gact: division by zero
- XFRM: Use output device disable_xfrm for forwarded packets
- IPSEC: Fix inetpeer leak in ipv4 xfrm dst entries.
- V4L: Fix broken TUNER_LG_NTSC_TAPE radio support
- m32r: make userspace headers platform-independent
- IrDA: Incorrect TTP header reservation
- SUNHME: Fix for sunhme failures on x86
- Bluetooth: Add packet size checks for CAPI messages (CVE-2006-6106)
- softmac: remove netif_tx_disable when scanning
- DVB: lgdt330x: fix signal / lock status detection bug
- dm snapshot: fix freeing pending exception
- NET_SCHED: policer: restore compatibility with old iproute binaries
- NETFILTER: ip_tables: revision support for compat code
- ARM: Add sys_*at syscalls
- ieee1394: ohci1394: add PPC_PMAC platform code to driver probe
- softirq: remove BUG_ONs which can incorrectly trigger
* Hand-picked from stable release 2.6.16.30:
- [PPPOE]: Advertise PPPoE MTU
* Hand-picked from stable release 2.6.16.31:
- [NETFILTER]: Fix ip6_tables extension header bypass bug (CVE-2006-4572)
- fix RARP ic_servaddr breakage
* Hand-picked from stable release 2.6.16.32:
- drivers/telephony/ixj: fix an array overrun
- flush D-cache in failure path
* Hand-picked from stable release 2.6.16.33:
- Add new PHY to sis900 supported list
- ipmi_si_intf.c: fix "&& 0xff" typos
- drivers/scsi/psi240i.c: fix an array overrun
* Hand-picked from stable release 2.6.16.34:
- [IPX]: Annotate and fix IPX checksum
- [IGMP]: Fix IGMPV3_EXP() normalization bit shift value.
* Hand-picked from stable release 2.6.16.35:
- sgiioc4: Disable module unload
- Fix a masking bug in the 6pack driver.
- drivers/usb/input/ati_remote.c: fix cut'n'paste error
- proper flags type of spin_lock_irqsave()
* Hand-picked from stable release 2.6.16.37:
- [CRYPTO] sha512: Fix sha384 block size
- [SCSI] gdth: Fix && typos
- Fix SUNRPC wakeup/execute race condition
* Enable DEBUG_FS for usbmon in generic config. Don't disable it on alpha,
amd64, hppa and ia64. (closes: 378542)
* Backport a number of upstream fixes for the r8169 driver, needed for
network performance (closes: 388870, 400524)
- r8169: more alignment for the 0x8168
- r8169: phy program update
- r8169: more magic during initialization of the hardware
- r8169: perform a PHY reset before any other operation at boot time
- r8169: Fix iteration variable sign
- r8169: remove extraneous Cmd{Tx/Rx}Enb write
* sound: hda: detect ALC883 on MSI K9A Platinum motherboards (MS-7280)
patch from Leonard Norrgard <leonard.norrgard@refactor.fi>
* tulip: Add i386 specific patch to remove duplicate pci ids.
Thanks Jurij Smakov <jurij@wooyd.org> (closes: #334104, #405203)
* amd64, i386: Disable SK98LIN as SKGE is the modern capable driver.
(closes: 405196)
* Backout net-bcm43xx_netdev_watchdog.patch and push 2.6.18.2 fix.
(closes: 402475)
[ Jurij Smakov ]
* Add bugfix/sparc/isa-dev-no-reg.patch to make sure that
isa_dev_get_resource() can deal with devices which do not have a 'reg'
PROM property. Failure to handle such devices properly resulted in an
oops during boot on Netra X1. Thanks to Richard Mortimer for debugging
and patch. (closes: #404216)
* Add bugfix/sparc/ehci-hub-contol-alignment.patch to prevent unaligned
memory accesses in ehci-hub-control() by adding an alignment attribute
to the tbuf array declaration. Thanks to David Miller for the patch.
[ Sven Luther ]
* [powerpc] Enable CONFIG_PMAC_BACKLIGHT_LEGACY (Closes: #407671).
-- Bastian Blank <waldi@debian.org> Wed, 24 Jan 2007 13:21:51 +0100
linux-2.6 (2.6.18-8) unstable; urgency=low
* Fix relations in the generated control file. (closes: #400544)
* Add stable release 2.6.18.4:
- bridge: fix possible overflow in get_fdb_entries (CVE-2006-5751)
* Add stable release 2.6.18.5:
- pcmcia: fix 'rmmod pcmcia' with unbound devices
- BLUETOOTH: Fix unaligned access in hci_send_to_sock.
- alpha: Fix ALPHA_EV56 dependencies typo
- TG3: Add missing unlock in tg3_open() error path.
- softmac: fix a slab corruption in WEP restricted key association
- AGP: Allocate AGP pages with GFP_DMA32 by default
- V4L: Do not enable VIDEO_V4L2 unconditionally
- bcm43xx: Drain TX status before starting IRQs
- fuse: fix Oops in lookup
- UDP: Make udp_encap_rcv use pskb_may_pull
- NETFILTER: Missing check for CAP_NET_ADMIN in iptables compat layer
- NETFILTER: ip_tables: compat error way cleanup
- NETFILTER: ip_tables: fix module refcount leaks in compat error paths
- NETFILTER: Missed and reordered checks in {arp,ip,ip6}_tables
- NETFILTER: arp_tables: missing unregistration on module unload
- NETFILTER: Kconfig: fix xt_physdev dependencies
- NETFILTER: xt_CONNSECMARK: fix Kconfig dependencies
- NETFILTER: H.323 conntrack: fix crash with CONFIG_IP_NF_CT_ACCT
- IA64: bte_unaligned_copy() transfers one extra cache line.
- x86 microcode: don't check the size
- scsi: clear garbage after CDBs on SG_IO
- IPV6: Fix address/interface handling in UDP and DCCP, according to the scoping architecture.
* Revert abi changing patch from 2.6.18.5.
-- Bastian Blank <waldi@debian.org> Sun, 10 Dec 2006 17:51:53 +0100
linux-2.6 (2.6.18-7) unstable; urgency=low
[ Bastian Blank ]
* Emit conflict lines for initramfs generators. (closes: #400305)
* Update vserver patch to 2.0.2.2-rc8.
* s390: Add patch to fix posix types.
[ Martin Michlmayr ]
* r8169: Add an option to ignore parity errors.
* r8169: Ignore parity errors on the Thecus N2100.
* rtc: Add patch from Riku Voipio to get RS5C372 going on the N2100.
* arm/iop32x: Build RS5C372 support into the kernel.
[ maximilian attems ]
* hfs: Fix up error handling in HFS. (MOKB-14-11-2006)
* sata: Avoid null pointer dereference in SATA Promise.
* cifs: Set CIFS preferred IO size.
[ Jurij Smakov ]
* Add bugfix/sunhme-pci-enable.patch, fixing the failure of sunhme
driver on x86/PCI hosts due to missing pci_enable_device() and
pci_set_master() calls, lost during code refactoring upstream.
(closes: #397460)
-- Bastian Blank <waldi@debian.org> Mon, 4 Dec 2006 15:20:30 +0100
linux-2.6 (2.6.18-6) unstable; urgency=low
[ maximilian attems ]
* Enable the new ACT modules globally. They were already set for amd64, hppa
@ -35,9 +262,8 @@ linux-2.6 (2.6.18-6) UNRELEASED; urgency=low
- mm: small cleanup of install_page()
- mm: fixup do_wp_page()
- mm: msync() cleanup (closes: #394392)
* Add another bcm43xx patch queued for 2.6.18.3.
* [i386] Enable CONFIG_USB_APPLETOUCH=m (closes: #382298)
* Add stable release 2.6.18.2:
* [amd64,i386] Enable CONFIG_USB_APPLETOUCH=m (closes: #382298)
* Add stable release 2.6.18.3:
- x86_64: Fix FPU corruption
- e1000: Fix regression: garbled stats and irq allocation during swsusp
- POWERPC: Make alignment exception always check exception table
@ -77,11 +303,15 @@ linux-2.6 (2.6.18-6) UNRELEASED; urgency=low
[ Martin Michlmayr ]
* arm: Set CONFIG_BINFMT_MISC=m
* arm/ixp4xx: Set CONFIG_ATM=m so CONFIG_USB_ATM has an effect.
* arm/ixp4xx: Set CONFIG_ATM=m (and related modules) so CONFIG_USB_ATM has
an effect.
* arm/iop32x: Likewise.
* arm/s3c2410: Unset CONFIG_PM_LEGACY.
* arm/versatile: Fix Versatile PCI config byte accesses
* arm/ixp4xx: Swap the disk 1 and disk 2 LED definitions so they're right.
* mipsel/r5k-cobalt: Unset CONFIG_SCSI_SYM53C8XX_2 because the timeout is
just too long.
* arm/ixp4xx: Enable more V4L USB devices.
[ dann frazier ]
* Backport various SCTP changesets from 2.6.19, recommended by Vlad Yasevich
@ -101,7 +331,14 @@ linux-2.6 (2.6.18-6) UNRELEASED; urgency=low
* Added support for TI ez430 development tool ID in ti_usb.
Thanks to Oleg Verych for providing the patch.
-- maximilian attems <maks@sternwelten.at> Sun, 19 Nov 2006 11:58:09 +0100
[ Christian T. Steigies ]
* Added support for Atari EtherNEC, Aranym, video, keyboard, mouse, and serial
by Michael Schmitz
[ Bastian Blank ]
* [i386] Reenable AVM isdn card modules. (closes: #386872)
-- Bastian Blank <waldi@debian.org> Tue, 21 Nov 2006 11:28:09 +0100
linux-2.6 (2.6.18-5) unstable; urgency=low

74
debian/lib/python/debian_linux/debian.py vendored
View File

@ -24,7 +24,6 @@ def read_changelog(dir = ''):
""", re.VERBOSE)
f = file(os.path.join(dir, "debian/changelog"))
entries = []
act_upstream = None
while True:
line = f.readline()
if not line:
@ -39,10 +38,6 @@ def read_changelog(dir = ''):
e['Source'] = match.group('header_source')
version = parse_version(match.group('header_version'))
e['Version'] = version
if act_upstream is None:
act_upstream = version['upstream']
elif version['upstream'] != act_upstream:
break
entries.append(e)
return entries
@ -80,6 +75,9 @@ def parse_version_linux(version):
.+?
)
)?
(?:
\.dfsg\.\d+
)?
-
(?P<debian>[^-]+)
)
@ -88,14 +86,7 @@ $
match = re.match(version_re, version, re.X)
if match is None:
raise ValueError
ret = match.groupdict()
if ret['modifier'] is not None:
ret['upstream'] = '%s-%s' % (ret['version'], ret['modifier'])
ret['source_upstream'] = '%s~%s' % (ret['version'], ret['modifier'])
else:
ret['upstream'] = ret['version']
ret['source_upstream'] = ret['version']
return ret
return match.groupdict()
class package_description(object):
__slots__ = "short", "long"
@ -122,22 +113,60 @@ class package_description(object):
self.long.extend(str.split("\n.\n"))
class package_relation(object):
__slots__ = "name", "version", "arches"
__slots__ = "name", "operator", "version", "arches"
_re = re.compile(r'^(\S+)(?: \(([^)]+)\))?(?: \[([^]]+)\])?$')
_re = re.compile(r'^(\S+)(?: \((<<|<=|=|!=|>=|>>)\s*([^)]+)\))?(?: \[([^]]+)\])?$')
class _operator(object):
OP_LT = 1
OP_LE = 2
OP_EQ = 3
OP_NE = 4
OP_GE = 5
OP_GT = 6
operators = {
'<<': OP_LT,
'<=': OP_LE,
'=': OP_EQ,
'!=': OP_NE,
'>=': OP_GE,
'>>': OP_GT,
}
operators_neg = {
OP_LT: OP_GE,
OP_LE: OP_GT,
OP_EQ: OP_NE,
OP_NE: OP_EQ,
OP_GE: OP_LT,
OP_GT: OP_LE,
}
operators_text = dict([(b, a) for a, b in operators.iteritems()])
__slots__ = '_op',
def __init__(self, value):
self._op = self.operators[value]
def __neg__(self):
return self.__class__(self.operators_text[self.operators_neg[self._op]])
def __str__(self):
return self.operators_text[self._op]
def __init__(self, value = None):
if value is not None:
self.parse(value)
else:
self.name = None
self.operator = None
self.version = None
self.arches = []
def __str__(self):
ret = [self.name]
if self.version is not None:
ret.extend([' (', self.version, ')'])
if self.operator is not None and self.version is not None:
ret.extend([' (', str(self.operator), ' ', self.version, ')'])
if self.arches:
ret.extend([' [', ' '.join(self.arches), ']'])
return ''.join(ret)
@ -156,9 +185,13 @@ class package_relation(object):
raise RuntimeError, "Can't parse dependency %s" % value
match = match.groups()
self.name = match[0]
self.version = match[1]
if match[2] is not None:
self.arches = re.split('\s+', match[2])
if match[1] is not None:
self.operator = self._operator(match[1])
else:
self.operator = None
self.version = match[2]
if match[3] is not None:
self.arches = re.split('\s+', match[3])
else:
self.arches = []
@ -252,6 +285,7 @@ class package(dict):
('Build-Depends', package_relation_list),
('Build-Depends-Indep', package_relation_list),
('Provides', package_relation_list),
('Pre-Depends', package_relation_list),
('Depends', package_relation_list),
('Recommends', package_relation_list),
('Suggests', package_relation_list),

3
debian/lib/python/debian_linux/gencontrol.py vendored
View File

@ -202,6 +202,7 @@ class gencontrol(object):
for in_item in in_groups:
item = package_relation()
item.name = self.substitute(in_item.name, vars)
item.operator = in_item.operator
if in_item.version is not None:
item.version = self.substitute(in_item.version, vars)
item.arches = in_item.arches
@ -240,7 +241,7 @@ class gencontrol(object):
return {
'upstreamversion': version['linux']['upstream'],
'version': version['linux']['version'],
'source_upstream': version['linux']['source_upstream'],
'source_upstream': version['upstream'],
'major': version['linux']['major'],
'abiname': abiname,
}

33
debian/patches/debian/dfsg/drivers-media-video-dabus.patch vendored Normal file
View File

@ -0,0 +1,33 @@
diff -ruN a/drivers/media/Kconfig b/drivers/media/Kconfig
--- a/drivers/media/Kconfig 2006-09-20 03:42:06.000000000 +0000
+++ b/drivers/media/Kconfig 2007-01-05 16:43:58.000000000 +0000
@@ -82,18 +82,4 @@
config VIDEO_TVEEPROM
tristate
-config USB_DABUSB
- tristate "DABUSB driver"
- depends on USB
- ---help---
- A Digital Audio Broadcasting (DAB) Receiver for USB and Linux
- brought to you by the DAB-Team
- <http://wwwbode.cs.tum.edu/Par/arch/dab/>. This driver can be taken
- as an example for URB-based bulk, control, and isochronous
- transactions. URB's are explained in
- <Documentation/usb/URB.txt>.
-
- To compile this driver as a module, choose M here: the
- module will be called dabusb.
-
endmenu
diff -ruN a/drivers/media/video/Makefile b/drivers/media/video/Makefile
--- a/drivers/media/video/Makefile 2006-09-20 03:42:06.000000000 +0000
+++ b/drivers/media/video/Makefile 2007-01-05 16:43:45.000000000 +0000
@@ -76,7 +76,6 @@
obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o
obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o
-obj-$(CONFIG_USB_DABUSB) += dabusb.o
obj-$(CONFIG_USB_OV511) += ov511.o
obj-$(CONFIG_USB_SE401) += se401.o
obj-$(CONFIG_USB_STV680) += stv680.o

45
debian/patches/debian/dfsg/drivers-net-appletalk-cops.patch vendored Normal file
View File

@ -0,0 +1,45 @@
diff -ruN a/drivers/net/appletalk/Kconfig b/drivers/net/appletalk/Kconfig
--- a/drivers/net/appletalk/Kconfig 2006-11-29 21:57:37.000000000 +0000
+++ b/drivers/net/appletalk/Kconfig 2007-01-05 15:34:44.000000000 +0000
@@ -49,32 +49,6 @@
This driver is experimental, which means that it may not work.
See the file <file:Documentation/networking/ltpc.txt>.
-config COPS
- tristate "COPS LocalTalk PC support"
- depends on DEV_APPLETALK && (ISA || EISA)
- help
- This allows you to use COPS AppleTalk cards to connect to LocalTalk
- networks. You also need version 1.3.3 or later of the netatalk
- package. This driver is experimental, which means that it may not
- work. This driver will only work if you choose "AppleTalk DDP"
- networking support, above.
- Please read the file <file:Documentation/networking/cops.txt>.
-
-config COPS_DAYNA
- bool "Dayna firmware support"
- depends on COPS
- help
- Support COPS compatible cards with Dayna style firmware (Dayna
- DL2000/ Daynatalk/PC (half length), COPS LT-95, Farallon PhoneNET PC
- III, Farallon PhoneNET PC II).
-
-config COPS_TANGENT
- bool "Tangent firmware support"
- depends on COPS
- help
- Support COPS compatible cards with Tangent style firmware (Tangent
- ATB_II, Novell NL-1000, Daystar Digital LT-200.
-
config IPDDP
tristate "Appletalk-IP driver support"
depends on DEV_APPLETALK && ATALK
diff -ruN a/drivers/net/appletalk/Makefile b/drivers/net/appletalk/Makefile
--- a/drivers/net/appletalk/Makefile 2006-11-29 21:57:37.000000000 +0000
+++ b/drivers/net/appletalk/Makefile 2007-01-05 15:34:11.000000000 +0000
@@ -3,5 +3,4 @@
#
obj-$(CONFIG_IPDDP) += ipddp.o
-obj-$(CONFIG_COPS) += cops.o
obj-$(CONFIG_LTPC) += ltpc.o

36
debian/patches/debian/dfsg/drivers-net-dgrs.patch vendored Normal file
View File

@ -0,0 +1,36 @@
diff -ruN a/drivers/net/Kconfig b/drivers/net/Kconfig
--- a/drivers/net/Kconfig 2006-09-20 03:42:06.000000000 +0000
+++ b/drivers/net/Kconfig 2007-01-05 16:45:01.000000000 +0000
@@ -1430,21 +1430,6 @@
tristate "TOSHIBA TC35815 Ethernet support"
depends on NET_PCI && PCI && TOSHIBA_JMR3927
-config DGRS
- tristate "Digi Intl. RightSwitch SE-X support"
- depends on NET_PCI && (PCI || EISA)
- ---help---
- This is support for the Digi International RightSwitch series of
- PCI/EISA Ethernet switch cards. These include the SE-4 and the SE-6
- models. If you have a network card of this type, say Y and read the
- Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>. More specific
- information is contained in <file:Documentation/networking/dgrs.txt>.
-
- To compile this driver as a module, choose M here and read
- <file:Documentation/networking/net-modules.txt>. The module
- will be called dgrs.
-
config EEPRO100
tristate "EtherExpressPro/100 support (eepro100, original Becker driver)"
depends on NET_PCI && PCI
diff -ruN a/drivers/net/Makefile b/drivers/net/Makefile
--- a/drivers/net/Makefile 2006-09-20 03:42:06.000000000 +0000
+++ b/drivers/net/Makefile 2007-01-05 16:45:01.000000000 +0000
@@ -41,7 +41,6 @@
obj-$(CONFIG_OAKNET) += oaknet.o 8390.o
-obj-$(CONFIG_DGRS) += dgrs.o
obj-$(CONFIG_VORTEX) += 3c59x.o
obj-$(CONFIG_TYPHOON) += typhoon.o
obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o

59
debian/patches/debian/dfsg/drivers-net-tokenring-3c359-smctr.patch vendored Normal file
View File

@ -0,0 +1,59 @@
diff -ruN a/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig
--- a/drivers/net/tokenring/Kconfig 2006-11-29 21:57:37.000000000 +0000
+++ b/drivers/net/tokenring/Kconfig 2007-01-05 15:26:27.000000000 +0000
@@ -64,24 +64,6 @@
To compile this driver as a module, choose M here: the module will be
called lanstreamer.
-config 3C359
- tristate "3Com 3C359 Token Link Velocity XL adapter support"
- depends on TR && PCI
- ---help---
- This is support for the 3Com PCI Velocity XL cards, specifically
- the 3Com 3C359, please note this is not for the 3C339 cards, you
- should use the tms380 driver instead.
-
- If you have such an adapter, say Y and read the Token-Ring
- mini-HOWTO, available from <http://www.tldp.org/docs.html#howto>.
-
- To compile this driver as a module, choose M here: the module will be
- called 3c359.
-
- Also read the file <file:Documentation/networking/3c359.txt> or check the
- Linux Token Ring Project site for the latest information at
- <http://www.linuxtr.net>
-
config TMS380TR
tristate "Generic TMS380 Token Ring ISA/PCI adapter support"
depends on TR && (PCI || ISA && ISA_DMA_API || MCA)
@@ -166,21 +148,5 @@
To compile this driver as a module, choose M here: the module will be
called madgemc.
-config SMCTR
- tristate "SMC ISA/MCA adapter support"
- depends on TR && (ISA || MCA_LEGACY) && (BROKEN || !64BIT)
- ---help---
- This is support for the ISA and MCA SMC Token Ring cards,
- specifically SMC TokenCard Elite (8115T) and SMC TokenCard Elite/A
- (8115T/A) adapters.
-
- If you have such an adapter and would like to use it, say Y or M and
- read the Token-Ring mini-HOWTO, available from
- <http://www.tldp.org/docs.html#howto> and the file
- <file:Documentation/networking/smctr.txt>.
-
- To compile this driver as a module, choose M here: the module will be
- called smctr.
-
endmenu
diff -ruN a/drivers/net/tokenring/Makefile b/drivers/net/tokenring/Makefile
--- a/drivers/net/tokenring/Makefile 2006-11-29 21:57:37.000000000 +0000
+++ b/drivers/net/tokenring/Makefile 2007-01-05 15:26:04.000000000 +0000
@@ -11,5 +11,3 @@
obj-$(CONFIG_PROTEON) += proteon.o
obj-$(CONFIG_TMSPCI) += tmspci.o
obj-$(CONFIG_SKISA) += skisa.o
-obj-$(CONFIG_SMCTR) += smctr.o
-obj-$(CONFIG_3C359) += 3c359.o

50
debian/patches/debian/dfsg/drivers-usb-misc-emi62-emi26.patch vendored Normal file
View File

@ -0,0 +1,50 @@
diff -ruN a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
--- a/drivers/usb/misc/Kconfig 2006-09-20 03:42:06.000000000 +0000
+++ b/drivers/usb/misc/Kconfig 2007-01-05 17:02:19.000000000 +0000
@@ -4,34 +4,6 @@
comment "USB Miscellaneous drivers"
depends on USB
-config USB_EMI62
- tristate "EMI 6|2m USB Audio interface support"
- depends on USB
- ---help---
- This driver loads firmware to Emagic EMI 6|2m low latency USB
- Audio and Midi interface.
-
- After firmware load the device is handled with standard linux
- USB Audio driver.
-
- This code is also available as a module ( = code which can be
- inserted in and removed from the running kernel whenever you want).
- The module will be called audio. If you want to compile it as a
- module, say M here and read <file:Documentation/kbuild/modules.txt>.
-
-config USB_EMI26
- tristate "EMI 2|6 USB Audio interface support"
- depends on USB
- ---help---
- This driver loads firmware to Emagic EMI 2|6 low latency USB
- Audio interface.
-
- After firmware load the device is handled with standard linux
- USB Audio driver.
-
- To compile this driver as a module, choose M here: the
- module will be called emi26.
-
config USB_AUERSWALD
tristate "USB Auerswald ISDN support (EXPERIMENTAL)"
depends on USB && EXPERIMENTAL
diff -ruN a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile
--- a/drivers/usb/misc/Makefile 2006-09-20 03:42:06.000000000 +0000
+++ b/drivers/usb/misc/Makefile 2007-01-05 17:01:14.000000000 +0000
@@ -6,8 +6,6 @@
obj-$(CONFIG_USB_AUERSWALD) += auerswald.o
obj-$(CONFIG_USB_CYPRESS_CY7C63)+= cypress_cy7c63.o
obj-$(CONFIG_USB_CYTHERM) += cytherm.o
-obj-$(CONFIG_USB_EMI26) += emi26.o
-obj-$(CONFIG_USB_EMI62) += emi62.o
obj-$(CONFIG_USB_IDMOUSE) += idmouse.o
obj-$(CONFIG_USB_LCD) += usblcd.o
obj-$(CONFIG_USB_LD) += ldusb.o

113
debian/patches/debian/dfsg/drivers-usb-serial-keyspan.patch vendored Normal file
View File

@ -0,0 +1,113 @@
diff -ruN a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
--- a/drivers/usb/serial/Kconfig 2006-09-20 03:42:06.000000000 +0000
+++ b/drivers/usb/serial/Kconfig 2007-01-05 17:04:16.000000000 +0000
@@ -274,98 +274,6 @@
To compile this driver as a module, choose M here: the
module will be called keyspan_pda.
-config USB_SERIAL_KEYSPAN
- tristate "USB Keyspan USA-xxx Serial Driver"
- depends on USB_SERIAL
- ---help---
- Say Y here if you want to use Keyspan USB to serial converter
- devices. This driver makes use of Keyspan's official firmware
- and was developed with their support. You must also include
- firmware to support your particular device(s).
-
- See <http://misc.nu/hugh/keyspan.html> for more information.
-
- To compile this driver as a module, choose M here: the
- module will be called keyspan.
-
-config USB_SERIAL_KEYSPAN_MPR
- bool "USB Keyspan MPR Firmware"
- depends on USB_SERIAL_KEYSPAN
- help
- Say Y here to include firmware for the Keyspan MPR converter.
-
-config USB_SERIAL_KEYSPAN_USA28
- bool "USB Keyspan USA-28 Firmware"
- depends on USB_SERIAL_KEYSPAN
- help
- Say Y here to include firmware for the USA-28 converter.
-
-config USB_SERIAL_KEYSPAN_USA28X
- bool "USB Keyspan USA-28X Firmware"
- depends on USB_SERIAL_KEYSPAN
- help
- Say Y here to include firmware for the USA-28X converter.
- Be sure you have a USA-28X, there are also 28XA and 28XB
- models, the label underneath has the actual part number.
-
-config USB_SERIAL_KEYSPAN_USA28XA
- bool "USB Keyspan USA-28XA Firmware"
- depends on USB_SERIAL_KEYSPAN
- help
- Say Y here to include firmware for the USA-28XA converter.
- Be sure you have a USA-28XA, there are also 28X and 28XB
- models, the label underneath has the actual part number.
-
-config USB_SERIAL_KEYSPAN_USA28XB
- bool "USB Keyspan USA-28XB Firmware"
- depends on USB_SERIAL_KEYSPAN
- help
- Say Y here to include firmware for the USA-28XB converter.
- Be sure you have a USA-28XB, there are also 28X and 28XA
- models, the label underneath has the actual part number.
-
-config USB_SERIAL_KEYSPAN_USA19
- bool "USB Keyspan USA-19 Firmware"
- depends on USB_SERIAL_KEYSPAN
- help
- Say Y here to include firmware for the USA-19 converter.
-
-config USB_SERIAL_KEYSPAN_USA18X
- bool "USB Keyspan USA-18X Firmware"
- depends on USB_SERIAL_KEYSPAN
- help
- Say Y here to include firmware for the USA-18X converter.
-
-config USB_SERIAL_KEYSPAN_USA19W
- bool "USB Keyspan USA-19W Firmware"
- depends on USB_SERIAL_KEYSPAN
- help
- Say Y here to include firmware for the USA-19W converter.
-
-config USB_SERIAL_KEYSPAN_USA19QW
- bool "USB Keyspan USA-19QW Firmware"
- depends on USB_SERIAL_KEYSPAN
- help
- Say Y here to include firmware for the USA-19QW converter.
-
-config USB_SERIAL_KEYSPAN_USA19QI
- bool "USB Keyspan USA-19QI Firmware"
- depends on USB_SERIAL_KEYSPAN
- help
- Say Y here to include firmware for the USA-19QI converter.
-
-config USB_SERIAL_KEYSPAN_USA49W
- bool "USB Keyspan USA-49W Firmware"
- depends on USB_SERIAL_KEYSPAN
- help
- Say Y here to include firmware for the USA-49W converter.
-
-config USB_SERIAL_KEYSPAN_USA49WLC
- bool "USB Keyspan USA-49WLC Firmware"
- depends on USB_SERIAL_KEYSPAN
- help
- Say Y here to include firmware for the USA-49WLC converter.
-
config USB_SERIAL_KLSI
tristate "USB KL5KUSB105 (Palmconnect) Driver (EXPERIMENTAL)"
depends on USB_SERIAL && EXPERIMENTAL
diff -ruN a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile
--- a/drivers/usb/serial/Makefile 2006-09-20 03:42:06.000000000 +0000
+++ b/drivers/usb/serial/Makefile 2007-01-05 17:04:16.000000000 +0000
@@ -28,7 +28,6 @@
obj-$(CONFIG_USB_SERIAL_IPAQ) += ipaq.o
obj-$(CONFIG_USB_SERIAL_IPW) += ipw.o
obj-$(CONFIG_USB_SERIAL_IR) += ir-usb.o
-obj-$(CONFIG_USB_SERIAL_KEYSPAN) += keyspan.o
obj-$(CONFIG_USB_SERIAL_KEYSPAN_PDA) += keyspan_pda.o
obj-$(CONFIG_USB_SERIAL_KLSI) += kl5kusb105.o
obj-$(CONFIG_USB_SERIAL_KOBIL_SCT) += kobil_sct.o

46
debian/patches/debian/dfsg/files-1 vendored Normal file
View File

@ -0,0 +1,46 @@
drivers/media/video/dabfirmware.h
drivers/media/video/dabusb.c
drivers/media/video/dabusb.h
drivers/net/dgrs.c
drivers/net/dgrs_es4h.h
drivers/net/dgrs.h
drivers/net/dgrs_ether.h
drivers/net/dgrs_firmware.c
drivers/net/dgrs_asstruct.h
drivers/net/dgrs_plx9060.h
drivers/net/dgrs_i82596.h
drivers/net/dgrs_bcomm.h
drivers/usb/misc/emi62.c
drivers/usb/misc/emi62_fw_s.h
drivers/usb/misc/emi62_fw_m.h
drivers/usb/misc/emi26.c
drivers/usb/misc/emi26_fw.h
drivers/net/tokenring/3c359_microcode.h
drivers/net/tokenring/3c359.h
drivers/net/tokenring/3c359.c
drivers/net/tokenring/smctr.h
drivers/net/tokenring/smctr_firmware.h
drivers/net/tokenring/smctr.c
drivers/net/appletalk/cops.h
drivers/net/appletalk/cops_ltdrv.h
drivers/net/appletalk/cops.c
drivers/net/appletalk/cops_ffdrv.h
drivers/usb/serial/keyspan_usa19_fw.h
drivers/usb/serial/keyspan_usa19qi_fw.h
drivers/usb/serial/keyspan_usa19qw_fw.h
drivers/usb/serial/keyspan_usa18x_fw.h
drivers/usb/serial/keyspan_usa19w_fw.h
drivers/usb/serial/keyspan_usa49wlc_fw.h
drivers/usb/serial/keyspan_usa28xb_fw.h
drivers/usb/serial/keyspan_usa28x_fw.h
drivers/usb/serial/keyspan_usa49w_fw.h
drivers/usb/serial/keyspan_usa28xa_fw.h
drivers/usb/serial/keyspan_usa28_fw.h
drivers/usb/serial/keyspan_mpr_fw.h

2
debian/patches/features/all/vserver/gen-patch vendored
View File

@ -11,4 +11,4 @@ version=$(filterdiff -p 1 -i Makefile "$patch" | grep "+EXTRAVERSION" | sed -e '
file="$(dirname $0)/$version.patch"
filterdiff -p 1 -x Makefile -x init/version.c "$patch" > "$file"
filterdiff -p 1 -x Makefile -x init/version.c "$patch" | grep -v "^diff" > "$file"

2507
debian/patches/features/all/vserver/vs2.0.2.2-rc6.patch → debian/patches/features/all/vserver/vs2.0.2.2-rc9.patch vendored
View File

File diff suppressed because it is too large Load Diff

1
debian/patches/features/all/xen/README vendored Normal file
View File

@ -0,0 +1 @@
This patch is from http://hg.et.redhat.com/kernel/linux-2.6.18-xen.

4888
debian/patches/features/all/xen/fedora-36252.patch → debian/patches/features/all/xen/fedora-2.6.18-36186.patch vendored
View File

File diff suppressed because it is too large Load Diff

84
debian/patches/features/all/xen/vserver-update.patch vendored
View File

@ -1,42 +1,17 @@
diff -ur source-amd64-xen/arch/i386/kernel/irq-xen.c source-amd64-xen-vserver-patch/arch/i386/kernel/irq-xen.c
--- source-amd64-xen/arch/i386/kernel/irq-xen.c 2006-11-06 11:57:48.000000000 +0100
+++ source-amd64-xen-vserver-patch/arch/i386/kernel/irq-xen.c 2006-11-06 12:06:08.000000000 +0100
@@ -18,6 +18,7 @@
#include <linux/notifier.h>
#include <linux/cpu.h>
#include <linux/delay.h>
+#include <linux/vs_context.h>
DEFINE_PER_CPU(irq_cpustat_t, irq_stat) ____cacheline_internodealigned_in_smp;
EXPORT_PER_CPU_SYMBOL(irq_stat);
@@ -55,6 +56,7 @@
{
/* high bit used in ret_from_ code */
int irq = ~regs->orig_eax;
+ struct vx_info_save vxis;
#ifdef CONFIG_4KSTACKS
union irq_ctx *curctx, *irqctx;
u32 *isp;
@@ -81,7 +83,7 @@
--- source-amd64-xen/arch/i386/kernel/irq-xen.c 2006-12-15 18:44:42.000000000 +0100
+++ source-amd64-xen-vserver-patch/arch/i386/kernel/irq-xen.c 2006-12-15 18:45:43.000000000 +0100
@@ -81,7 +81,6 @@
}
}
#endif
-
+ __enter_vx_admin(&vxis);
#ifdef CONFIG_4KSTACKS
curctx = (union irq_ctx *) current_thread_info();
@@ -120,6 +122,7 @@
} else
#endif
__do_IRQ(irq, regs);
+ __leave_vx_admin(&vxis);
irq_exit();
diff -ur source-amd64-xen/arch/i386/kernel/traps-xen.c source-amd64-xen-vserver-patch/arch/i386/kernel/traps-xen.c
--- source-amd64-xen/arch/i386/kernel/traps-xen.c 2006-11-06 11:57:48.000000000 +0100
+++ source-amd64-xen-vserver-patch/arch/i386/kernel/traps-xen.c 2006-11-06 12:06:08.000000000 +0100
--- source-amd64-xen/arch/i386/kernel/traps-xen.c 2006-12-15 18:44:42.000000000 +0100
+++ source-amd64-xen-vserver-patch/arch/i386/kernel/traps-xen.c 2006-12-15 18:45:43.000000000 +0100
@@ -53,6 +53,7 @@
#include <asm/kdebug.h>
@ -45,7 +20,7 @@ diff -ur source-amd64-xen/arch/i386/kernel/traps-xen.c source-amd64-xen-vserver-
#include "mach_traps.h"
@@ -309,8 +310,8 @@
@@ -310,8 +311,8 @@
regs->esi, regs->edi, regs->ebp, esp);
printk(KERN_EMERG "ds: %04x es: %04x ss: %04x\n",
regs->xds & 0xffff, regs->xes & 0xffff, ss);
@ -56,7 +31,7 @@ diff -ur source-amd64-xen/arch/i386/kernel/traps-xen.c source-amd64-xen-vserver-
current_thread_info(), current, current->thread_info);
/*
* When in-kernel, we also print out the stack and code at the
@@ -392,6 +393,8 @@
@@ -393,6 +394,8 @@
oops_enter();
@ -65,7 +40,7 @@ diff -ur source-amd64-xen/arch/i386/kernel/traps-xen.c source-amd64-xen-vserver-
if (die.lock_owner != raw_smp_processor_id()) {
console_verbose();
spin_lock_irqsave(&die.lock, flags);
@@ -428,9 +431,9 @@
@@ -429,9 +432,9 @@
if (nl)
printk("\n");
if (notify_die(DIE_OOPS, str, regs, err,
@ -78,8 +53,8 @@ diff -ur source-amd64-xen/arch/i386/kernel/traps-xen.c source-amd64-xen-vserver-
esp = (unsigned long) (&regs->esp);
savesegment(ss, ss);
diff -ur source-amd64-xen/arch/x86_64/ia32/ia32entry-xen.S source-amd64-xen-vserver-patch/arch/x86_64/ia32/ia32entry-xen.S
--- source-amd64-xen/arch/x86_64/ia32/ia32entry-xen.S 2006-11-06 11:57:48.000000000 +0100
+++ source-amd64-xen-vserver-patch/arch/x86_64/ia32/ia32entry-xen.S 2006-11-06 12:06:08.000000000 +0100
--- source-amd64-xen/arch/x86_64/ia32/ia32entry-xen.S 2006-12-15 18:44:42.000000000 +0100
+++ source-amd64-xen-vserver-patch/arch/x86_64/ia32/ia32entry-xen.S 2006-12-15 18:45:43.000000000 +0100
@@ -695,7 +695,7 @@
.quad sys_tgkill /* 270 */
.quad compat_sys_utimes
@ -90,8 +65,8 @@ diff -ur source-amd64-xen/arch/x86_64/ia32/ia32entry-xen.S source-amd64-xen-vser
.quad compat_sys_get_mempolicy /* 275 */
.quad sys_set_mempolicy
diff -ur source-amd64-xen/arch/x86_64/ia32/syscall32-xen.c source-amd64-xen-vserver-patch/arch/x86_64/ia32/syscall32-xen.c
--- source-amd64-xen/arch/x86_64/ia32/syscall32-xen.c 2006-11-06 11:57:48.000000000 +0100
+++ source-amd64-xen-vserver-patch/arch/x86_64/ia32/syscall32-xen.c 2006-11-06 12:06:08.000000000 +0100
--- source-amd64-xen/arch/x86_64/ia32/syscall32-xen.c 2006-12-15 18:44:42.000000000 +0100
+++ source-amd64-xen-vserver-patch/arch/x86_64/ia32/syscall32-xen.c 2006-12-15 18:45:43.000000000 +0100
@@ -10,6 +10,7 @@
#include <linux/init.h>
#include <linux/stringify.h>
@ -109,39 +84,10 @@ diff -ur source-amd64-xen/arch/x86_64/ia32/syscall32-xen.c source-amd64-xen-vser
up_write(&mm->mmap_sem);
return 0;
}
diff -ur source-amd64-xen/arch/x86_64/kernel/irq-xen.c source-amd64-xen-vserver-patch/arch/x86_64/kernel/irq-xen.c
--- source-amd64-xen/arch/x86_64/kernel/irq-xen.c 2006-11-06 11:57:48.000000000 +0100
+++ source-amd64-xen-vserver-patch/arch/x86_64/kernel/irq-xen.c 2006-11-06 12:06:08.000000000 +0100
@@ -15,6 +15,7 @@
#include <linux/seq_file.h>
#include <linux/module.h>
#include <linux/delay.h>
+#include <linux/vs_context.h>
#include <asm/uaccess.h>
#include <asm/io_apic.h>
#include <asm/idle.h>
@@ -117,6 +118,7 @@
{
/* high bit used in ret_from_ code */
unsigned irq = ~regs->orig_rax;
+ struct vx_info_save vxis;
if (unlikely(irq >= NR_IRQS)) {
printk(KERN_EMERG "%s: cannot handle IRQ %d\n",
@@ -130,7 +132,9 @@
#ifdef CONFIG_DEBUG_STACKOVERFLOW
stack_overflow_check(regs);
#endif
+ __enter_vx_admin(&vxis);
__do_IRQ(irq, regs);
+ __leave_vx_admin(&vxis);
irq_exit();
return 1;
diff -ur source-amd64-xen/arch/x86_64/kernel/traps-xen.c source-amd64-xen-vserver-patch/arch/x86_64/kernel/traps-xen.c
--- source-amd64-xen/arch/x86_64/kernel/traps-xen.c 2006-11-06 11:57:48.000000000 +0100
+++ source-amd64-xen-vserver-patch/arch/x86_64/kernel/traps-xen.c 2006-11-06 12:06:08.000000000 +0100
@@ -436,8 +436,9 @@
--- source-amd64-xen/arch/x86_64/kernel/traps-xen.c 2006-12-15 18:44:42.000000000 +0100
+++ source-amd64-xen-vserver-patch/arch/x86_64/kernel/traps-xen.c 2006-12-15 18:45:43.000000000 +0100
@@ -435,8 +435,9 @@
printk("CPU %d ", cpu);
__show_regs(regs);

7
debian/patches/series/orig-1 vendored Normal file
View File

@ -0,0 +1,7 @@
X debian/dfsg/files-1
+ debian/dfsg/drivers-media-video-dabus.patch
+ debian/dfsg/drivers-net-appletalk-cops.patch
+ debian/dfsg/drivers-net-dgrs.patch
+ debian/dfsg/drivers-net-tokenring-3c359-smctr.patch
+ debian/dfsg/drivers-usb-misc-emi62-emi26.patch
+ debian/dfsg/drivers-usb-serial-keyspan.patch

2
debian/rules vendored
View File

@ -69,7 +69,7 @@ binary: binary-indep binary-arch
# Makes the master debian/control file by substituting
# variable values into the template.
#
CONTROL_FILES = debian/changelog $(wildcard debian/templates/control.*)
CONTROL_FILES = debian/changelog $(wildcard debian/templates/*)
CONTROL_FILES += debian/arch/defines $(wildcard debian/arch/*/defines) $(wildcard debian/arch/*/*/defines)
debian/control debian/rules.gen: debian/bin/gencontrol.py $(CONTROL_FILES)
if [ -f debian/control.md5sum ]; then \

21
debian/rules.real vendored
View File

@ -35,7 +35,7 @@ include debian/rules.defs
# replaced by the flavour for which the command is run.
#
kpkg_image := make-kpkg
kpkg_image += --arch '$(ARCH)'
kpkg_image += --arch '$(firstword $(KPKG_ARCH) $(ARCH))' --cross-compile=-
kpkg_image += --stem linux
kpkg_image += --config silentoldconfig
ifneq ($(INITRAMFS),False)
@ -45,9 +45,6 @@ ifdef KPKG_SUBARCH
kpkg_image += --subarch '$(KPKG_SUBARCH)'
endif
setup_env := env -u ABINAME -u ARCH -u SUBARCH -u FLAVOUR -u VERSION -u LOCALVERSION -u MAKEFLAGS
ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
kpkg_image += --cross-compile='$(DEB_HOST_GNU_TYPE)'
endif
ifdef DEBIAN_KERNEL_JOBS
setup_env_kpkg_jobs = CONCURRENCY_LEVEL=$(DEBIAN_KERNEL_JOBS)
@ -122,6 +119,18 @@ $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): DIR=$(BUILD_DIR)/buil
$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): $(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR) $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH)
# TODO: Should we set CROSS_COMPILE always?
ifdef OVERRIDE_HOST_TYPE
define SETUP_DIR_HOST_TYPE
echo 'override CROSS_COMPILE = $(OVERRIDE_HOST_TYPE)-' >> '$(DIR)/.kernelvariables'
endef
else
define SETUP_DIR_HOST_TYPE
echo 'ifneq ($$(DEB_BUILD_ARCH),$$(DEB_HOST_ARCH))' >> '$(DIR)/.kernelvariables'
echo 'override CROSS_COMPILE = $$(DEB_HOST_GNU_TYPE)-' >> '$(DIR)/.kernelvariables'
echo 'endif' >> '$(DIR)/.kernelvariables'
endef
endif
define SETUP_DIR
rm -rf '$(DIR)'
cp -al '$(SOURCE_DIR)' '$(DIR)'
@ -130,9 +139,7 @@ define SETUP_DIR
echo 'override ARCH = $(KERNEL_ARCH)' >> '$(DIR)/.kernelvariables'
echo 'CCACHE = ccache' >> '$(DIR)/.kernelvariables'
echo 'CC = $$(if $$(DEBIAN_KERNEL_USE_CCACHE),$$(CCACHE)) $$(CROSS_COMPILE)$(COMPILER)' >> '$(DIR)/.kernelvariables'
echo 'ifneq ($$(DEB_BUILD_ARCH),$$(DEB_HOST_ARCH))' >> '$(DIR)/.kernelvariables'
echo 'override CROSS_COMPILE = $$(DEB_HOST_GNU_TYPE)-' >> '$(DIR)/.kernelvariables'
echo 'endif' >> '$(DIR)/.kernelvariables'
$(SETUP_DIR_HOST_TYPE)
cd '$(DIR)'; $(setup_env) make reportoldconfig
endef

12
debian/templates/control.image.type-kernel-package.in vendored Normal file
View File

@ -0,0 +1,12 @@
Package: linux-image-@upstreamversion@@abiname@@localversion@
Section: admin
Priority: optional
Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@
Pre-Depends: debconf (>= 0.2.17) | debconf-2.0
Depends: module-init-tools (>= 0.9.13), coreutils (>= 5.2.1)
Suggests: linux-doc-@version@
Description: Linux @upstreamversion@ image on @class@
This package provides the binary image and pre-built loadable modules for
Linux kernel @upstreamversion@ on @longclass@ machines.
.
@desc@

2
debian/templates/control.source.in vendored
View File

@ -5,4 +5,4 @@ Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
Uploaders: Andres Salomon <dilinger@debian.org>, Bastian Blank <waldi@debian.org>, Simon Horman <horms@debian.org>, Sven Luther <luther@debian.org>, Jonas Smedegaard <dr@jones.dk>, Norbert Tretkowski <nobse@debian.org>, Frederik Schüler <fs@debian.org>
Standards-Version: 3.6.1.0
Build-Depends: debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, sparc-utils [sparc], kernel-package (>= 10.063), python, python2.4-minimal
Build-Depends-Indep: docbook-utils, gs, transfig, xmlto
Build-Depends-Indep: docbook-utils, findutils (>= 4.2.12), gs, transfig, xmlto