[arch-commits] CVS update of unstable/kernels/kernel26mm (PKGBUILD config)
Tom Killian
tom at archlinux.org
Sun Sep 2 13:42:22 UTC 2007
Date: Sunday, September 2, 2007 @ 09:42:22
Author: tom
Path: /home/cvs-unstable/unstable/kernels/kernel26mm
Modified: PKGBUILD (1.15 -> 1.16) config (1.9 -> 1.10)
upgpkg: kernel26mm 2.6.23.rc4.mm1-1
----------+
PKGBUILD | 36 ++++++++++-------------
config | 95 +++++++++++++++++++++++++++++++++++++++++--------------------
2 files changed, 81 insertions(+), 50 deletions(-)
Index: unstable/kernels/kernel26mm/PKGBUILD
diff -u unstable/kernels/kernel26mm/PKGBUILD:1.15 unstable/kernels/kernel26mm/PKGBUILD:1.16
--- unstable/kernels/kernel26mm/PKGBUILD:1.15 Thu Aug 23 03:56:21 2007
+++ unstable/kernels/kernel26mm/PKGBUILD Sun Sep 2 09:42:22 2007
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.15 2007/08/23 07:56:21 tom Exp $
-# Maintainer: Tom Killian <tom at archlinux.org>
+# $Id: PKGBUILD,v 1.16 2007/09/02 13:42:22 tom Exp $ Maintainer: Tom
+# Killian <tom at archlinux.org>
pkgname=kernel26mm
_basekernel=2.6.22
-_basepatch=2.6.23-rc3
+_basepatch=2.6.23-rc4
_mmver=${_basepatch}-mm1
pkgver=${_mmver//-/.}
pkgrel=1
@@ -19,7 +19,7 @@
http://www2.kernel.org/pub/linux/kernel/v2.6/testing/patch-${_basepatch}.bz2
http://www2.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/${_basepatch}/${_mmver}/${_mmver}.bz2
http://gaugusch.at/acpi-dsdt-initrd-patches/acpi-dsdt-initrd-v0.8.4-2.6.21.patch
- rt2x00mac.c.patch
+ #rt2x00mac.c.patch
config
config.x86_64
logo_linux_clut224.ppm
@@ -36,7 +36,7 @@
patch -Np1 -i ../patch-${_basepatch} || return 1
patch -Np1 -i ../${_mmver} || return 1
- patch -Np0 -i ../rt2x00mac.c.patch || return 1
+ #patch -Np0 -i ../rt2x00mac.c.patch || return 1
# add acpi custom dsdt patch
patch -Np1 -i ../acpi-dsdt-initrd-v0.8.4-2.6.21.patch || return 1
@@ -82,19 +82,10 @@
install -D -m644 .config $startdir/pkg/boot/kconfig26mm
mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/include
- mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/arch/$KARCH/kernel
- for i in acpi asm-generic asm-$KARCH config linux math-emu media net pcmcia scsi sound video xen; do
+ for i in acpi asm-{generic,i386,x86_64} config linux math-emu media net pcmcia scsi sound video xen; do
cp -a include/$i $startdir/pkg/usr/src/linux-${_kernver}/include/
done
- # Hackiness to include x86_64 header in i686 package, and vice versa (!)
- if [ "$KARCH" == "i386" ]; then
- install -D include/asm-x86_64/tsc.h $startdir/pkg/usr/src/linux-${_kernver}/include/asm-x86_64/tsc.h
- fi
- if [ "$KARCH" == "x86_64" ]; then
- install -D include/asm-i386/tsc.h $startdir/pkg/usr/src/linux-${_kernver}/include/asm-i386/tsc.h
- fi
-
# copy files necessary for later builds, like nvidia and vmware
cp Module.symvers $startdir/pkg/usr/src/linux-${_kernver}
cp -a scripts $startdir/pkg/usr/src/linux-${_kernver}
@@ -102,8 +93,11 @@
chmod og-w -R $startdir/pkg/usr/src/linux-${_kernver}/scripts
mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/.tmp_versions
+ mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/arch/$KARCH/kernel
cp arch/$KARCH/Makefile $startdir/pkg/usr/src/linux-${_kernver}/arch/$KARCH/
- cp arch/$KARCH/Makefile.cpu $startdir/pkg/usr/src/linux-${_kernver}/arch/$KARCH/
+ if [ "$CARCH" = "i686" ]; then
+ cp arch/$KARCH/Makefile.cpu $startdir/pkg/usr/src/linux-${_kernver}/arch/$KARCH/
+ fi
cp arch/$KARCH/kernel/asm-offsets.s $startdir/pkg/usr/src/linux-${_kernver}/arch/$KARCH/kernel/
#cp arch/$KARCH/kernel/asm-offsets.c $startdir/pkg/usr/src/linux-${_kernver}/arch/$KARCH/kernel/
#cp arch/$KARCH/kernel/sigframe.h $startdir/pkg/usr/src/linux-${_kernver}/arch/$KARCH/kernel/
@@ -146,13 +140,15 @@
# set correct depmod command for install
sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/kernel26.install || return 1
echo -e "# NEVER EDIT THIS FILE\nALL_kver='${_kernver}'" > ${startdir}/pkg/etc/mkinitcpio.d/kernel26mm.kver || return 1
+
+ # remove unneeded architectures
+ rm -rf $startdir/pkg/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
}
md5sums=('2e230d005c002fb3d38a3ca07c0200d0'
- '736ea68a03158c24e55aa95e0ab15ceb'
- '39620cfd47f58be6dacdf2544220643c'
+ 'cb7b0d6e6424f31ba41b9ba304b69833'
+ '3dcdbfe35d496cda9e79c055e31d6ba7'
'493137566bc397ec762c86e64bd96849'
- '528e99845cd243572c8db344cea75e9e'
- '20aa8c7ea97f6fc420ec88f2e79ecaa4'
+ 'a5707e06a7c47c72401f0a599fe24862'
'3f3666305b45b5fde82bb67b320f0840'
'5a62bcc7e96601052c7405459b483826'
'ed6b42fea2f5d27f7eb920746ccc1ebb'
Index: unstable/kernels/kernel26mm/config
diff -u unstable/kernels/kernel26mm/config:1.9 unstable/kernels/kernel26mm/config:1.10
--- unstable/kernels/kernel26mm/config:1.9 Thu Aug 23 03:56:21 2007
+++ unstable/kernels/kernel26mm/config Sun Sep 2 09:42:22 2007
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.23
-# Wed Aug 22 16:41:18 2007
+# Sat Sep 1 10:10:11 2007
#
CONFIG_X86_32=y
CONFIG_GENERIC_TIME=y
@@ -33,7 +33,6 @@
CONFIG_LOCALVERSION="-mm"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_SWAP=y
-CONFIG_SWAP_PREFETCH=y
CONFIG_SYSVIPC=y
CONFIG_SYSVIPC_SYSCTL=y
CONFIG_POSIX_MQUEUE=y
@@ -42,6 +41,7 @@
CONFIG_USER_NS=y
CONFIG_AUDIT=y
CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_TREE=y
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=15
@@ -50,7 +50,9 @@
CONFIG_CONTAINER_NS=y
CONFIG_CONTAINER_CPUACCT=y
# CONFIG_CPUSETS is not set
+CONFIG_RESOURCE_COUNTERS=y
# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_CONTAINER_MEM_CONT=y
CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
@@ -109,6 +111,7 @@
CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_NOOP is not set
CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_PREEMPT_NOTIFIERS=y
#
# Processor type and features
@@ -116,6 +119,7 @@
CONFIG_TICK_ONESHOT=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
CONFIG_SMP=y
CONFIG_X86_PC=y
# CONFIG_X86_ELAN is not set
@@ -180,7 +184,6 @@
# CONFIG_PREEMPT_VOLUNTARY is not set
CONFIG_PREEMPT=y
CONFIG_PREEMPT_BKL=y
-CONFIG_PREEMPT_NOTIFIERS=y
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y
CONFIG_X86_MCE=y
@@ -262,6 +265,7 @@
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
# CONFIG_ACPI_PROCFS is not set
+# CONFIG_ACPI_PROC_EVENT is not set
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
CONFIG_ACPI_BUTTON=m
@@ -452,6 +456,7 @@
CONFIG_INET_XFRM_MODE_TRANSPORT=m
CONFIG_INET_XFRM_MODE_TUNNEL=m
CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_LRO=m
CONFIG_INET_DIAG=y
CONFIG_INET_TCP_DIAG=y
# CONFIG_TCP_CONG_ADVANCED is not set
@@ -791,6 +796,8 @@
CONFIG_OLD_BELKIN_DONGLE=m
CONFIG_ACT200L_DONGLE=m
CONFIG_KINGSUN_DONGLE=m
+CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KS959_DONGLE=m
#
# Old SIR device drivers
@@ -864,8 +871,6 @@
# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
CONFIG_RFKILL=m
CONFIG_RFKILL_INPUT=m
-CONFIG_NET_9P=m
-# CONFIG_NET_9P_DEBUG is not set
#
# Device Drivers
@@ -1297,6 +1302,7 @@
CONFIG_MACVLAN=m
CONFIG_EQUALIZER=m
CONFIG_TUN=m
+CONFIG_VETH=m
CONFIG_NET_SB1000=m
# CONFIG_ARCNET is not set
# CONFIG_PHYLIB is not set
@@ -1349,7 +1355,7 @@
CONFIG_ZNET=m
CONFIG_SEEQ8005=m
CONFIG_NET_PCI=y
-CONFIG_PCNET32=m
+# CONFIG_PCNET32 is not set
# CONFIG_PCNET32_NAPI is not set
CONFIG_AMD8111_ETH=m
# CONFIG_AMD8111E_NAPI is not set
@@ -1358,6 +1364,8 @@
CONFIG_AC3200=m
CONFIG_APRICOT=m
CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
CONFIG_B44_PCI=y
CONFIG_FORCEDETH=m
# CONFIG_FORCEDETH_NAPI is not set
@@ -1454,6 +1462,7 @@
CONFIG_TMD_HERMES=m
CONFIG_NORTEL_HERMES=m
CONFIG_PCI_HERMES=m
+CONFIG_USB_ATMEL=m
CONFIG_PCMCIA_HERMES=m
CONFIG_PCMCIA_SPECTRUM=m
CONFIG_ATMEL=m
@@ -1465,24 +1474,10 @@
CONFIG_USB_ZD1201=m
CONFIG_RTL8187=m
CONFIG_ADM8211=m
+CONFIG_ATH5K=m
CONFIG_P54_COMMON=m
CONFIG_P54_USB=m
CONFIG_P54_PCI=m
-CONFIG_RT2X00=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_RFKILL=y
-CONFIG_RT2400PCI=m
-CONFIG_RT2400PCI_RFKILL=y
-CONFIG_RT2500PCI=m
-CONFIG_RT2500PCI_RFKILL=y
-CONFIG_RT61PCI=m
-CONFIG_RT61PCI_RFKILL=y
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-# CONFIG_RT2X00_DEBUG is not set
CONFIG_IWLWIFI=y
CONFIG_IWLWIFI_DEBUG=y
CONFIG_IWLWIFI_SENSITIVITY=y
@@ -1490,7 +1485,6 @@
CONFIG_IWLWIFI_QOS=y
CONFIG_IWL4965=m
CONFIG_IWL3945=m
-CONFIG_ATH5K=m
CONFIG_HOSTAP=m
CONFIG_HOSTAP_FIRMWARE=y
CONFIG_HOSTAP_FIRMWARE_NVRAM=y
@@ -1505,15 +1499,33 @@
# CONFIG_BCM43XX_DMA_MODE is not set
# CONFIG_BCM43XX_PIO_MODE is not set
# CONFIG_B43 is not set
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-# CONFIG_B43_DMA_AND_PIO_MODE is not set
-# CONFIG_B43_DMA_MODE is not set
-# CONFIG_B43_PIO_MODE is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_DEBUG=y
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_RT2X00=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_RFKILL=y
+CONFIG_RT2400PCI=m
+CONFIG_RT2400PCI_RFKILL=y
+CONFIG_RT2500PCI=m
+CONFIG_RT2500PCI_RFKILL=y
+CONFIG_RT61PCI=m
+CONFIG_RT61PCI_RFKILL=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+# CONFIG_RT2X00_DEBUG is not set
# CONFIG_ZD1211RW_MAC80211 is not set
-# CONFIG_ZD1211RW_MAC80211_DEBUG is not set
#
# USB Network Adapters
@@ -1599,6 +1611,7 @@
# CONFIG_NET_FC is not set
CONFIG_SHAPER=m
CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
CONFIG_NETPOLL=y
# CONFIG_NETPOLL_TRAP is not set
CONFIG_NET_POLL_CONTROLLER=y
@@ -2094,11 +2107,14 @@
CONFIG_SENSORS_ADM1029=m
CONFIG_SENSORS_ADM1031=m
CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7470=m
CONFIG_SENSORS_K8TEMP=m
CONFIG_SENSORS_ASB100=m
CONFIG_SENSORS_ATXP1=m
CONFIG_SENSORS_DS1621=m
CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
CONFIG_SENSORS_FSCHER=m
CONFIG_SENSORS_FSCPOS=m
CONFIG_SENSORS_GL518SM=m
@@ -2296,6 +2312,7 @@
CONFIG_USB_PWC=m
# CONFIG_USB_PWC_DEBUG is not set
CONFIG_USB_ZR364XX=m
+CONFIG_USB_STK11XX=m
CONFIG_RADIO_ADAPTERS=y
CONFIG_RADIO_CADET=m
CONFIG_RADIO_RTRACK=m
@@ -2914,6 +2931,7 @@
CONFIG_USB_SERIAL_AIRPRIME=m
CONFIG_USB_SERIAL_ARK3116=m
CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
CONFIG_USB_SERIAL_WHITEHEAT=m
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
CONFIG_USB_SERIAL_CP2101=m
@@ -2973,6 +2991,7 @@
CONFIG_USB_LEGOTOWER=m
CONFIG_USB_LCD=m
CONFIG_USB_BERRY_CHARGE=m
+CONFIG_USB_IPHONE=m
CONFIG_USB_LED=m
CONFIG_USB_CYPRESS_CY7C63=m
CONFIG_USB_CYTHERM=m
@@ -3122,6 +3141,19 @@
#
# on-CPU RTC drivers
#
+CONFIG_DMADEVICES=y
+
+#
+# DMA Devices
+#
+CONFIG_INTEL_IOATDMA=m
+CONFIG_DMA_ENGINE=y
+
+#
+# DMA Clients
+#
+CONFIG_NET_DMA=y
+CONFIG_DCA=m
CONFIG_AUXDISPLAY=y
CONFIG_KS0108=m
CONFIG_KS0108_PORT=0x378
@@ -3193,6 +3225,8 @@
CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
CONFIG_QFMT_V1=m
CONFIG_QFMT_V2=m
CONFIG_QUOTACTL=y
@@ -3234,7 +3268,6 @@
CONFIG_TMPFS_POSIX_ACL=y
# CONFIG_HUGETLBFS is not set
# CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
CONFIG_CONFIGFS_FS=m
#
@@ -3310,7 +3343,6 @@
# CONFIG_CODA_FS_OLD_API is not set
CONFIG_AFS_FS=m
# CONFIG_AFS_DEBUG is not set
-CONFIG_9P_FS=m
#
# Partition Types
@@ -3432,6 +3464,7 @@
# CONFIG_FAULT_INJECTION is not set
# CONFIG_WANT_EXTRA_DEBUG_INFORMATION is not set
# CONFIG_KGDB is not set
+CONFIG_KGDB_ATTACH_WAIT=y
CONFIG_EARLY_PRINTK=y
# CONFIG_DEBUG_STACKOVERFLOW is not set
# CONFIG_DEBUG_STACK_USAGE is not set
@@ -3468,6 +3501,7 @@
CONFIG_CRYPTO=y
CONFIG_CRYPTO_ALGAPI=y
CONFIG_CRYPTO_ABLKCIPHER=m
+CONFIG_CRYPTO_AEAD=m
CONFIG_CRYPTO_BLKCIPHER=y
CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_MANAGER=y
@@ -3508,6 +3542,7 @@
CONFIG_CRYPTO_CRC32C=m
CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_AUTHENC=m
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_PADLOCK=m
CONFIG_CRYPTO_DEV_PADLOCK_AES=m
More information about the arch-commits
mailing list