diff --git a/kernel26/PKGBUILD b/kernel26/PKGBUILD index caa3a687b..403422669 100644 --- a/kernel26/PKGBUILD +++ b/kernel26/PKGBUILD @@ -8,28 +8,26 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgbase="kernel26" -pkgname=('kernel26' 'kernel26-headers' 'kernel26-docs') # Build stock -CHAKRA kernel -#pkgname=kernel26-mainline # Build kernel with a different name +pkgname=('kernel26' 'kernel26-headers') # Build stock -CHAKRA kernel +# pkgname=kernel26-custom # Build kernel with a different name #_kernelname=${pkgname#kernel26} _kernelname="" -_basekernel=2.6.38-rc5 -pkgver=2.6.38rc5 -pkgrel=2 -makedepends=('xmlto' 'docbook-xsl') -_patchname="patch-${_basekernel}-${pkgrel}-CHAKRA" +_basekernel=2.6.37 +pkgver=${_basekernel}.2 +pkgrel=1 +_patchname="patch-${pkgver}-${pkgrel}-CHAKRA" arch=(i686 x86_64) license=('GPL2') url="http://www.kernel.org" -options=(!strip) -source=(http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-$_basekernel.tar.bz2 +source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2 http://chakra-project.org/sources/kernel26/${_patchname}.bz2 # the main kernel config files config config.x86_64 # standard config files for mkinitcpio ramdisk kernel26.preset) -md5sums=('136b0121f4a15fd9692fe80076eb677a' - '1254ee70b9bf59f1028a84a5313b8b23' - 'cfba5db86cc7751ca1cd1540e5c3b9cf' +md5sums=('c8ee37b4fdccdb651e0603d35350b434' + '686d3be142c7d0987245a8bf5545adc1' + '1daf0dc043949ecc4f48afa4260e952a' '92f1276655f801d4cb7a80eb481b9226' '25584700a0a679542929c4bed31433b6') @@ -46,21 +44,20 @@ build() { else cat ../config >./.config fi - - sed -i 's|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|' .config if [ "${_kernelname}" != "" ]; then sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config fi - sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/kconfig/streamline_config.pl # Fix localmodconfig + + # hack to prevent output kernel from being marked as dirty or git + echo "" > ${srcdir}/linux-${_basekernel}/.scmversion + + # get kernel version + make prepare # load configuration # Configure the kernel. Replace the line below with one of your choice. - #make localmodconfig # Configure automaticly for the local machine #make menuconfig # CLI menu for configuration - #make nconfig # new CLI menu for configuration - #make xconfig # X-based configuration, needs qt3 to be installed - #make gconfig # GTK based configuration, needs gtk2 to be installed - make oldconfig # using old config from previous kernel version - #yes ""|make oldconfig # lazy version of the above + #make xconfig # X-based configuration + #make oldconfig # using old config from previous kernel version # ... or manually edit .config #################### # stop here @@ -70,14 +67,13 @@ build() { #################### yes "" | make config # build! - make ${MAKEFLAGS} bzImage modules + make bzImage modules || return 1 } package_kernel26() { - pkgdesc="The Linux Kernel and modules (mainline)" - groups=('base') - backup=(etc/mkinitcpio.d/${pkgname}.preset) - depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.12' 'mkinitcpio>=0.6.8') + pkgdesc="The Linux Kernel and modules" + backup=(etc/mkinitcpio.d/kernel26.preset) + depends=('coreutils' 'linux-firmware' 'module-init-tools' 'mkinitcpio>=0.6.3') # pwc, ieee80211 and hostap-driver26 modules are included in kernel26 now # nforce package support was abandoned by nvidia, kernel modules should cover everything now. # kernel24 support is dropped since glibc24 @@ -85,7 +81,7 @@ package_kernel26() { 'alsa-driver' 'ieee80211' 'hostap-driver26' 'pwc' 'nforce' 'squashfs' 'unionfs' 'ivtv' 'zd1211' 'kvm-modules' 'iwlwifi' 'rt2x00-cvs' - 'gspcav1' 'atl2' 'wlan-ng26' 'rt2500' 'nouveau-drm' + 'gspcav1' 'atl2' 'wlan-ng26' 'rt2500' 'kernel26' 'aufs2') provides=('aufs2') install=kernel26.install @@ -93,18 +89,16 @@ package_kernel26() { KARCH=x86 cd ${srcdir}/linux-$_basekernel - # get kernel version - make prepare _kernver="$(make kernelrelease)" - mkdir -p ${pkgdir}/{lib/modules,lib/firmware,boot} - make INSTALL_MOD_PATH=${pkgdir} modules_install + mkdir -p ${pkgdir}/{lib/modules,boot} + make INSTALL_MOD_PATH=${pkgdir} modules_install || return 1 cp System.map ${pkgdir}/boot/System.map26${_kernelname} cp arch/$KARCH/boot/bzImage ${pkgdir}/boot/vmlinuz26${_kernelname} # # add vmlinux install -m644 -D vmlinux ${pkgdir}/usr/src/linux-${_kernver}/vmlinux # install fallback mkinitcpio.conf file and preset file for kernel - install -m644 -D ${srcdir}/kernel26.preset ${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset + install -m644 -D ${srcdir}/kernel26.preset ${pkgdir}/etc/mkinitcpio.d/kernel26.preset || return 1 # set correct depmod command for install sed \ -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \ @@ -112,22 +106,21 @@ package_kernel26() { -i $startdir/kernel26.install sed \ -e "s|source .*|source /etc/mkinitcpio.d/kernel26${_kernelname}.kver|g" \ - -e "s|default_image=.*|default_image=\"/boot/${pkgname}.img\"|g" \ - -e "s|fallback_image=.*|fallback_image=\"/boot/${pkgname}-fallback.img\"|g" \ - -i ${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset + -e "s|default_image=.*|default_image=\"/boot/kernel26.img\"|g" \ + -e "s|fallback_image=.*|fallback_image=\"/boot/kernel26-fallback.img\"|g" \ + -i ${pkgdir}/etc/mkinitcpio.d/kernel26.preset - echo -e "# DO NOT EDIT THIS FILE\nALL_kver='${_kernver}'" > ${pkgdir}/etc/mkinitcpio.d/${pkgname}.kver + echo -e "# DO NOT EDIT THIS FILE\nALL_kver='${_kernver}'" > ${pkgdir}/etc/mkinitcpio.d/kernel26.kver # remove build and source links rm -f ${pkgdir}/lib/modules/${_kernver}/{source,build} # remove the firmware rm -rf ${pkgdir}/lib/firmware - # gzip -9 all modules to safe 100MB of space - find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; } package_kernel26-headers() { pkgdesc="Header files and scripts for building modules for kernel26" - + cd ${srcdir}/linux-${_basekernel}/ + make oldconfig && make prepare || return 1 mkdir -p ${pkgdir}/lib/modules/${_kernver} cd ${pkgdir}/lib/modules/${_kernver} ln -sf ../../../usr/src/linux-${_kernver} build @@ -139,11 +132,11 @@ package_kernel26-headers() { install -D -m644 .config \ ${pkgdir}/usr/src/linux-${_kernver}/.config mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include - - for i in acpi asm-generic config generated linux math-emu media net pcmcia scsi sound trace video xen; do + + for i in acpi asm-generic config generated linux math-emu media net pcmcia scsi sound trace video; do cp -a include/$i ${pkgdir}/usr/src/linux-${_kernver}/include/ done - + # copy arch includes for external modules mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/x86 cp -a arch/x86/include ${pkgdir}/usr/src/linux-${_kernver}/arch/x86/ @@ -166,7 +159,7 @@ package_kernel26-headers() { # add headers for lirc package mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video cp drivers/media/video/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/ - for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102; do + for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102 usbvideo; do # zc0301 - damaged mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/$i cp -a drivers/media/video/$i/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/$i done @@ -198,20 +191,11 @@ package_kernel26-headers() { mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/ cp drivers/media/dvb/frontends/lgdt330x.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/ cp drivers/media/video/msp3400-driver.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/ - # add dvb headers - # in reference to: - # http://bugs.archlinux.org/task/20402 - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb - cp drivers/media/dvb/dvb-usb/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/ - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends - cp drivers/media/dvb/frontends/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/ - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners - cp drivers/media/common/tuners/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/ # add xfs and shmem for aufs building mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/fs/xfs mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/mm cp fs/xfs/xfs_sb.h ${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h - # add headers vor virtualbox + # add headers for virtualbox # in reference to: # http://bugs.archlinux.org/task/14568 cp -a include/drm $pkgdir/usr/src/linux-${_kernver}/include/ @@ -219,32 +203,36 @@ package_kernel26-headers() { # in reference to: # http://bugs.archlinux.org/task/14568 cp -a include/trace $pkgdir/usr/src/linux-${_kernver}/include/ - # add headers for crypto modules - # in reference to: - # http://bugs.archlinux.org/task/22081 - cp -a include/crypto $pkgdir/usr/src/linux-${_kernver}/include/ # copy in Kconfig files for i in `find . -name "Kconfig*"`; do mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/`echo $i | sed 's|/Kconfig.*||'` cp $i ${pkgdir}/usr/src/linux-${_kernver}/$i done + #cd ${pkgdir}/usr/src/linux-${_kernver}/include && ln -s asm-$KARCH asm + # add header for aufs2-util + #mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include/asm + #cp -a ${srcdir}/linux-$_basekernel/include/asm-generic/bitsperlong.h ${pkgdir}/usr/src/linux-${_kernver}/include/asm/ + chown -R root.root ${pkgdir}/usr/src/linux-${_kernver} find ${pkgdir}/usr/src/linux-${_kernver} -type d -exec chmod 755 {} \; # remove unneeded architectures rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa} + # fix aufs + # rm -rf ${pkgdir}/usr/src/linux-${_kernver}/include/linux/aufs_type.h + + # fix io.h + sed \ + -e "s~#include ~~g" \ + -i ${pkgdir}/usr/src/linux-${_kernver}/arch/x86/include/asm/io.h } -package_kernel26-docs() { - pkgdesc="Kernel hackers manual - HTML documentation that comes with the Linux kernel." - cd ${srcdir}/linux-$_basekernel - mkdir -p $pkgdir/usr/src/linux-$_kernver - mv Documentation $pkgdir/usr/src/linux-$_kernver - find $pkgdir -type f -exec chmod 444 {} \; - find $pkgdir -type d -exec chmod 755 {} \; - # remove a file already in kernel26 package - rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile -} +# package_kernel26-firmware() { ##### This package miss important firmwares!!! it's deprecated, use linux-firmware instead. +# pkgdesc="The included firmware files of the Linux Kernel" +# +# cd ${srcdir}/linux-$_basekernel +# make firmware || return 1 +# make INSTALL_MOD_PATH=${pkgdir} firmware_install || return 1 +# } -# vim:set ts=2 sw=2 et: diff --git a/kernel26/config b/kernel26/config index e36285671..5ef5eaa82 100644 --- a/kernel26/config +++ b/kernel26/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.38 Kernel Configuration -# Thu Feb 17 17:12:27 2011 +# Linux/i386 2.6.37 Kernel Configuration +# Wed Jan 5 13:45:33 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -47,6 +47,7 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_HAVE_INTEL_TXT=y +CONFIG_USE_GENERIC_SMP_HELPERS=y CONFIG_X86_32_SMP=y CONFIG_X86_HT=y CONFIG_X86_TRAMPOLINE=y @@ -66,16 +67,14 @@ CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" CONFIG_LOCALVERSION="-CHAKRA" -# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_LOCALVERSION_AUTO=y CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KERNEL_LZO=y # CONFIG_KERNEL_GZIP is not set # CONFIG_KERNEL_BZIP2 is not set -# CONFIG_KERNEL_LZMA is not set -CONFIG_KERNEL_XZ=y +CONFIG_KERNEL_LZMA=y # CONFIG_KERNEL_LZO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y @@ -98,6 +97,7 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y # IRQ subsystem # CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y # CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set CONFIG_HAVE_SPARSE_IRQ=y CONFIG_GENERIC_IRQ_PROBE=y @@ -152,12 +152,10 @@ CONFIG_INITRAMFS_SOURCE="" CONFIG_RD_GZIP=y CONFIG_RD_BZIP2=y CONFIG_RD_LZMA=y -CONFIG_RD_XZ=y CONFIG_RD_LZO=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y CONFIG_ANON_INODES=y -# CONFIG_EXPERT is not set # CONFIG_EMBEDDED is not set CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y @@ -206,7 +204,6 @@ CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_OPTPROBES=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_DMA_ATTRS=y -CONFIG_USE_GENERIC_SMP_HELPERS=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_HW_BREAKPOINT=y @@ -292,7 +289,6 @@ CONFIG_X86_MPPARSE=y # CONFIG_X86_BIGSMP is not set # CONFIG_X86_EXTENDED_PLATFORM is not set CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y -CONFIG_X86_32_IRIS=m CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y # CONFIG_XEN_PRIVILEGED_GUEST is not set @@ -333,7 +329,6 @@ CONFIG_X86_GENERIC=y CONFIG_X86_CPU=y CONFIG_X86_INTERNODE_CACHE_SHIFT=6 CONFIG_X86_CMPXCHG=y -CONFIG_CMPXCHG_LOCAL=y CONFIG_X86_L1_CACHE_SHIFT=6 CONFIG_X86_XADD=y # CONFIG_X86_PPRO_FENCE is not set @@ -406,8 +401,7 @@ CONFIG_SPARSEMEM_STATIC=y CONFIG_HAVE_MEMBLOCK=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 -CONFIG_COMPACTION=y -CONFIG_MIGRATION=y +# CONFIG_COMPACTION is not set # CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y @@ -418,9 +412,6 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y CONFIG_MEMORY_FAILURE=y CONFIG_HWPOISON_INJECT=m -CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y -# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set # CONFIG_HIGHPTE is not set CONFIG_X86_CHECK_BIOS_CORRUPTION=y CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y @@ -464,6 +455,7 @@ CONFIG_CAN_PM_TRACE=y CONFIG_PM_SLEEP_SMP=y CONFIG_PM_SLEEP=y # CONFIG_PM_SLEEP_ADVANCED_DEBUG is not set +CONFIG_SUSPEND_NVS=y CONFIG_SUSPEND=y # CONFIG_PM_TEST_SUSPEND is not set CONFIG_SUSPEND_FREEZER=y @@ -485,7 +477,6 @@ CONFIG_ACPI_VIDEO=m CONFIG_ACPI_FAN=m CONFIG_ACPI_DOCK=y CONFIG_ACPI_PROCESSOR=m -CONFIG_ACPI_IPMI=m CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_PROCESSOR_AGGREGATOR=m CONFIG_ACPI_THERMAL=m @@ -571,7 +562,7 @@ CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y CONFIG_PCI_OLPC=y CONFIG_PCI_DOMAINS=y -# CONFIG_PCI_CNB20LE_QUIRK is not set +CONFIG_PCI_CNB20LE_QUIRK=y CONFIG_DMAR=y # CONFIG_DMAR_DEFAULT_ON is not set CONFIG_DMAR_FLOPPY_WA=y @@ -598,7 +589,6 @@ CONFIG_ISA=y CONFIG_OLPC=y CONFIG_OLPC_XO1=m CONFIG_OLPC_OPENFIRMWARE=y -CONFIG_OLPC_OPENFIRMWARE_DT=y CONFIG_AMD_NB=y CONFIG_PCCARD=m CONFIG_PCMCIA=m @@ -1071,9 +1061,7 @@ CONFIG_NET_CLS_IND=y CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y -# CONFIG_BATMAN_ADV is not set CONFIG_RPS=y -CONFIG_XPS=y # # Network testing @@ -1244,7 +1232,6 @@ CONFIG_MTD_TESTS=m # CONFIG_MTD_CONCAT is not set CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_REDBOOT_PARTS is not set -CONFIG_MTD_OF_PARTS=y # CONFIG_MTD_AR7_PARTS is not set # @@ -1317,21 +1304,6 @@ CONFIG_MTD_NAND_ECC_SMC=y # # CONFIG_MTD_LPDDR is not set # CONFIG_MTD_UBI is not set -CONFIG_OF=y - -# -# Device Tree and Open Firmware support -# -CONFIG_PROC_DEVICETREE=y -CONFIG_OF_PROMTREE=y -CONFIG_OF_ADDRESS=y -CONFIG_OF_IRQ=y -CONFIG_OF_DEVICE=y -CONFIG_OF_GPIO=y -CONFIG_OF_I2C=m -CONFIG_OF_NET=y -CONFIG_OF_SPI=y -CONFIG_OF_MDIO=m CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m @@ -1688,7 +1660,6 @@ CONFIG_SATA_PMP=y CONFIG_SATA_AHCI=m CONFIG_SATA_AHCI_PLATFORM=m CONFIG_SATA_INIC162X=m -CONFIG_SATA_ACARD_AHCI=m CONFIG_SATA_SIL24=m CONFIG_ATA_SFF=y @@ -1791,7 +1762,6 @@ CONFIG_BLK_DEV_DM=m CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m -CONFIG_DM_RAID=m CONFIG_DM_LOG_USERSPACE=m CONFIG_DM_ZERO=m CONFIG_DM_MULTIPATH=m @@ -1799,10 +1769,6 @@ CONFIG_DM_MULTIPATH_QL=m CONFIG_DM_MULTIPATH_ST=m CONFIG_DM_DELAY=m CONFIG_DM_UEVENT=y -CONFIG_TARGET_CORE=m -CONFIG_TCM_IBLOCK=m -CONFIG_TCM_FILEIO=m -CONFIG_TCM_PSCSI=m CONFIG_FUSION=y CONFIG_FUSION_SPI=m CONFIG_FUSION_FC=m @@ -2056,7 +2022,6 @@ CONFIG_ATH_COMMON=m # CONFIG_ATH_DEBUG is not set CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set -CONFIG_ATH5K_PCI=y CONFIG_ATH9K_HW=m CONFIG_ATH9K_COMMON=m CONFIG_ATH9K=m @@ -2075,7 +2040,6 @@ CONFIG_B43_PCICORE_AUTOSELECT=y CONFIG_B43_PCMCIA=y CONFIG_B43_SDIO=y CONFIG_B43_PIO=y -CONFIG_B43_PHY_N=y CONFIG_B43_PHY_LP=y CONFIG_B43_LEDS=y CONFIG_B43_HWRNG=y @@ -2149,13 +2113,14 @@ CONFIG_RT2X00=m CONFIG_RT2400PCI=m CONFIG_RT2500PCI=m CONFIG_RT61PCI=m +CONFIG_RT2800PCI_PCI=y CONFIG_RT2800PCI=m -CONFIG_RT2800PCI_RT33XX=y +CONFIG_RT2800PCI_RT30XX=y CONFIG_RT2800PCI_RT35XX=y CONFIG_RT2500USB=m CONFIG_RT73USB=m CONFIG_RT2800USB=m -CONFIG_RT2800USB_RT33XX=y +CONFIG_RT2800USB_RT30XX=y CONFIG_RT2800USB_RT35XX=y CONFIG_RT2800USB_UNKNOWN=y CONFIG_RT2800_LIB=m @@ -2167,17 +2132,13 @@ CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2X00_LIB_CRYPTO=y CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set -CONFIG_RTL8192CE=m -CONFIG_RTLWIFI=m CONFIG_WL1251=m CONFIG_WL1251_SPI=m CONFIG_WL1251_SDIO=m -CONFIG_WL12XX_MENU=m CONFIG_WL12XX=m -CONFIG_WL12XX_HT=y -CONFIG_WL12XX_SPI=m -CONFIG_WL12XX_SDIO=m -CONFIG_WL12XX_SDIO_TEST=m +CONFIG_WL1271=m +CONFIG_WL1271_SPI=m +CONFIG_WL1271_SDIO=m CONFIG_WL12XX_PLATFORM_DATA=y CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set @@ -2202,7 +2163,6 @@ CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m CONFIG_USB_NET_CDC_EEM=m -CONFIG_USB_NET_CDC_NCM=m CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_SMSC75XX=m CONFIG_USB_NET_SMSC95XX=m @@ -2537,7 +2497,6 @@ CONFIG_JOYSTICK_ZHENHUA=m CONFIG_JOYSTICK_DB9=m CONFIG_JOYSTICK_GAMECON=m CONFIG_JOYSTICK_TURBOGRAFX=m -CONFIG_JOYSTICK_AS5011=m CONFIG_JOYSTICK_JOYDUMP=m CONFIG_JOYSTICK_XPAD=m CONFIG_JOYSTICK_XPAD_FF=y @@ -2600,7 +2559,6 @@ CONFIG_TOUCHSCREEN_USB_NEXIO=y CONFIG_TOUCHSCREEN_TOUCHIT213=m CONFIG_TOUCHSCREEN_TSC2007=m # CONFIG_TOUCHSCREEN_PCAP is not set -CONFIG_TOUCHSCREEN_ST1232=m CONFIG_TOUCHSCREEN_TPS6507X=m CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m @@ -2617,6 +2575,7 @@ CONFIG_INPUT_POWERMATE=m CONFIG_INPUT_YEALINK=m CONFIG_INPUT_CM109=m CONFIG_INPUT_UINPUT=m +CONFIG_INPUT_WINBOND_CIR=m CONFIG_INPUT_PCF50633_PMU=m CONFIG_INPUT_PCF8574=m CONFIG_INPUT_GPIO_ROTARY_ENCODER=m @@ -2625,8 +2584,6 @@ CONFIG_INPUT_WM831X_ON=m CONFIG_INPUT_ADXL34X=m CONFIG_INPUT_ADXL34X_I2C=m CONFIG_INPUT_ADXL34X_SPI=m -CONFIG_INPUT_CMA3000=m -CONFIG_INPUT_CMA3000_I2C=m # # Hardware I/O ports @@ -2698,15 +2655,11 @@ CONFIG_SERIAL_UARTLITE=m CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m -CONFIG_SERIAL_OF_PLATFORM=m CONFIG_SERIAL_TIMBERDALE=m -CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 -CONFIG_SERIAL_IFX6X60=m -CONFIG_SERIAL_PCH_UART=m CONFIG_UNIX98_PTYS=y CONFIG_DEVPTS_MULTIPLE_INSTANCES=y # CONFIG_LEGACY_PTYS is not set @@ -2744,6 +2697,7 @@ CONFIG_IPWIRELESS=m CONFIG_MWAVE=m CONFIG_PC8736x_GPIO=m CONFIG_NSC_GPIO=m +CONFIG_CS5535_GPIO=m # CONFIG_RAW_DRIVER is not set CONFIG_HPET=y CONFIG_HPET_MMAP=y @@ -2765,7 +2719,6 @@ CONFIG_I2C_MUX=m # # Multiplexer I2C Chip support # -CONFIG_I2C_MUX_GPIO=m CONFIG_I2C_MUX_PCA9541=m CONFIG_I2C_MUX_PCA954x=m CONFIG_I2C_HELPER_AUTO=y @@ -2811,7 +2764,6 @@ CONFIG_I2C_OCORES=m CONFIG_I2C_PCA_PLATFORM=m CONFIG_I2C_SIMTEC=m CONFIG_I2C_XILINX=m -CONFIG_I2C_EG20T=m # # External I2C/SMBus adapter drivers @@ -2841,10 +2793,9 @@ CONFIG_SPI_BITBANG=m CONFIG_SPI_BUTTERFLY=m CONFIG_SPI_GPIO=m CONFIG_SPI_LM70_LLP=m -CONFIG_SPI_PXA2XX=m -CONFIG_SPI_PXA2XX_PCI=y CONFIG_SPI_TOPCLIFF_PCH=m CONFIG_SPI_XILINX=m +CONFIG_SPI_XILINX_PLTFM=m # CONFIG_SPI_DESIGNWARE is not set # @@ -2864,12 +2815,6 @@ CONFIG_PPS=m # CONFIG_PPS_CLIENT_KTIMER=m CONFIG_PPS_CLIENT_LDISC=m -CONFIG_PPS_CLIENT_PARPORT=m - -# -# PPS generators support -# -CONFIG_PPS_GENERATOR_PARPORT=m CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_GPIOLIB=y # CONFIG_DEBUG_GPIO is not set @@ -2900,7 +2845,6 @@ CONFIG_GPIO_ADP5588=m CONFIG_GPIO_CS5535=m CONFIG_GPIO_LANGWELL=y CONFIG_GPIO_PCH=m -CONFIG_GPIO_ML_IOH=m CONFIG_GPIO_TIMBERDALE=y CONFIG_GPIO_RDC321X=m @@ -2937,7 +2881,6 @@ CONFIG_W1_MASTER_GPIO=m # CONFIG_W1_SLAVE_THERM=m CONFIG_W1_SLAVE_SMEM=m -CONFIG_W1_SLAVE_DS2423=m CONFIG_W1_SLAVE_DS2431=m CONFIG_W1_SLAVE_DS2433=m # CONFIG_W1_SLAVE_DS2433_CRC is not set @@ -2955,10 +2898,8 @@ CONFIG_BATTERY_OLPC=m CONFIG_BATTERY_BQ20Z75=m CONFIG_BATTERY_BQ27x00=m CONFIG_BATTERY_MAX17040=m -CONFIG_BATTERY_MAX17042=m CONFIG_CHARGER_PCF50633=m CONFIG_CHARGER_ISP1704=m -CONFIG_CHARGER_GPIO=m CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -2986,7 +2927,6 @@ CONFIG_SENSORS_K8TEMP=m CONFIG_SENSORS_K10TEMP=m CONFIG_SENSORS_ASB100=m CONFIG_SENSORS_ATXP1=m -CONFIG_SENSORS_DS620=m CONFIG_SENSORS_DS1621=m CONFIG_SENSORS_I5K_AMB=m CONFIG_SENSORS_F71805F=m @@ -3027,7 +2967,6 @@ CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_PCF8591=m CONFIG_SENSORS_SHT15=m -CONFIG_SENSORS_SHT21=m CONFIG_SENSORS_SIS5595=m CONFIG_SENSORS_SMM665=m CONFIG_SENSORS_DME1737=m @@ -3082,7 +3021,6 @@ CONFIG_ADVANTECH_WDT=m CONFIG_ALIM1535_WDT=m CONFIG_ALIM7101_WDT=m CONFIG_F71808E_WDT=m -CONFIG_SP5100_TCO=m CONFIG_GEODE_WDT=m CONFIG_SC520_WDT=m CONFIG_SBC_FITPC2_WATCHDOG=m @@ -3099,7 +3037,6 @@ CONFIG_HP_WATCHDOG=m CONFIG_HPWDT_NMI_DECODING=y CONFIG_SC1200_WDT=m CONFIG_PC87413_WDT=m -CONFIG_NV_TCO=m CONFIG_60XX_WDT=m CONFIG_SBC8360_WDT=m CONFIG_SBC7240_WDT=m @@ -3168,14 +3105,11 @@ CONFIG_PCF50633_ADC=m CONFIG_PCF50633_GPIO=m CONFIG_ABX500_CORE=y CONFIG_EZX_PCAP=y -# CONFIG_AB8500_CORE is not set -CONFIG_MFD_CS5535=m CONFIG_MFD_TIMBERDALE=m CONFIG_LPC_SCH=m CONFIG_MFD_RDC321X=m CONFIG_MFD_JANZ_CMODIO=m CONFIG_MFD_VX855=m -CONFIG_MFD_WL1273_CORE=m # CONFIG_REGULATOR is not set CONFIG_MEDIA_SUPPORT=m @@ -3184,6 +3118,8 @@ CONFIG_MEDIA_SUPPORT=m # CONFIG_VIDEO_DEV=m CONFIG_VIDEO_V4L2_COMMON=m +CONFIG_VIDEO_ALLOW_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y CONFIG_DVB_CORE=m CONFIG_VIDEO_MEDIA=m @@ -3192,7 +3128,8 @@ CONFIG_VIDEO_MEDIA=m # CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m -CONFIG_RC_CORE=m +CONFIG_IR_CORE=m +CONFIG_VIDEO_IR=m CONFIG_LIRC=m CONFIG_RC_MAP=m CONFIG_IR_NEC_DECODER=m @@ -3207,8 +3144,6 @@ CONFIG_IR_IMON=m CONFIG_IR_MCEUSB=m CONFIG_IR_NUVOTON=m CONFIG_IR_STREAMZAP=m -CONFIG_IR_WINBOND_CIR=m -CONFIG_RC_LOOPBACK=m CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_TUNER=m # CONFIG_MEDIA_TUNER_CUSTOMISE is not set @@ -3232,6 +3167,7 @@ CONFIG_MEDIA_TUNER_MC44S803=m CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_MEDIA_TUNER_TDA18218=m CONFIG_VIDEO_V4L2=m +CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m CONFIG_VIDEOBUF_DMA_SG=m CONFIG_VIDEOBUF_VMALLOC=m @@ -3257,6 +3193,7 @@ CONFIG_VIDEO_IR_I2C=m CONFIG_VIDEO_TVAUDIO=m CONFIG_VIDEO_TDA7432=m CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TDA9875=m CONFIG_VIDEO_TEA6415C=m CONFIG_VIDEO_TEA6420=m CONFIG_VIDEO_MSP3400=m @@ -3343,7 +3280,6 @@ CONFIG_VIDEO_SAA7134_DVB=m CONFIG_VIDEO_MXB=m CONFIG_VIDEO_HEXIUM_ORION=m CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_TIMBERDALE=m CONFIG_VIDEO_CX88=m CONFIG_VIDEO_CX88_ALSA=m CONFIG_VIDEO_CX88_BLACKBIRD=m @@ -3370,7 +3306,6 @@ CONFIG_SOC_CAMERA_MT9V022=m CONFIG_SOC_CAMERA_RJ54N1=m CONFIG_SOC_CAMERA_TW9910=m CONFIG_SOC_CAMERA_PLATFORM=m -CONFIG_SOC_CAMERA_OV2640=m CONFIG_SOC_CAMERA_OV6650=m CONFIG_SOC_CAMERA_OV772X=m CONFIG_SOC_CAMERA_OV9640=m @@ -3428,11 +3363,15 @@ CONFIG_VIDEO_EM28XX_ALSA=m CONFIG_VIDEO_EM28XX_DVB=m CONFIG_VIDEO_TLG2300=m CONFIG_VIDEO_CX231XX=m -CONFIG_VIDEO_CX231XX_RC=y CONFIG_VIDEO_CX231XX_ALSA=m CONFIG_VIDEO_CX231XX_DVB=m CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_USBVIDEO=m +CONFIG_USB_VICAM=m +CONFIG_USB_IBMCAM=m +CONFIG_USB_KONICAWC=m CONFIG_USB_ET61X251=m +CONFIG_USB_SE401=m CONFIG_USB_SN9C102=m CONFIG_USB_PWC=m # CONFIG_USB_PWC_DEBUG is not set @@ -3448,6 +3387,7 @@ CONFIG_RADIO_RTRACK=m CONFIG_RADIO_RTRACK2=m CONFIG_RADIO_AZTECH=m CONFIG_RADIO_GEMTEK=m +CONFIG_RADIO_GEMTEK_PCI=m CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_MAESTRO=m CONFIG_RADIO_MIROPCM20=m @@ -3468,7 +3408,6 @@ CONFIG_RADIO_TEA5764=m CONFIG_RADIO_SAA7706H=m CONFIG_RADIO_TEF6862=m CONFIG_RADIO_TIMBERDALE=m -CONFIG_RADIO_WL1273=m CONFIG_DVB_MAX_ADAPTERS=8 # CONFIG_DVB_DYNAMIC_MINORS is not set CONFIG_DVB_CAPTURE_DRIVERS=y @@ -3658,9 +3597,7 @@ CONFIG_DVB_S5H1411=m # # ISDB-T (terrestrial) frontends # -CONFIG_DVB_S921=m CONFIG_DVB_DIB8000=m -CONFIG_DVB_MB86A20S=m # # Digital terrestrial only tuners/PLL @@ -3685,6 +3622,8 @@ CONFIG_DVB_IX2505V=m # Tools to develop new frontends # # CONFIG_DVB_DUMMY_FE is not set +CONFIG_DAB=y +CONFIG_USB_DABUSB=m # # Graphics support @@ -3734,7 +3673,6 @@ CONFIG_FB_SYS_COPYAREA=m CONFIG_FB_SYS_IMAGEBLIT=m # CONFIG_FB_FOREIGN_ENDIAN is not set CONFIG_FB_SYS_FOPS=m -# CONFIG_FB_WMT_GE_ROPS is not set CONFIG_FB_DEFERRED_IO=y CONFIG_FB_SVGALIB=m # CONFIG_FB_MACMODES is not set @@ -3806,7 +3744,6 @@ CONFIG_FB_TRIDENT=m # CONFIG_FB_GEODE is not set # CONFIG_FB_TMIO is not set # CONFIG_FB_SM501 is not set -CONFIG_FB_UDL=m # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set @@ -4017,6 +3954,7 @@ CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m +CONFIG_SND_HIFIER=m CONFIG_SND_ICE1712=m CONFIG_SND_ICE1724=m CONFIG_SND_INTEL8X0=m @@ -4052,7 +3990,6 @@ CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m CONFIG_SND_SOC=m -CONFIG_SND_SOC_CACHE_LZO=y CONFIG_SND_SOC_I2C_AND_SPI=m # CONFIG_SND_SOC_ALL_CODECS is not set # CONFIG_SOUND_PRIME is not set @@ -4083,7 +4020,6 @@ CONFIG_HID_PRODIKEYS=m CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_DRAGONRISE_FF=y -CONFIG_HID_EMS_FF=m CONFIG_HID_EGALAX=m CONFIG_HID_ELECOM=m CONFIG_HID_EZKEY=m @@ -4102,7 +4038,6 @@ CONFIG_HID_MAGICMOUSE=m CONFIG_HID_MICROSOFT=m CONFIG_HID_MOSART=m CONFIG_HID_MONTEREY=m -CONFIG_HID_MULTITOUCH=m CONFIG_HID_NTRIG=m CONFIG_HID_ORTEK=m CONFIG_HID_PANTHERLORD=m @@ -4116,7 +4051,6 @@ CONFIG_HID_PICOLCD_LEDS=y CONFIG_HID_QUANTA=m CONFIG_HID_ROCCAT=m CONFIG_HID_ROCCAT_KONE=m -CONFIG_HID_ROCCAT_KONEPLUS=m CONFIG_HID_ROCCAT_PYRA=m CONFIG_HID_SAMSUNG=m CONFIG_HID_SONY=m @@ -4326,15 +4260,13 @@ CONFIG_USB_GADGET=m CONFIG_USB_GADGET_VBUS_DRAW=2 CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_R8A66597 is not set -# CONFIG_USB_GADGET_PXA_U2O is not set # CONFIG_USB_GADGET_M66592 is not set # CONFIG_USB_GADGET_AMD5536UDC is not set -# CONFIG_USB_GADGET_CI13XXX_PCI is not set +# CONFIG_USB_GADGET_CI13XXX is not set CONFIG_USB_GADGET_NET2280=y CONFIG_USB_NET2280=m # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LANGWELL is not set -# CONFIG_USB_GADGET_EG20T is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set CONFIG_USB_GADGET_DUALSPEED=y # CONFIG_USB_ZERO is not set @@ -4342,7 +4274,6 @@ CONFIG_USB_AUDIO=m CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y # CONFIG_USB_ETH_EEM is not set -CONFIG_USB_G_NCM=m CONFIG_USB_GADGETFS=m CONFIG_USB_FUNCTIONFS=m CONFIG_USB_FUNCTIONFS_ETH=y @@ -4376,7 +4307,6 @@ CONFIG_UWB_I1480U=m CONFIG_MMC=m # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_UNSAFE_RESUME is not set -# CONFIG_MMC_CLKGATE is not set # # MMC/SD/SDIO Card Drivers @@ -4393,7 +4323,6 @@ CONFIG_SDIO_UART=m CONFIG_MMC_SDHCI=m CONFIG_MMC_SDHCI_PCI=m CONFIG_MMC_RICOH_MMC=y -CONFIG_MMC_SDHCI_OF=m CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_WBSD=m CONFIG_MMC_TIFM_SD=m @@ -4426,7 +4355,6 @@ CONFIG_LEDS_NET5501=m CONFIG_LEDS_PCA9532=m CONFIG_LEDS_GPIO=m CONFIG_LEDS_GPIO_PLATFORM=y -CONFIG_LEDS_GPIO_OF=y CONFIG_LEDS_LP3944=m CONFIG_LEDS_LP5521=m CONFIG_LEDS_LP5523=m @@ -4454,8 +4382,6 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m # # iptables trigger is under Netfilter config (LED target) # -CONFIG_NFC_DEVICES=y -CONFIG_PN544_NFC=m CONFIG_ACCESSIBILITY=y CONFIG_A11Y_BRAILLE_CONSOLE=y # CONFIG_INFINIBAND is not set @@ -4496,6 +4422,7 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0" CONFIG_RTC_INTF_SYSFS=y CONFIG_RTC_INTF_PROC=y CONFIG_RTC_INTF_DEV=y +CONFIG_RTC_INTF_DEV_UIE_EMUL=y CONFIG_RTC_DRV_TEST=m # @@ -4609,10 +4536,10 @@ CONFIG_VIDEO_CX25821_ALSA=m CONFIG_VIDEO_TM6000=m CONFIG_VIDEO_TM6000_ALSA=m CONFIG_VIDEO_TM6000_DVB=m -CONFIG_USB_DABUSB=m -CONFIG_USB_SE401=m -CONFIG_VIDEO_USBVIDEO=m -CONFIG_USB_VICAM=m +CONFIG_VIDEO_CPIA=m +CONFIG_VIDEO_CPIA_PP=m +CONFIG_VIDEO_CPIA_USB=m +CONFIG_VIDEO_STRADIS=m CONFIG_USB_IP_COMMON=m CONFIG_USB_IP_VHCI_HCD=m CONFIG_USB_IP_HOST=m @@ -4784,18 +4711,18 @@ CONFIG_USB_SERIAL_QUATECH2=m CONFIG_USB_SERIAL_QUATECH_USB2=m CONFIG_VT6655=m CONFIG_VT6656=m +CONFIG_FB_UDL=m CONFIG_HYPERV=m CONFIG_HYPERV_STORAGE=m CONFIG_HYPERV_BLOCK=m CONFIG_HYPERV_NET=m CONFIG_HYPERV_UTILS=m # CONFIG_VME_BUS is not set -CONFIG_DX_SEP=m # CONFIG_IIO is not set -CONFIG_CS5535_GPIO=m CONFIG_ZRAM=m CONFIG_WLAGS49_H2=m CONFIG_WLAGS49_H25=m +# CONFIG_BATMAN_ADV is not set CONFIG_SAMSUNG_LAPTOP=m CONFIG_FB_SM7XX=m CONFIG_VIDEO_DT3155=m @@ -4806,6 +4733,7 @@ CONFIG_CRYSTALHD=m # Texas Instruments shared transport line discipline # CONFIG_ST_BT=m +CONFIG_ADIS16255=m CONFIG_FB_XGI=m # CONFIG_LIRC_STAGING is not set CONFIG_SMB_FS=m @@ -4857,8 +4785,6 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m CONFIG_SPEAKUP_SYNTH_DUMMY=m -CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m -CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m @@ -4943,6 +4869,7 @@ CONFIG_JFS_POSIX_ACL=y CONFIG_JFS_SECURITY=y # CONFIG_JFS_DEBUG is not set CONFIG_JFS_STATISTICS=y +CONFIG_FS_POSIX_ACL=y CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_POSIX_ACL=y @@ -4959,7 +4886,6 @@ CONFIG_OCFS2_FS_STATS=y CONFIG_BTRFS_FS=m CONFIG_BTRFS_FS_POSIX_ACL=y CONFIG_NILFS2_FS=m -CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=m CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y @@ -5050,9 +4976,8 @@ CONFIG_JFFS2_RTIME=y CONFIG_LOGFS=m CONFIG_CRAMFS=m CONFIG_SQUASHFS=m -CONFIG_SQUASHFS_XATTR=y -CONFIG_SQUASHFS_LZO=y -CONFIG_SQUASHFS_XZ=y +CONFIG_SQUASHFS_XATTRS=y +CONFIG_SQUASHFS_LZMA=y # CONFIG_SQUASHFS_EMBEDDED is not set CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # CONFIG_VXFS_FS is not set @@ -5283,7 +5208,6 @@ CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_RING_BUFFER=y CONFIG_EVENT_TRACING=y -CONFIG_EVENT_POWER_TRACING_DEPRECATED=y CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_RING_BUFFER_ALLOW_SWAP=y CONFIG_TRACING=y @@ -5324,7 +5248,6 @@ CONFIG_EARLY_PRINTK=y # CONFIG_DEBUG_PER_CPU_MAPS is not set # CONFIG_X86_PTDUMP is not set # CONFIG_DEBUG_RODATA is not set -# CONFIG_DEBUG_SET_MODULE_RONX is not set # CONFIG_DEBUG_NX_TEST is not set CONFIG_DOUBLEFAULT=y # CONFIG_IOMMU_STRESS is not set @@ -5347,8 +5270,6 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0 # Security options # CONFIG_KEYS=y -CONFIG_TRUSTED_KEYS=m -CONFIG_ENCRYPTED_KEYS=m # CONFIG_KEYS_DEBUG_PROC_KEYS is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITY=y @@ -5420,7 +5341,6 @@ CONFIG_CRYPTO_ECB=m CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_XTS=m -CONFIG_CRYPTO_FPU=m # # Hash modes @@ -5453,7 +5373,6 @@ CONFIG_CRYPTO_WP512=m # CONFIG_CRYPTO_AES=m CONFIG_CRYPTO_AES_586=m -CONFIG_CRYPTO_AES_NI_INTEL=m CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_ARC4=m CONFIG_CRYPTO_BLOWFISH=m @@ -5483,9 +5402,6 @@ CONFIG_CRYPTO_LZO=m # Random Number Generation # CONFIG_CRYPTO_ANSI_CPRNG=m -CONFIG_CRYPTO_USER_API=m -CONFIG_CRYPTO_USER_API_HASH=m -CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m @@ -5498,7 +5414,6 @@ CONFIG_HAVE_KVM_IRQCHIP=y CONFIG_HAVE_KVM_EVENTFD=y CONFIG_KVM_APIC_ARCHITECTURE=y CONFIG_KVM_MMIO=y -CONFIG_KVM_ASYNC_PF=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m @@ -5532,20 +5447,11 @@ CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y -CONFIG_XZ_DEC=y -CONFIG_XZ_DEC_X86=y -CONFIG_XZ_DEC_POWERPC=y -CONFIG_XZ_DEC_IA64=y -CONFIG_XZ_DEC_ARM=y -CONFIG_XZ_DEC_ARMTHUMB=y -CONFIG_XZ_DEC_SPARC=y -CONFIG_XZ_DEC_BCJ=y -CONFIG_XZ_DEC_TEST=m CONFIG_DECOMPRESS_GZIP=y CONFIG_DECOMPRESS_BZIP2=y CONFIG_DECOMPRESS_LZMA=y -CONFIG_DECOMPRESS_XZ=y CONFIG_DECOMPRESS_LZO=y +CONFIG_DECOMPRESS_LZMA_NEEDED=y CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m @@ -5557,4 +5463,3 @@ CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y CONFIG_NLATTR=y CONFIG_LRU_CACHE=m -CONFIG_AVERAGE=y diff --git a/kernel26/kernel26.install b/kernel26/kernel26.install index 716f213cc..f8adcba36 100644 --- a/kernel26/kernel26.install +++ b/kernel26/kernel26.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=2.6.38-CHAKRA +KERNEL_VERSION=2.6.37-CHAKRA post_install () { # updating module dependencies diff --git a/linux-2.6-CHAKRA/PATCHCFG b/linux-2.6-CHAKRA/PATCHCFG index a093e7548..4fefd0b2a 100644 --- a/linux-2.6-CHAKRA/PATCHCFG +++ b/linux-2.6-CHAKRA/PATCHCFG @@ -1,38 +1,38 @@ # Kernel source file -SRC="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.38-rc5.tar.bz2" +SRC="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.37.tar.bz2" # Original source directory -SRCORIG="linux-2.6.38-rc5" +SRCORIG="linux-2.6.37" # Our source directory -SRCNAME="linux-2.6.38-rc5-CHAKRA" +SRCNAME="linux-2.6.37-CHAKRA" # Patches: # URL%patchlevel # or # filename%patchlevel (file must be in patches subdirectory) PATCHES=( - # add upstream patch from 2.6.38 series - #http://www.kernel.org/pub/linux/kernel/v2.6/patch-2.6.38.1.bz2%1 + # add upstream patch from 2.6.37 series + http://www.kernel.org/pub/linux/kernel/v2.6/patch-2.6.37.2.bz2%1 # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git # add aufs2 support, in reference to: # http://aufs.sourceforge.net - http://chakra-project.org/sources/kernel26/patches/38/aufs2.1/aufs2-kbuild-38.patch%1 - http://chakra-project.org/sources/kernel26/patches/38/aufs2.1/aufs2-base-38.patch%1 - http://chakra-project.org/sources/kernel26/patches/38/aufs2.1/aufs2-standalone-38.patch%1 - http://chakra-project.org/sources/kernel26/patches/38/aufs2.1/aufs2.1-standalone.tree-38-rcN-20110207.patch.bz2%1 + http://chakra-project.org/sources/kernel26/patches/37/aufs2.1/aufs2-kbuild-37.patch%1 + http://chakra-project.org/sources/kernel26/patches/37/aufs2.1/aufs2-base-37.patch%1 + http://chakra-project.org/sources/kernel26/patches/37/aufs2.1/aufs2-standalone-37.patch%1 + http://chakra-project.org/sources/kernel26/patches/37/aufs2.1/aufs2.1-standalone.tree-37-20110221.patch.bz2%1 # squashfs with lzma - #http://chakra-project.org/sources/kernel26/patches/38/squashfs-lzma/01-squashfs_revert_to_2.6.35.patch%1 - #http://chakra-project.org/sources/kernel26/patches/38/squashfs-lzma/02-squashfs_add_lzma.patch%1 - #http://chakra-project.org/sources/kernel26/patches/38/squashfs-lzma/03-squashfs_make_lzma_available.patch%1 - #http://chakra-project.org/sources/kernel26/patches/38/squashfs-lzma/04-decompress_unlzo_fix.patch%1 - #http://chakra-project.org/sources/kernel26/patches/38/squashfs-lzma/05-fix_building_squashfs_with_xattrs.patch%1 + http://chakra-project.org/sources/kernel26/patches/37/squashfs-lzma/01-squashfs_revert_to_2.6.35.patch%1 + http://chakra-project.org/sources/kernel26/patches/37/squashfs-lzma/02-squashfs_add_lzma.patch%1 + http://chakra-project.org/sources/kernel26/patches/37/squashfs-lzma/03-squashfs_make_lzma_available.patch%1 + http://chakra-project.org/sources/kernel26/patches/37/squashfs-lzma/04-decompress_unlzo_fix.patch%1 + http://chakra-project.org/sources/kernel26/patches/37/squashfs-lzma/05-fix_building_squashfs_with_xattrs.patch%1 # sched_autogroup - #http://chakra-project.org/sources/kernel26/patches/38/autogroup/kernel2.6.38-cgroup.patch%1 + http://chakra-project.org/sources/kernel26/patches/37/autogroup/kernel2.6.37.1-cgroup.patch%1 ) # Name of the resulting patch (will be bzipped afterwards) -PATCHNAME="patch-2.6.38-rc5-2-CHAKRA" +PATCHNAME="patch-2.6.37.2-1-CHAKRA" # Run this before applying patches pre_apply() { diff --git a/linux-2.6-CHAKRA/gen_kernel_patch b/linux-2.6-CHAKRA/gen_kernel_patch index 80ee23c90..610b6cb84 100755 --- a/linux-2.6-CHAKRA/gen_kernel_patch +++ b/linux-2.6-CHAKRA/gen_kernel_patch @@ -28,7 +28,7 @@ get_file() { cd ${OPWD} } -source ../_buildscripts/core-testing-${_arch}-makepkg.conf +source ../_buildscripts/core-${_arch}-makepkg.conf source PATCHCFG export SRCNAME @@ -53,6 +53,8 @@ done post_apply +rm -v $(find . -type f -name '*.orig') + cd ${startdir}/src diff -Nur ${SRCORIG} ${SRCNAME} > $startdir/${PATCHNAME} bzip2 --best $startdir/${PATCHNAME} diff --git a/nfs-utils/PKGBUILD b/nfs-utils/PKGBUILD index d49710879..afa8f13c8 100644 --- a/nfs-utils/PKGBUILD +++ b/nfs-utils/PKGBUILD @@ -1,19 +1,21 @@ # $Id: PKGBUILD 75208 2010-04-01 02:24:20Z pierre $ # Maintainer: Tobias Powalowski # Contributor: John Proctor -# Contributor: dibblethewrecker -# Contributor: abelstr -# Contributor: Marco Lima +# +# Packages for Chakra, part of chakra-project.org +# +# maintainer (i686): Phil Miller +# maintainer (x86_64): Manuel Tortosa pkgname=nfs-utils pkgver=1.2.2 -pkgrel=2 +pkgrel=3 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64') url='http://nfs.sourceforge.net' license=('GPL') backup=(etc/{exports,idmapd.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf}) -depends=('glibc' 'tcp_wrappers' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=1.3e' 'libgssglue') +depends=('glibc' 'tcp_wrappers' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue') makedepends=('pkgconfig' 'autoconf') source=(http://downloads.sourceforge.net/nfs/${pkgname}-${pkgver}.tar.bz2 nfs-common