diff --git a/common/shlibs b/common/shlibs index bd16df7187d..11e8ecf392a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -944,3 +944,5 @@ libmdbsql.so.0 libmdb mdbtools-devel libkmod.so.1 libkmod libkmod-devel libestr.so.0 libestr libestr-devel libee.so.0 libee libee-devel +libobt.so.0 libopenbox openbox-devel +libobrender.so.27 libopenbox openbox-devel diff --git a/srcpkgs/SDL_image/SDL_image-devel.template b/srcpkgs/SDL_image/SDL_image-devel.template index cf43718d368..c80299d60f8 100644 --- a/srcpkgs/SDL_image/SDL_image-devel.template +++ b/srcpkgs/SDL_image/SDL_image-devel.template @@ -1,22 +1,18 @@ # Template file for 'SDL_image-devel'. # -short_desc="${short_desc} (development files)" +short_desc="${short_desc} - development files" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -revision=2 - Add_dependency run libpng-devel Add_dependency run tiff-devel Add_dependency run jpeg-devel Add_dependency run SDL-devel Add_dependency run SDL_image -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib +do_install() { + vmove usr/include usr + vmove "usr/lib/*.a" usr/lib + vmove usr/lib/pkgconfig usr/lib } diff --git a/srcpkgs/SDL_image/depends b/srcpkgs/SDL_image/depends index a24e33ec004..7784c0e6b00 100644 --- a/srcpkgs/SDL_image/depends +++ b/srcpkgs/SDL_image/depends @@ -1,2 +1,2 @@ abi_depends=">=1.2.10" -api_depends="${abi_depends}" +api_depends=">=1.2.11" # libwebp support diff --git a/srcpkgs/SDL_image/template b/srcpkgs/SDL_image/template index b5795c36a55..87c536a9000 100644 --- a/srcpkgs/SDL_image/template +++ b/srcpkgs/SDL_image/template @@ -1,22 +1,31 @@ # Template file for 'SDL_image' pkgname=SDL_image -version=1.2.10 -revision=5 +version=1.2.11 +homepage="http://www.libsdl.org/projects/SDL_image/" distfiles="http://www.libsdl.org/projects/$pkgname/release/$pkgname-$version.tar.gz" build_style=gnu-configure short_desc="Load images as SDL surfaces" maintainer="Juan RP " -checksum=75e05d1e95f6277b44797157d9e25a908ba8d08a393216ffb019b0d74de11876 +license="BSD" +checksum=0b8f51af8c77a6849501fed675d49808ae6fbf1429d32ccbd958b7ba7c04be3b long_desc=" This is a simple library to load images of various formats as SDL surfaces. This library supports BMP, PNM (PPM/PGM/PBM), XPM, LBM, PCX, GIF, JPEG, PNG, TGA, and TIFF formats." subpackages="$pkgname-devel" +# The following are dlopen(3)ed at runtime. Add_dependency run libpng Add_dependency run tiff Add_dependency run jpeg +Add_dependency run libwebp + Add_dependency build libpng-devel Add_dependency build tiff-devel Add_dependency build jpeg-devel Add_dependency build SDL-devel +Add_dependency build libwebp-devel + +post_install() { + vinstall COPYING 644 usr/share/licenses/${pkgname} +} diff --git a/srcpkgs/SDL_mixer/INSTALL b/srcpkgs/SDL_mixer/INSTALL new file mode 100644 index 00000000000..4cb91673242 --- /dev/null +++ b/srcpkgs/SDL_mixer/INSTALL @@ -0,0 +1,10 @@ +case ${ACTION} in +post) + cat <<_EOF +========================================================================== + By default this package uses its built-in timidity as MIDI synth, + optionally installing the fluidsynth package replaces it. It is + dlopen(3)ed at runtime. +========================================================================== +_EOF +esac diff --git a/srcpkgs/SDL_mixer/SDL_mixer-devel.template b/srcpkgs/SDL_mixer/SDL_mixer-devel.template index 63291acd1c5..d27748672f1 100644 --- a/srcpkgs/SDL_mixer/SDL_mixer-devel.template +++ b/srcpkgs/SDL_mixer/SDL_mixer-devel.template @@ -5,8 +5,6 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -revision=2 - Add_dependency run SDL-devel Add_dependency run libvorbis-devel Add_dependency run libmikmod-devel @@ -14,10 +12,8 @@ Add_dependency run libflac-devel Add_dependency run smpeg-devel Add_dependency run SDL_mixer -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib +do_install() { + vmove usr/include usr + vmove "usr/lib/*.a" usr/lib + vmove usr/lib/pkgconfig usr/lib } diff --git a/srcpkgs/SDL_mixer/SDL_mixer.rshlibs b/srcpkgs/SDL_mixer/SDL_mixer.rshlibs index 03eaa624bfc..1f071d2e555 100644 --- a/srcpkgs/SDL_mixer/SDL_mixer.rshlibs +++ b/srcpkgs/SDL_mixer/SDL_mixer.rshlibs @@ -1,3 +1,4 @@ libSDL-1.2.so.0 libpthread.so.0 libc.so.6 +libm.so.6 diff --git a/srcpkgs/SDL_mixer/template b/srcpkgs/SDL_mixer/template index 04bff228f2e..7c21cd12e8d 100644 --- a/srcpkgs/SDL_mixer/template +++ b/srcpkgs/SDL_mixer/template @@ -1,12 +1,14 @@ # Template file for 'SDL_mixer' pkgname=SDL_mixer -version=1.2.11 -revision=2 +version=1.2.12 +revision=1 +homepage="http://www.libsdl.org/projects/SDL_mixer/" distfiles="http://www.libsdl.org/projects/$pkgname/release/$pkgname-$version.tar.gz" build_style=gnu-configure short_desc="Multi-channel audio mixer library" maintainer="Juan RP " -checksum=86145ac39cac6d2c6169c226f937648dca5e89dcd828751763dd174fa9af9cf9 +license="BSD" +checksum=1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a long_desc=" SDL_mixer is a sample multi-channel audio mixer library. It supports any number of simultaneously playing channels of 16 bit stereo audio, plus @@ -14,20 +16,27 @@ long_desc=" Ogg Vorbis, and SMPEG MP3 libraries." subpackages="$pkgname-devel" +# The following are dlopen(3)ed at runtime. Add_dependency run libvorbis Add_dependency run libmikmod Add_dependency run smpeg Add_dependency run libflac +#Add_dependency run libfluidsynth + Add_dependency build SDL-devel Add_dependency build libvorbis-devel Add_dependency build libmikmod-devel Add_dependency build libflac-devel Add_dependency build smpeg-devel +Add_dependency build fluidsynth-devel -pre_configure() -{ - sed -i 's|/usr/local/lib/timidity|/usr/lib/timidity|' \ - ${wrksrc}/timidity/config.h || return 1 - sed -i 's|/etc/timidity/timidity.cfg|/etc/timidity++/timidity.cfg|' \ - ${wrksrc}/timidity/config.h || return 1 +pre_configure() { + sed -e "/CONFIG_FILE_ETC/s|/etc/timidity.cfg|/etc/timidity++/timidity.cfg|" \ + -e "/DEFAULT_PATH/s|/etc/timidity|/etc/timidity++|" \ + -e "/DEFAULT_PATH2/s|/usr/local/lib/timidity|/usr/lib/timidity|" \ + -i timidity/config.h +} + +post_install() { + vinstall COPYING 644 usr/share/licenses/${pkgname} } diff --git a/srcpkgs/SDL_net/SDL_net-devel.template b/srcpkgs/SDL_net/SDL_net-devel.template index 405e8fc976c..f867815ec2c 100644 --- a/srcpkgs/SDL_net/SDL_net-devel.template +++ b/srcpkgs/SDL_net/SDL_net-devel.template @@ -5,13 +5,11 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -revision=1 - Add_dependency run SDL-devel +Add_dependency run SDL_net -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib +do_install() { + vmove usr/include usr + vmove "usr/lib/*.a" usr/lib + vmove usr/lib/pkgconfig usr/lib } diff --git a/srcpkgs/SDL_net/depends b/srcpkgs/SDL_net/depends index 7af62f136f9..15f94400560 100644 --- a/srcpkgs/SDL_net/depends +++ b/srcpkgs/SDL_net/depends @@ -1,2 +1,2 @@ abi_depends=">=1.2.7" -api_depends="${abi_depends}" +api_depends=">=1.2.8" # pkgconfig support in -devel pkg. diff --git a/srcpkgs/SDL_net/template b/srcpkgs/SDL_net/template index 58d2de21259..c2388882a89 100644 --- a/srcpkgs/SDL_net/template +++ b/srcpkgs/SDL_net/template @@ -1,15 +1,20 @@ # Template file for 'SDL_net' pkgname=SDL_net -version=1.2.7 -revision=2 +version=1.2.8 +homepage="http://www.libsdl.org/projects/SDL_net/" distfiles="http://www.libsdl.org/projects/$pkgname/release/$pkgname-$version.tar.gz" build_style=gnu-configure short_desc="Small sample cross-platform networking library for SDL" maintainer="Juan RP " -checksum=2ce7c84e62ff8117b9f205758bcce68ea603e08bc9d6936ded343735b8b77c53 +license="BSD" +checksum=5f4a7a8bb884f793c278ac3f3713be41980c5eedccecff0260411347714facb4 long_desc=" This is a small sample cross-platform networking library which is supplementary to the SDL (Simple DirectMedia Layer) library." subpackages="$pkgname-devel" Add_dependency build SDL-devel + +post_install() { + vinstall COPYING 644 usr/share/licenses/${pkgname} +} diff --git a/srcpkgs/SDL_ttf/template b/srcpkgs/SDL_ttf/template index 7bf30cfd69b..a2fd5a90c31 100644 --- a/srcpkgs/SDL_ttf/template +++ b/srcpkgs/SDL_ttf/template @@ -1,14 +1,13 @@ # Template file for 'SDL_ttf' pkgname=SDL_ttf -version=2.0.10 +version=2.0.11 homepage="http://www.libsdl.org/projects/$pkgname" distfiles="${homepage}/release/$pkgname-$version.tar.gz" build_style=gnu-configure -revision=1 short_desc="Use TrueType fonts in your SDL applications" maintainer="Juan RP " license="LGPL-2.1" -checksum=7d38704bcc7c34029c2dcb73b2d4857e8ad76341c6e0faed279eb9f743c66c6a +checksum=724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7 long_desc=" SDL_ttf is a TrueType font rendering library that is used with the SDL library, and almost as portable. It depends on freetype2 to handle the @@ -22,3 +21,4 @@ subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build freetype-devel Add_dependency build SDL-devel +Add_dependency build MesaLib-devel diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template index 766e0c7cff4..4e88da9e4eb 100644 --- a/srcpkgs/at-spi2-core/template +++ b/srcpkgs/at-spi2-core/template @@ -1,11 +1,11 @@ # Template file for 'at-spi2-core' pkgname=at-spi2-core -version=2.2.2 +version=2.2.3 distfiles="${GNOME_SITE}/$pkgname/2.2/$pkgname-$version.tar.xz" build_style=gnu-configure short_desc="Assistive Technology Service Provider Interface" maintainer="Juan RP " -checksum=d9b8ab2324d42b68552ec787b19619631c934528dc859da2349ea5f0ee7cc8b7 +checksum=fb97f0a02fa378795e50857e22e640e099be1768081e28ca2dbdb3835f5b6af1 long_desc=" This package includes the protocol definitions for the new D-Bus at-spi. diff --git a/srcpkgs/colord/template b/srcpkgs/colord/template index 452a97b99ce..c2f472f8b35 100644 --- a/srcpkgs/colord/template +++ b/srcpkgs/colord/template @@ -1,13 +1,13 @@ # Template file for 'colord' pkgname=colord -version=0.1.15 +version=0.1.16 homepage="http://www.freedesktop.org/software/colord" distfiles="$homepage/releases/$pkgname-$version.tar.xz" build_style=gnu-configure configure_args="--disable-sane --disable-static" short_desc="Color daemon" maintainer="Juan RP " -checksum=dff56476e02527899f4a2c39eeb092af369ab5dac1e21cbb6a5b0955b5c6e746 +checksum=9489e29e7f5f529f759f7b913ccb8147e702bcdad641dfc1f94a1fc74dd942b1 long_desc=" colord is a system service that makes it easy to manage, install and generate color profiles to accurately color manage input and output devices. diff --git a/srcpkgs/connman/connman.rshlibs b/srcpkgs/connman/connman.rshlibs new file mode 100644 index 00000000000..a08f5d9cd4b --- /dev/null +++ b/srcpkgs/connman/connman.rshlibs @@ -0,0 +1,8 @@ +libgthread-2.0.so.0 +libglib-2.0.so.0 +libdbus-1.so.3 +libpthread.so.0 +libxtables.so.7 +libresolv.so.2 +libdl.so.2 +libc.so.6 diff --git a/srcpkgs/connman/files/connmand.rc b/srcpkgs/connman/files/connmand.rc deleted file mode 100644 index 10f222131fa..00000000000 --- a/srcpkgs/connman/files/connmand.rc +++ /dev/null @@ -1,9 +0,0 @@ -#!/sbin/runscript - -command=/usr/sbin/connmand -name="Connection Manager daemon" - -depend() -{ - need dbus localmount -} diff --git a/srcpkgs/connman/template b/srcpkgs/connman/template index 09f5fc50371..84949dafa79 100644 --- a/srcpkgs/connman/template +++ b/srcpkgs/connman/template @@ -1,16 +1,16 @@ # Template file for 'connman' pkgname=connman -version=0.69 -revision=1 -distfiles="${KERNEL_SITE}/network/$pkgname/$pkgname-$version.tar.bz2" +version=0.78 +distfiles="${KERNEL_SITE}/network/$pkgname/$pkgname-$version.tar.xz" build_style=gnu-configure -configure_args="--enable-pie --enable-polkit ---enable-ethernet --enable-wifi --enable-bluetooth --enable-openvpn ---enable-loopback --enable-pacrunner --enable-ntpd --enable-client ---enable-capng --enable-google --enable-threads" +configure_args="--enable-pie --enable-threads --enable-ethernet +--enable-wifi --enable-bluetooth --enable-loopback --enable-google +--enable-ntpd --enable-nmcompat --enable-polkit --enable-client +--enable-capng --with-systemdunitdir=/lib/systemd/system" +revision=1 short_desc="Open Source CONNection MANager" maintainer="Juan RP " -checksum=9f7bd87cb36689a2deb943d1fdb79c030071b2c4bc763e32cfd933955017419c +checksum=7a06c4b8abe09c8c07a73e39e3fda1de1aa9168e5081ee13a0850220b7593f62 long_desc=" The ConnMan project provides a daemon for managing internet connections within embedded devices running the Linux operating system. The Connection @@ -21,15 +21,8 @@ long_desc=" resolving, are implemented using plug-ins. The plug-in approach allows for easy adaption and modification for various use cases." -openrc_services="connmand default true" subpackages="$pkgname-devel" -Add_dependency run glibc -Add_dependency run glib -Add_dependency run dbus-libs -Add_dependency run iptables -Add_dependency run libcap-ng - Add_dependency build pkg-config Add_dependency build glib-devel Add_dependency build dbus-devel @@ -37,11 +30,5 @@ Add_dependency build iptables-devel Add_dependency build libcap-ng-devel Add_dependency full dbus -Add_dependency full udev Add_dependency full bluez Add_dependency full wpa_supplicant - -post_install() -{ - vinstall ${FILESDIR}/connmand.rc 755 etc/init.d connmand -} diff --git a/srcpkgs/intltool/template b/srcpkgs/intltool/template index a5ab9889d1a..4f4cd63fc29 100644 --- a/srcpkgs/intltool/template +++ b/srcpkgs/intltool/template @@ -1,11 +1,11 @@ # Template build file for 'intltool'. pkgname=intltool -version=0.41.1 +version=0.50.0 distfiles="http://launchpad.net/intltool/trunk/$version/+download/$pkgname-$version.tar.gz" build_style=gnu-configure short_desc="Toolbox for internationalisation" maintainer="Juan RP " -checksum=06d02133a85b9d6f29cd763050dc9267a6d73ef3008993f5b917cafc7ece96c0 +checksum=dccfb0b7dd35a170130e8934bfd30c29da6ae73bcd3ca4ba71317c977b2893d6 long_desc=" The intltool collection can be used to do these things: diff --git a/srcpkgs/kernel/common-vars b/srcpkgs/kernel/common-vars index 330eb992e7a..570f62c1af8 100644 --- a/srcpkgs/kernel/common-vars +++ b/srcpkgs/kernel/common-vars @@ -1,10 +1,10 @@ # Common vars shared by the 'kernel' and 'kernel-libc-headers' # build templates. -_kmajorver=3.1 -version=${_kmajorver}.9 +_kmajorver=3.2 +version=${_kmajorver}.1 wrksrc="linux-${version}" distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version}.tar.xz" maintainer="Juan RP " homepage="http://www.kernel.org" license="GPL-2" -checksum=bcf6d7dca2c6faa3dead83c4ea0705451f55552fe7945f1666d660aa332af6e6 +checksum=1bd7a89830b7e0491943964491ac41ff44299f28e864d90a1f396e57fe24756b diff --git a/srcpkgs/kernel/files/x86_64-dotconfig b/srcpkgs/kernel/files/x86_64-dotconfig index 17cf69f8c1a..e76040724fe 100644 --- a/srcpkgs/kernel/files/x86_64-dotconfig +++ b/srcpkgs/kernel/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.1.1 Kernel Configuration +# Linux/x86_64 3.2.1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -39,7 +39,6 @@ CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y -CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ZONE_DMA32=y @@ -98,8 +97,9 @@ CONFIG_HAVE_SPARSE_IRQ=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_GENERIC_IRQ_CHIP=y CONFIG_IRQ_FORCED_THREADING=y -# CONFIG_SPARSE_IRQ is not set +CONFIG_SPARSE_IRQ=y # # RCU Subsystem @@ -131,6 +131,7 @@ CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED=y CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y +CONFIG_CFS_BANDWIDTH=y CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_CGROUP=y # CONFIG_DEBUG_BLK_CGROUP is not set @@ -156,7 +157,7 @@ CONFIG_SYSCTL=y CONFIG_ANON_INODES=y # CONFIG_EXPERT is not set CONFIG_UID16=y -CONFIG_SYSCTL_SYSCALL=y +# CONFIG_SYSCTL_SYSCALL is not set CONFIG_KALLSYMS=y CONFIG_HOTPLUG=y CONFIG_PRINTK=y @@ -227,7 +228,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_BLK_DEV_BSG=y -# CONFIG_BLK_DEV_BSGLIB is not set +CONFIG_BLK_DEV_BSGLIB=y # CONFIG_BLK_DEV_INTEGRITY is not set # CONFIG_BLK_DEV_THROTTLING is not set CONFIG_BLOCK_COMPAT=y @@ -283,6 +284,7 @@ CONFIG_TICK_ONESHOT=y # CONFIG_NO_HZ is not set CONFIG_HIGH_RES_TIMERS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y CONFIG_SMP=y CONFIG_X86_X2APIC=y CONFIG_X86_MPPARSE=y @@ -298,7 +300,6 @@ CONFIG_XEN_PVHVM=y CONFIG_XEN_MAX_DOMAIN_MEMORY=128 CONFIG_XEN_SAVE_RESTORE=y # CONFIG_XEN_DEBUG_FS is not set -# CONFIG_XEN_DEBUG is not set CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y CONFIG_PARAVIRT=y @@ -409,6 +410,7 @@ CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y +CONFIG_ARCH_RANDOM=y CONFIG_EFI=y CONFIG_SECCOMP=y CONFIG_CC_STACKPROTECTOR=y @@ -471,12 +473,12 @@ CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=m CONFIG_ACPI_HOTPLUG_MEMORY=m CONFIG_ACPI_SBS=m -CONFIG_ACPI_HED=y +CONFIG_ACPI_HED=m CONFIG_ACPI_CUSTOM_METHOD=m CONFIG_ACPI_APEI=y -CONFIG_ACPI_APEI_GHES=y +# CONFIG_ACPI_APEI_GHES is not set CONFIG_ACPI_APEI_PCIEAER=y -CONFIG_ACPI_APEI_MEMORY_FAILURE=y +# CONFIG_ACPI_APEI_MEMORY_FAILURE is not set CONFIG_ACPI_APEI_EINJ=m CONFIG_ACPI_APEI_ERST_DEBUG=m CONFIG_SFI=y @@ -543,14 +545,16 @@ CONFIG_PCI_MSI=y CONFIG_PCI_STUB=m CONFIG_XEN_PCIDEV_FRONTEND=m CONFIG_HT_IRQ=y +CONFIG_PCI_ATS=y CONFIG_PCI_IOV=y +CONFIG_PCI_PRI=y +CONFIG_PCI_PASID=y CONFIG_PCI_IOAPIC=y CONFIG_PCI_LABEL=y CONFIG_ISA_DMA_API=y CONFIG_AMD_NB=y CONFIG_PCCARD=m -CONFIG_PCMCIA=m -CONFIG_PCMCIA_LOAD_CIS=y +# CONFIG_PCMCIA is not set CONFIG_CARDBUS=y # @@ -562,9 +566,6 @@ CONFIG_YENTA_RICOH=y CONFIG_YENTA_TI=y CONFIG_YENTA_ENE_TUNE=y CONFIG_YENTA_TOSHIBA=y -CONFIG_PD6729=m -CONFIG_I82092=m -CONFIG_PCCARD_NONSTATIC=y CONFIG_HOTPLUG_PCI=m CONFIG_HOTPLUG_PCI_FAKE=m CONFIG_HOTPLUG_PCI_ACPI=m @@ -574,14 +575,15 @@ CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m CONFIG_HOTPLUG_PCI_SHPC=m CONFIG_RAPIDIO=y +CONFIG_RAPIDIO_TSI721=y CONFIG_RAPIDIO_DISC_TIMEOUT=30 CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS=y +CONFIG_RAPIDIO_DEBUG=y CONFIG_RAPIDIO_TSI57X=y CONFIG_RAPIDIO_CPS_XX=y CONFIG_RAPIDIO_TSI568=y CONFIG_RAPIDIO_CPS_GEN2=y CONFIG_RAPIDIO_TSI500=y -CONFIG_RAPIDIO_DEBUG=y # # Executable file formats / Emulations @@ -980,6 +982,7 @@ CONFIG_LAPB=m CONFIG_WAN_ROUTER=m CONFIG_PHONET=m CONFIG_IEEE802154=m +CONFIG_IEEE802154_6LOWPAN=m CONFIG_NET_SCHED=y # @@ -1052,6 +1055,7 @@ CONFIG_HAVE_BPF_JIT=y CONFIG_CAN=m CONFIG_CAN_RAW=m CONFIG_CAN_BCM=m +CONFIG_CAN_GW=m # # CAN Device Drivers @@ -1066,6 +1070,7 @@ CONFIG_PCH_CAN=m CONFIG_CAN_SJA1000=m # CONFIG_CAN_SJA1000_PLATFORM is not set # CONFIG_CAN_EMS_PCI is not set +CONFIG_CAN_PEAK_PCI=m # CONFIG_CAN_KVASER_PCI is not set # CONFIG_CAN_PLX_PCI is not set CONFIG_CAN_C_CAN=m @@ -1077,7 +1082,6 @@ CONFIG_CAN_C_CAN_PLATFORM=m CONFIG_CAN_EMS_USB=m CONFIG_CAN_ESD_USB2=m CONFIG_CAN_SOFTING=m -CONFIG_CAN_SOFTING_CS=m # CONFIG_CAN_DEBUG_DEVICES is not set CONFIG_IRDA=m @@ -1158,10 +1162,6 @@ CONFIG_BT_HCIUART_LL=y CONFIG_BT_HCIBCM203X=m CONFIG_BT_HCIBPA10X=m CONFIG_BT_HCIBFUSB=m -CONFIG_BT_HCIDTL1=m -CONFIG_BT_HCIBT3C=m -CONFIG_BT_HCIBLUECARD=m -CONFIG_BT_HCIBTUART=m CONFIG_BT_HCIVHCI=m CONFIG_BT_MRVL=m CONFIG_BT_MRVL_SDIO=m @@ -1216,13 +1216,16 @@ CONFIG_CAIF=m CONFIG_CAIF_NETDEV=m CONFIG_CEPH_LIB=m # CONFIG_CEPH_LIB_PRETTYDEBUG is not set +CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y CONFIG_NFC=m +CONFIG_NFC_NCI=m # # Near Field Communication (NFC) devices # CONFIG_PN544_NFC=m CONFIG_NFC_PN533=m +CONFIG_NFC_WILINK=m # # Device Drivers @@ -1242,9 +1245,9 @@ CONFIG_EXTRA_FIRMWARE="" CONFIG_SYS_HYPERVISOR=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m +CONFIG_REGMAP_SPI=m CONFIG_CONNECTOR=m CONFIG_MTD=m -# CONFIG_MTD_DEBUG is not set # CONFIG_MTD_TESTS is not set CONFIG_MTD_REDBOOT_PARTS=m CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 @@ -1313,6 +1316,7 @@ CONFIG_MTD_CFI_I2=y # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_DOCG3=m # CONFIG_MTD_NAND is not set # CONFIG_MTD_ONENAND is not set @@ -1326,7 +1330,6 @@ CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m CONFIG_PARPORT_PC_FIFO=y CONFIG_PARPORT_PC_SUPERIO=y -CONFIG_PARPORT_PC_PCMCIA=m # CONFIG_PARPORT_GSC is not set CONFIG_PARPORT_AX88796=m CONFIG_PARPORT_1284=y @@ -1424,6 +1427,11 @@ CONFIG_IWMC3200TOP=m # CONFIG_TI_ST=m CONFIG_SENSORS_LIS3_I2C=m + +# +# Altera FPGA firmware download module +# +CONFIG_ALTERA_STAPL=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -1500,10 +1508,10 @@ CONFIG_SCSI_AIC94XX=m CONFIG_SCSI_MVSAS=m # CONFIG_SCSI_MVSAS_DEBUG is not set # CONFIG_SCSI_MVSAS_TASKLET is not set +CONFIG_SCSI_MVUMI=m CONFIG_SCSI_DPT_I2O=m CONFIG_SCSI_ADVANSYS=m CONFIG_SCSI_ARCMSR=m -CONFIG_SCSI_ARCMSR_AER=y CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m @@ -1555,11 +1563,6 @@ CONFIG_SCSI_PMCRAID=m CONFIG_SCSI_PM8001=m CONFIG_SCSI_SRP=m CONFIG_SCSI_BFA_FC=m -CONFIG_SCSI_LOWLEVEL_PCMCIA=y -CONFIG_PCMCIA_AHA152X=m -CONFIG_PCMCIA_FDOMAIN=m -CONFIG_PCMCIA_QLOGIC=m -CONFIG_PCMCIA_SYM53C500=m CONFIG_SCSI_DH=m CONFIG_SCSI_DH_RDAC=m CONFIG_SCSI_DH_HP_SW=m @@ -1657,8 +1660,7 @@ CONFIG_PATA_CMD640_PCI=m CONFIG_PATA_MPIIX=m CONFIG_PATA_NS87410=m CONFIG_PATA_OPTI=m -CONFIG_PATA_PCMCIA=m -CONFIG_PATA_RZ1000=m +# CONFIG_PATA_RZ1000 is not set # # Generic fallback / legacy drivers @@ -1678,8 +1680,13 @@ CONFIG_MD_MULTIPATH=m CONFIG_MD_FAULTY=m CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set +CONFIG_DM_BUFIO=m +CONFIG_DM_PERSISTENT_DATA=m CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m +CONFIG_DM_THIN_PROVISIONING=m +# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set +# CONFIG_DM_DEBUG_SPACE_MAPS is not set CONFIG_DM_MIRROR=m CONFIG_DM_RAID=m CONFIG_DM_LOG_USERSPACE=m @@ -1723,18 +1730,232 @@ CONFIG_I2O_PROC=m CONFIG_MACINTOSH_DRIVERS=y CONFIG_MAC_EMUMOUSEBTN=y CONFIG_NETDEVICES=y -CONFIG_IFB=m -CONFIG_DUMMY=m +CONFIG_NET_CORE=y CONFIG_BONDING=m +CONFIG_DUMMY=m +CONFIG_EQUALIZER=m +# CONFIG_NET_FC is not set +CONFIG_MII=m +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKEHARD=m +CONFIG_IFB=m CONFIG_MACVLAN=m CONFIG_MACVTAP=m -CONFIG_EQUALIZER=m +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +# CONFIG_NETPOLL_TRAP is not set +CONFIG_NET_POLL_CONTROLLER=y +CONFIG_RIONET=m +CONFIG_RIONET_TX_SIZE=128 +CONFIG_RIONET_RX_SIZE=128 CONFIG_TUN=m CONFIG_VETH=m -CONFIG_NET_SB1000=m +CONFIG_VIRTIO_NET=m +CONFIG_SUNGEM_PHY=m # CONFIG_ARCNET is not set -CONFIG_MII=m -CONFIG_PHYLIB=m +CONFIG_ATM_DRIVERS=y +# CONFIG_ATM_DUMMY is not set +CONFIG_ATM_TCP=m +CONFIG_ATM_LANAI=m +CONFIG_ATM_ENI=m +# CONFIG_ATM_ENI_DEBUG is not set +# CONFIG_ATM_ENI_TUNE_BURST is not set +CONFIG_ATM_FIRESTREAM=m +CONFIG_ATM_ZATM=m +# CONFIG_ATM_ZATM_DEBUG is not set +CONFIG_ATM_NICSTAR=m +CONFIG_ATM_NICSTAR_USE_SUNI=y +CONFIG_ATM_NICSTAR_USE_IDT77105=y +CONFIG_ATM_IDT77252=m +# CONFIG_ATM_IDT77252_DEBUG is not set +# CONFIG_ATM_IDT77252_RCV_ALL is not set +CONFIG_ATM_IDT77252_USE_SUNI=y +CONFIG_ATM_AMBASSADOR=m +# CONFIG_ATM_AMBASSADOR_DEBUG is not set +CONFIG_ATM_HORIZON=m +# CONFIG_ATM_HORIZON_DEBUG is not set +CONFIG_ATM_IA=m +# CONFIG_ATM_IA_DEBUG is not set +CONFIG_ATM_FORE200E=m +# CONFIG_ATM_FORE200E_USE_TASKLET is not set +CONFIG_ATM_FORE200E_TX_RETRY=16 +CONFIG_ATM_FORE200E_DEBUG=0 +CONFIG_ATM_HE=m +# CONFIG_ATM_HE_USE_SUNI is not set +CONFIG_ATM_SOLOS=m + +# +# CAIF transport drivers +# +CONFIG_CAIF_TTY=m +CONFIG_CAIF_SPI_SLAVE=m +# CONFIG_CAIF_SPI_SYNC is not set +CONFIG_CAIF_HSI=m +CONFIG_ETHERNET=y +CONFIG_MDIO=m +CONFIG_NET_VENDOR_3COM=y +CONFIG_VORTEX=m +CONFIG_TYPHOON=m +CONFIG_NET_VENDOR_ADAPTEC=y +CONFIG_ADAPTEC_STARFIRE=m +CONFIG_NET_VENDOR_ALTEON=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_NET_VENDOR_AMD=y +CONFIG_AMD8111_ETH=m +CONFIG_PCNET32=m +CONFIG_NET_VENDOR_ATHEROS=y +CONFIG_ATL2=m +CONFIG_ATL1=m +CONFIG_ATL1E=m +CONFIG_ATL1C=m +CONFIG_NET_VENDOR_BROADCOM=y +CONFIG_B44=m +CONFIG_B44_PCI_AUTOSELECT=y +CONFIG_B44_PCICORE_AUTOSELECT=y +CONFIG_B44_PCI=y +CONFIG_BNX2=m +CONFIG_CNIC=m +CONFIG_TIGON3=m +CONFIG_BNX2X=m +CONFIG_NET_VENDOR_BROCADE=y +CONFIG_BNA=m +CONFIG_NET_VENDOR_CHELSIO=y +CONFIG_CHELSIO_T1=m +CONFIG_CHELSIO_T1_1G=y +CONFIG_CHELSIO_T3=m +CONFIG_CHELSIO_T4=m +CONFIG_CHELSIO_T4VF=m +CONFIG_NET_VENDOR_CISCO=y +CONFIG_ENIC=m +CONFIG_DNET=m +CONFIG_NET_VENDOR_DEC=y +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_DE2104X_DSL=0 +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +# CONFIG_TULIP_MMIO is not set +# CONFIG_TULIP_NAPI is not set +CONFIG_DE4X5=m +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +# CONFIG_PCMCIA_XIRCOM is not set +CONFIG_NET_VENDOR_DLINK=y +CONFIG_DE600=m +CONFIG_DE620=m +CONFIG_DL2K=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_NET_VENDOR_EMULEX=y +CONFIG_BE2NET=m +CONFIG_NET_VENDOR_EXAR=y +CONFIG_S2IO=m +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set +CONFIG_NET_VENDOR_HP=y +CONFIG_HP100=m +CONFIG_NET_VENDOR_INTEL=y +CONFIG_E100=m +CONFIG_E1000=m +CONFIG_E1000E=m +CONFIG_IGB=m +CONFIG_IGB_DCA=y +CONFIG_IGBVF=m +CONFIG_IXGB=m +CONFIG_IXGBE=m +CONFIG_IXGBE_DCA=y +CONFIG_IXGBEVF=m +CONFIG_NET_VENDOR_I825XX=y +CONFIG_ZNET=m +CONFIG_IP1000=m +CONFIG_JME=m +CONFIG_NET_VENDOR_MARVELL=y +CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set +# CONFIG_SKGE_GENESIS is not set +CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set +CONFIG_NET_VENDOR_MELLANOX=y +CONFIG_MLX4_EN=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_NET_VENDOR_MICREL=y +CONFIG_KS8842=m +CONFIG_KS8851=m +CONFIG_KS8851_MLL=m +CONFIG_KSZ884X_PCI=m +CONFIG_NET_VENDOR_MICROCHIP=y +CONFIG_ENC28J60=m +# CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_NET_VENDOR_MYRI=y +CONFIG_MYRI10GE=m +CONFIG_MYRI10GE_DCA=y +CONFIG_FEALNX=m +CONFIG_NET_VENDOR_NATSEMI=y +CONFIG_NATSEMI=m +CONFIG_NS83820=m +CONFIG_NET_VENDOR_8390=y +CONFIG_NE2K_PCI=m +CONFIG_NET_VENDOR_NVIDIA=y +CONFIG_FORCEDETH=m +CONFIG_NET_VENDOR_OKI=y +# CONFIG_PCH_GBE is not set +CONFIG_ETHOC=m +# CONFIG_NET_PACKET_ENGINE is not set +CONFIG_NET_VENDOR_QLOGIC=y +CONFIG_QLA3XXX=m +CONFIG_QLCNIC=m +CONFIG_QLGE=m +CONFIG_NETXEN_NIC=m +CONFIG_NET_VENDOR_REALTEK=y +CONFIG_ATP=m +CONFIG_8139CP=m +CONFIG_8139TOO=m +# CONFIG_8139TOO_PIO is not set +CONFIG_8139TOO_TUNE_TWISTER=y +CONFIG_8139TOO_8129=y +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_R8169=m +CONFIG_NET_VENDOR_RDC=y +CONFIG_R6040=m +CONFIG_NET_VENDOR_SEEQ=y +CONFIG_SEEQ8005=m +CONFIG_NET_VENDOR_SILAN=y +CONFIG_SC92031=m +CONFIG_NET_VENDOR_SIS=y +CONFIG_SIS900=m +CONFIG_SIS190=m +CONFIG_SFC=m +CONFIG_SFC_MTD=y +CONFIG_NET_VENDOR_SMSC=y +CONFIG_EPIC100=m +CONFIG_SMSC9420=m +CONFIG_NET_VENDOR_STMICRO=y +CONFIG_STMMAC_ETH=m +# CONFIG_STMMAC_DEBUG_FS is not set +# CONFIG_STMMAC_DA is not set +CONFIG_STMMAC_RING=y +# CONFIG_STMMAC_CHAINED is not set +CONFIG_NET_VENDOR_SUN=y +CONFIG_HAPPYMEAL=m +CONFIG_SUNGEM=m +CONFIG_CASSINI=m +CONFIG_NIU=m +CONFIG_NET_VENDOR_TEHUTI=y +CONFIG_TEHUTI=m +CONFIG_NET_VENDOR_TI=y +CONFIG_TLAN=m +CONFIG_NET_VENDOR_VIA=y +CONFIG_VIA_RHINE=m +# CONFIG_VIA_RHINE_MMIO is not set +CONFIG_VIA_VELOCITY=m +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +CONFIG_NET_SB1000=m +CONFIG_PHYLIB=y # # MII PHY device drivers @@ -1753,152 +1974,72 @@ CONFIG_NATIONAL_PHY=m CONFIG_STE10XP=m CONFIG_LSI_ET1011C_PHY=m CONFIG_MICREL_PHY=m +# CONFIG_FIXED_PHY is not set # CONFIG_MDIO_BITBANG is not set -CONFIG_NET_ETHERNET=y -CONFIG_HAPPYMEAL=m -CONFIG_SUNGEM=m -CONFIG_CASSINI=m -CONFIG_NET_VENDOR_3COM=y -CONFIG_VORTEX=m -CONFIG_TYPHOON=m -CONFIG_ENC28J60=m -# CONFIG_ENC28J60_WRITEVERIFY is not set -CONFIG_ETHOC=m -CONFIG_DNET=m -CONFIG_NET_TULIP=y -CONFIG_DE2104X=m -CONFIG_DE2104X_DSL=0 -CONFIG_TULIP=m -# CONFIG_TULIP_MWI is not set -# CONFIG_TULIP_MMIO is not set -# CONFIG_TULIP_NAPI is not set -CONFIG_DE4X5=m -CONFIG_WINBOND_840=m -CONFIG_DM9102=m -CONFIG_ULI526X=m -CONFIG_PCMCIA_XIRCOM=m -CONFIG_HP100=m -# CONFIG_IBM_NEW_EMAC_ZMII is not set -# CONFIG_IBM_NEW_EMAC_RGMII is not set -# CONFIG_IBM_NEW_EMAC_TAH is not set -# CONFIG_IBM_NEW_EMAC_EMAC4 is not set -# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set -# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set -# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set -CONFIG_NET_PCI=y -CONFIG_PCNET32=m -CONFIG_AMD8111_ETH=m -CONFIG_ADAPTEC_STARFIRE=m -CONFIG_KSZ884X_PCI=m -CONFIG_B44=m -CONFIG_B44_PCI_AUTOSELECT=y -CONFIG_B44_PCICORE_AUTOSELECT=y -CONFIG_B44_PCI=y -CONFIG_FORCEDETH=m -CONFIG_E100=m -CONFIG_FEALNX=m -CONFIG_NATSEMI=m -CONFIG_NE2K_PCI=m -CONFIG_8139CP=m -CONFIG_8139TOO=m -# CONFIG_8139TOO_PIO is not set -CONFIG_8139TOO_TUNE_TWISTER=y -CONFIG_8139TOO_8129=y -# CONFIG_8139_OLD_RX_RESET is not set -CONFIG_R6040=m -CONFIG_SIS900=m -CONFIG_EPIC100=m -CONFIG_SMSC9420=m -CONFIG_SUNDANCE=m -# CONFIG_SUNDANCE_MMIO is not set -CONFIG_TLAN=m -CONFIG_KS8842=m -CONFIG_KS8851=m -CONFIG_KS8851_MLL=m -CONFIG_VIA_RHINE=m -# CONFIG_VIA_RHINE_MMIO is not set -CONFIG_SC92031=m -CONFIG_NET_POCKET=y -CONFIG_ATP=m -CONFIG_DE600=m -CONFIG_DE620=m -CONFIG_ATL2=m -CONFIG_NETDEV_1000=y -CONFIG_ACENIC=m -# CONFIG_ACENIC_OMIT_TIGON_I is not set -CONFIG_DL2K=m -CONFIG_E1000=m -CONFIG_E1000E=m -CONFIG_IP1000=m -CONFIG_IGB=m -CONFIG_IGB_DCA=y -CONFIG_IGBVF=m -CONFIG_NS83820=m -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_R8169=m -CONFIG_SIS190=m -CONFIG_SKGE=m -# CONFIG_SKGE_DEBUG is not set -# CONFIG_SKGE_GENESIS is not set -CONFIG_SKY2=m -# CONFIG_SKY2_DEBUG is not set -CONFIG_VIA_VELOCITY=m -CONFIG_TIGON3=m -CONFIG_BNX2=m -CONFIG_CNIC=m -CONFIG_QLA3XXX=m -CONFIG_ATL1=m -CONFIG_ATL1E=m -CONFIG_ATL1C=m -CONFIG_JME=m -CONFIG_STMMAC_ETH=m -# CONFIG_STMMAC_DA is not set -# CONFIG_STMMAC_DUAL_MAC is not set -# CONFIG_PCH_GBE is not set -CONFIG_NETDEV_10000=y -CONFIG_MDIO=m -CONFIG_CHELSIO_T1=m -CONFIG_CHELSIO_T1_1G=y -CONFIG_CHELSIO_T3=m -CONFIG_CHELSIO_T4=m -CONFIG_CHELSIO_T4VF=m -CONFIG_ENIC=m -CONFIG_IXGBE=m -CONFIG_IXGBE_DCA=y -CONFIG_IXGBEVF=m -CONFIG_IXGB=m -CONFIG_S2IO=m -CONFIG_VXGE=m -# CONFIG_VXGE_DEBUG_TRACE_ALL is not set -CONFIG_MYRI10GE=m -CONFIG_MYRI10GE_DCA=y -CONFIG_NETXEN_NIC=m -CONFIG_NIU=m -CONFIG_MLX4_EN=m -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y -CONFIG_TEHUTI=m -CONFIG_BNX2X=m -CONFIG_QLCNIC=m -CONFIG_QLGE=m -CONFIG_BNA=m -CONFIG_SFC=m -CONFIG_SFC_MTD=y -CONFIG_BE2NET=m +CONFIG_PLIP=m +CONFIG_PPP=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_FILTER=y +CONFIG_PPP_MPPE=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPPOATM=m +CONFIG_PPPOE=m +CONFIG_PPTP=m +CONFIG_PPPOL2TP=m +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_SLIP=m +CONFIG_SLHC=m +# CONFIG_SLIP_COMPRESSED is not set +# CONFIG_SLIP_SMART is not set +# CONFIG_SLIP_MODE_SLIP6 is not set # CONFIG_TR is not set + +# +# USB Network Adapters +# +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +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 +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_NET_CX82310_ETH=m +CONFIG_USB_NET_KALMIA=m +CONFIG_USB_HSO=m +CONFIG_USB_NET_INT51X1=m +CONFIG_USB_CDC_PHONET=m +CONFIG_USB_IPHETH=m +CONFIG_USB_SIERRA_NET=m +CONFIG_USB_VL600=m CONFIG_WLAN=y -CONFIG_PCMCIA_RAYCS=m CONFIG_LIBERTAS_THINFIRM=m # CONFIG_LIBERTAS_THINFIRM_DEBUG is not set CONFIG_LIBERTAS_THINFIRM_USB=m CONFIG_AIRO=m CONFIG_ATMEL=m CONFIG_PCI_ATMEL=m -CONFIG_PCMCIA_ATMEL=m CONFIG_AT76C50X_USB=m -CONFIG_AIRO_CS=m -CONFIG_PCMCIA_WL3501=m CONFIG_PRISM54=m CONFIG_USB_ZD1201=m CONFIG_USB_NET_RNDIS_WLAN=m @@ -1925,17 +2066,20 @@ CONFIG_ATH9K_HTC=m CONFIG_CARL9170=m CONFIG_CARL9170_LEDS=y CONFIG_CARL9170_WPC=y +CONFIG_CARL9170_HWRNG=y +CONFIG_ATH6KL=m +# CONFIG_ATH6KL_DEBUG is not set CONFIG_B43=m CONFIG_B43_BCMA=y CONFIG_B43_SSB=y CONFIG_B43_PCI_AUTOSELECT=y CONFIG_B43_PCICORE_AUTOSELECT=y -CONFIG_B43_PCMCIA=y CONFIG_B43_SDIO=y CONFIG_B43_BCMA_PIO=y CONFIG_B43_PIO=y CONFIG_B43_PHY_N=y CONFIG_B43_PHY_LP=y +CONFIG_B43_PHY_HT=y CONFIG_B43_LEDS=y CONFIG_B43_HWRNG=y # CONFIG_B43_DEBUG is not set @@ -1950,12 +2094,12 @@ 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_BRCMFMAC is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_PCI=m -CONFIG_HOSTAP_CS=m CONFIG_IPW2100=m CONFIG_IPW2100_MONITOR=y # CONFIG_IPW2100_DEBUG is not set @@ -1967,14 +2111,13 @@ CONFIG_IPW2200_QOS=y # CONFIG_IPW2200_DEBUG is not set CONFIG_LIBIPW=m # CONFIG_LIBIPW_DEBUG is not set -CONFIG_IWLAGN=m +CONFIG_IWLWIFI=m # # Debugging Options # # CONFIG_IWLWIFI_DEBUG is not set # CONFIG_IWLWIFI_DEVICE_SVTOOL is not set -CONFIG_IWL_P2P=y CONFIG_IWLWIFI_LEGACY=m # @@ -1987,7 +2130,6 @@ CONFIG_IWM=m # CONFIG_IWM_DEBUG is not set CONFIG_LIBERTAS=m CONFIG_LIBERTAS_USB=m -CONFIG_LIBERTAS_CS=m CONFIG_LIBERTAS_SDIO=m CONFIG_LIBERTAS_SPI=m # CONFIG_LIBERTAS_DEBUG is not set @@ -1999,8 +2141,6 @@ CONFIG_PLX_HERMES=m CONFIG_TMD_HERMES=m CONFIG_NORTEL_HERMES=m CONFIG_PCI_HERMES=m -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_SPECTRUM=m CONFIG_ORINOCO_USB=m CONFIG_P54_COMMON=m CONFIG_P54_USB=m @@ -2042,7 +2182,6 @@ 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 @@ -2051,6 +2190,7 @@ CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_MWIFIEX=m CONFIG_MWIFIEX_SDIO=m +CONFIG_MWIFIEX_PCIE=m # # WiMAX Wireless Broadband devices @@ -2060,130 +2200,13 @@ CONFIG_WIMAX_I2400M_USB=m CONFIG_WIMAX_I2400M_SDIO=m CONFIG_WIMAX_IWMC3200_SDIO=y CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 - -# -# USB Network Adapters -# -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -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 -CONFIG_USB_NET_GL620A=m -CONFIG_USB_NET_NET1080=m -CONFIG_USB_NET_PLUSB=m -CONFIG_USB_NET_MCS7830=m -CONFIG_USB_NET_RNDIS_HOST=m -CONFIG_USB_NET_CDC_SUBSET=m -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y -CONFIG_USB_KC2190=y -CONFIG_USB_NET_ZAURUS=m -CONFIG_USB_NET_CX82310_ETH=m -CONFIG_USB_NET_KALMIA=m -CONFIG_USB_HSO=m -CONFIG_USB_NET_INT51X1=m -CONFIG_USB_CDC_PHONET=m -CONFIG_USB_IPHETH=m -CONFIG_USB_SIERRA_NET=m -CONFIG_USB_VL600=m -CONFIG_NET_PCMCIA=y -CONFIG_PCMCIA_3C589=m -CONFIG_PCMCIA_3C574=m -CONFIG_PCMCIA_FMVJ18X=m -CONFIG_PCMCIA_PCNET=m -CONFIG_PCMCIA_NMCLAN=m -CONFIG_PCMCIA_SMC91C92=m -CONFIG_PCMCIA_XIRC2PS=m -CONFIG_PCMCIA_AXNET=m # CONFIG_WAN is not set -CONFIG_ATM_DRIVERS=y -# CONFIG_ATM_DUMMY is not set -CONFIG_ATM_TCP=m -CONFIG_ATM_LANAI=m -CONFIG_ATM_ENI=m -# CONFIG_ATM_ENI_DEBUG is not set -# CONFIG_ATM_ENI_TUNE_BURST is not set -CONFIG_ATM_FIRESTREAM=m -CONFIG_ATM_ZATM=m -# CONFIG_ATM_ZATM_DEBUG is not set -CONFIG_ATM_NICSTAR=m -CONFIG_ATM_NICSTAR_USE_SUNI=y -CONFIG_ATM_NICSTAR_USE_IDT77105=y -CONFIG_ATM_IDT77252=m -# CONFIG_ATM_IDT77252_DEBUG is not set -# CONFIG_ATM_IDT77252_RCV_ALL is not set -CONFIG_ATM_IDT77252_USE_SUNI=y -CONFIG_ATM_AMBASSADOR=m -# CONFIG_ATM_AMBASSADOR_DEBUG is not set -CONFIG_ATM_HORIZON=m -# CONFIG_ATM_HORIZON_DEBUG is not set -CONFIG_ATM_IA=m -# CONFIG_ATM_IA_DEBUG is not set -CONFIG_ATM_FORE200E=m -# CONFIG_ATM_FORE200E_USE_TASKLET is not set -CONFIG_ATM_FORE200E_TX_RETRY=16 -CONFIG_ATM_FORE200E_DEBUG=0 -CONFIG_ATM_HE=m -# CONFIG_ATM_HE_USE_SUNI is not set -CONFIG_ATM_SOLOS=m -CONFIG_IEEE802154_DRIVERS=m -CONFIG_IEEE802154_FAKEHARD=m - -# -# CAIF transport drivers -# -CONFIG_CAIF_TTY=m -CONFIG_CAIF_SPI_SLAVE=m -# CONFIG_CAIF_SPI_SYNC is not set -CONFIG_CAIF_HSI=m CONFIG_XEN_NETDEV_FRONTEND=m CONFIG_XEN_NETDEV_BACKEND=m -CONFIG_RIONET=m -CONFIG_RIONET_TX_SIZE=128 -CONFIG_RIONET_RX_SIZE=128 -# CONFIG_FDDI is not set -# CONFIG_HIPPI is not set -CONFIG_PLIP=m -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m -CONFIG_PPPOE=m -CONFIG_PPTP=m -CONFIG_PPPOATM=m -CONFIG_PPPOL2TP=m -CONFIG_SLIP=m -# CONFIG_SLIP_COMPRESSED is not set -CONFIG_SLHC=m -# CONFIG_SLIP_SMART is not set -# CONFIG_SLIP_MODE_SLIP6 is not set -# CONFIG_NET_FC is not set -CONFIG_NETCONSOLE=m -CONFIG_NETCONSOLE_DYNAMIC=y -CONFIG_NETPOLL=y -# CONFIG_NETPOLL_TRAP is not set -CONFIG_NET_POLL_CONTROLLER=y -CONFIG_VIRTIO_NET=m CONFIG_VMXNET3=m # CONFIG_ISDN is not set CONFIG_PHONE=m CONFIG_PHONE_IXJ=m -CONFIG_PHONE_IXJ_PCMCIA=m # # Input device support @@ -2329,6 +2352,7 @@ CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y CONFIG_TOUCHSCREEN_USB_NEXIO=y CONFIG_TOUCHSCREEN_TOUCHIT213=m +CONFIG_TOUCHSCREEN_TSC_SERIO=m CONFIG_TOUCHSCREEN_TSC2005=m CONFIG_TOUCHSCREEN_TSC2007=m # CONFIG_TOUCHSCREEN_PCAP is not set @@ -2339,12 +2363,13 @@ CONFIG_INPUT_AB8500_PONKEY=m CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_AD714X_SPI=m +CONFIG_INPUT_BMA150=m CONFIG_INPUT_PCSPKR=m +CONFIG_INPUT_MC13783_PWRBUTTON=m CONFIG_INPUT_MMA8450=m CONFIG_INPUT_MPU3050=m CONFIG_INPUT_APANEL=m CONFIG_INPUT_ATLAS_BTNS=m -CONFIG_INPUT_ATI_REMOTE=m CONFIG_INPUT_ATI_REMOTE2=m CONFIG_INPUT_KEYSPAN_REMOTE=m CONFIG_INPUT_KXTJ9=m @@ -2389,6 +2414,7 @@ CONFIG_GAMEPORT_FM801=m CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y +CONFIG_VT_CONSOLE_SLEEP=y CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_UNIX98_PTYS=y @@ -2420,7 +2446,6 @@ CONFIG_SERIAL_8250_CONSOLE=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_PNP=y -CONFIG_SERIAL_8250_CS=m CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set @@ -2466,14 +2491,6 @@ CONFIG_HW_RANDOM_VIRTIO=m CONFIG_NVRAM=m CONFIG_R3964=m CONFIG_APPLICOM=m - -# -# PCMCIA character devices -# -CONFIG_SYNCLINK_CS=m -CONFIG_CARDMAN_4000=m -CONFIG_CARDMAN_4040=m -CONFIG_IPWIRELESS=m CONFIG_MWAVE=m CONFIG_RAW_DRIVER=m CONFIG_MAX_RAW_DEVS=256 @@ -2537,6 +2554,7 @@ CONFIG_I2C_SCMI=m # # I2C system bus drivers (mostly embedded / system-on-chip) # +CONFIG_I2C_DESIGNWARE_PCI=m CONFIG_I2C_GPIO=m CONFIG_I2C_INTEL_MID=m CONFIG_I2C_OCORES=m @@ -2600,6 +2618,7 @@ CONFIG_NTP_PPS=y CONFIG_PPS_CLIENT_KTIMER=m CONFIG_PPS_CLIENT_LDISC=m CONFIG_PPS_CLIENT_PARPORT=m +CONFIG_PPS_CLIENT_GPIO=m # # PPS generators support @@ -2714,6 +2733,7 @@ CONFIG_HWMON_VID=m # CONFIG_SENSORS_ABITUGURU=m CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7314=m CONFIG_SENSORS_AD7414=m CONFIG_SENSORS_AD7418=m CONFIG_SENSORS_ADCXX=m @@ -2784,11 +2804,13 @@ CONFIG_PMBUS=m CONFIG_SENSORS_PMBUS=m CONFIG_SENSORS_ADM1275=m CONFIG_SENSORS_LM25066=m +CONFIG_SENSORS_LTC2978=m CONFIG_SENSORS_MAX16064=m CONFIG_SENSORS_MAX34440=m CONFIG_SENSORS_MAX8688=m CONFIG_SENSORS_UCD9000=m CONFIG_SENSORS_UCD9200=m +CONFIG_SENSORS_ZL6100=m CONFIG_SENSORS_SHT15=m CONFIG_SENSORS_SHT21=m CONFIG_SENSORS_SIS5595=m @@ -2836,7 +2858,7 @@ CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=m CONFIG_THERMAL_HWMON=y CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_CORE=y +# CONFIG_WATCHDOG_CORE is not set # CONFIG_WATCHDOG_NOWAYOUT is not set # @@ -2901,8 +2923,6 @@ CONFIG_SSB_BLOCKIO=y CONFIG_SSB_PCIHOST_POSSIBLE=y CONFIG_SSB_PCIHOST=y CONFIG_SSB_B43_PCI_BRIDGE=y -CONFIG_SSB_PCMCIAHOST_POSSIBLE=y -CONFIG_SSB_PCMCIAHOST=y CONFIG_SSB_SDIOHOST_POSSIBLE=y CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_DEBUG is not set @@ -2918,7 +2938,10 @@ CONFIG_BCMA_BLOCKIO=y CONFIG_BCMA_HOST_PCI_POSSIBLE=y # CONFIG_BCMA_HOST_PCI is not set # CONFIG_BCMA_DEBUG is not set -CONFIG_MFD_SUPPORT=y + +# +# Multifunction device drivers +# CONFIG_MFD_CORE=y CONFIG_MFD_SM501=m # CONFIG_MFD_SM501_GPIO is not set @@ -2954,6 +2977,7 @@ CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=m CONFIG_REGULATOR_VIRTUAL_CONSUMER=m CONFIG_REGULATOR_USERSPACE_CONSUMER=m +CONFIG_REGULATOR_GPIO=m CONFIG_REGULATOR_BQ24022=m CONFIG_REGULATOR_MAX1586=m CONFIG_REGULATOR_MAX8649=m @@ -3002,6 +3026,7 @@ CONFIG_IR_SONY_DECODER=m CONFIG_IR_RC5_SZ_DECODER=m CONFIG_IR_MCE_KBD_DECODER=m CONFIG_IR_LIRC_CODEC=m +CONFIG_RC_ATI_REMOTE=m CONFIG_IR_ENE=m CONFIG_IR_IMON=m CONFIG_IR_MCEUSB=m @@ -3124,6 +3149,7 @@ CONFIG_VIDEO_AK881X=m CONFIG_VIDEO_OV7670=m CONFIG_VIDEO_MT9V011=m CONFIG_VIDEO_TCM825X=m +CONFIG_VIDEO_SR030PC30=m # # Flash devices @@ -3172,6 +3198,8 @@ CONFIG_VIDEO_CX88_MPEG=m CONFIG_VIDEO_CX88_VP3054=m CONFIG_VIDEO_CX23885=m CONFIG_MEDIA_ALTERA_CI=m +CONFIG_VIDEO_CX25821=m +CONFIG_VIDEO_CX25821_ALSA=m CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_IVTV=m CONFIG_VIDEO_FB_IVTV=m @@ -3179,9 +3207,7 @@ CONFIG_VIDEO_CX18=m CONFIG_VIDEO_CX18_ALSA=m CONFIG_VIDEO_SAA7164=m CONFIG_VIDEO_CAFE_CCIC=m -CONFIG_VIDEO_SR030PC30=m CONFIG_VIDEO_VIA_CAMERA=m -CONFIG_VIDEO_NOON010PC30=m CONFIG_SOC_CAMERA=m CONFIG_SOC_CAMERA_IMX074=m CONFIG_SOC_CAMERA_MT9M001=m @@ -3241,6 +3267,7 @@ CONFIG_USB_GSPCA_STK014=m CONFIG_USB_GSPCA_STV0680=m CONFIG_USB_GSPCA_SUNPLUS=m CONFIG_USB_GSPCA_T613=m +CONFIG_USB_GSPCA_TOPRO=m CONFIG_USB_GSPCA_TV8532=m CONFIG_USB_GSPCA_VC032X=m CONFIG_USB_GSPCA_VICAM=m @@ -3260,6 +3287,9 @@ CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_RC=y CONFIG_VIDEO_CX231XX_ALSA=m CONFIG_VIDEO_CX231XX_DVB=m +CONFIG_VIDEO_TM6000=m +CONFIG_VIDEO_TM6000_ALSA=m +CONFIG_VIDEO_TM6000_DVB=m CONFIG_VIDEO_USBVISION=m CONFIG_USB_ET61X251=m CONFIG_USB_SN9C102=m @@ -3331,6 +3361,7 @@ CONFIG_DVB_USB_DTT200U=m CONFIG_DVB_USB_OPERA1=m CONFIG_DVB_USB_AF9005=m CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_PCTV452E=m CONFIG_DVB_USB_DW2102=m CONFIG_DVB_USB_CINERGY_T2=m CONFIG_DVB_USB_ANYSEE=m @@ -3342,6 +3373,8 @@ CONFIG_DVB_USB_EC168=m CONFIG_DVB_USB_AZ6027=m CONFIG_DVB_USB_LME2510=m CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_IT913X=m +CONFIG_DVB_USB_MXL111SF=m CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m CONFIG_SMS_SIANO_MDTV=m @@ -3442,6 +3475,7 @@ CONFIG_DVB_CX24116=m CONFIG_DVB_SI21XX=m CONFIG_DVB_DS3000=m CONFIG_DVB_MB86A16=m +CONFIG_DVB_TDA10071=m # # DVB-T (terrestrial) frontends @@ -3505,13 +3539,16 @@ CONFIG_DVB_TUNER_DIB0090=m # SEC control devices for DVB-S # CONFIG_DVB_LNBP21=m +CONFIG_DVB_LNBP22=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m CONFIG_DVB_ISL6423=m +CONFIG_DVB_A8293=m CONFIG_DVB_LGS8GXX=m CONFIG_DVB_ATBM8830=m CONFIG_DVB_TDA665x=m CONFIG_DVB_IX2505V=m +CONFIG_DVB_IT913X_FE=m # # Tools to develop new frontends @@ -3542,6 +3579,7 @@ CONFIG_DRM_MGA=m CONFIG_DRM_SIS=m CONFIG_DRM_VIA=m CONFIG_DRM_SAVAGE=m +CONFIG_DRM_VMWGFX=m CONFIG_STUB_POULSBO=m CONFIG_VGASTATE=m CONFIG_VIDEO_OUTPUT_CONTROL=m @@ -3633,6 +3671,7 @@ CONFIG_FB_TRIDENT=m CONFIG_FB_TMIO=m CONFIG_FB_TMIO_ACCELL=y CONFIG_FB_SM501=m +CONFIG_FB_SMSCUFX=m CONFIG_FB_UDL=m # CONFIG_FB_VIRTUAL is not set CONFIG_XEN_FBDEV_FRONTEND=m @@ -3851,9 +3890,6 @@ CONFIG_SND_USB_CAIAQ=m CONFIG_SND_USB_CAIAQ_INPUT=y CONFIG_SND_USB_US122L=m CONFIG_SND_USB_6FIRE=m -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 @@ -3889,7 +3925,7 @@ CONFIG_HID_EMS_FF=m CONFIG_HID_ELECOM=m CONFIG_HID_EZKEY=m CONFIG_HID_HOLTEK=m -CONFIG_HOLTEK_FF=y +# CONFIG_HOLTEK_FF is not set CONFIG_HID_KEYTOUCH=m CONFIG_HID_KYE=m CONFIG_HID_UCLOGIC=m @@ -3899,10 +3935,11 @@ CONFIG_HID_TWINHAN=m CONFIG_HID_KENSINGTON=m CONFIG_HID_LCPOWER=m CONFIG_HID_LOGITECH=m +CONFIG_HID_LOGITECH_DJ=m CONFIG_LOGITECH_FF=y CONFIG_LOGIRUMBLEPAD2_FF=y CONFIG_LOGIG940_FF=y -# CONFIG_LOGIWII_FF is not set +CONFIG_LOGIWHEELS_FF=y CONFIG_HID_MAGICMOUSE=m CONFIG_HID_MICROSOFT=m CONFIG_HID_MONTEREY=m @@ -3917,6 +3954,7 @@ CONFIG_HID_PICOLCD_FB=y CONFIG_HID_PICOLCD_BACKLIGHT=y CONFIG_HID_PICOLCD_LCD=y CONFIG_HID_PICOLCD_LEDS=y +CONFIG_HID_PRIMAX=m CONFIG_HID_QUANTA=m CONFIG_HID_ROCCAT=m CONFIG_HID_ROCCAT_COMMON=m @@ -3943,9 +3981,11 @@ CONFIG_HID_ZEROPLUS=m CONFIG_ZEROPLUS_FF=y CONFIG_HID_ZYDACRON=m CONFIG_USB_SUPPORT=y +CONFIG_USB_COMMON=m CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB_ARCH_HAS_XHCI=y CONFIG_USB=m # CONFIG_USB_DEBUG is not set # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set @@ -3958,6 +3998,8 @@ CONFIG_USB=m CONFIG_USB_DYNAMIC_MINORS=y CONFIG_USB_SUSPEND=y # CONFIG_USB_OTG is not set +CONFIG_USB_DWC3=m +# CONFIG_USB_DWC3_DEBUG is not set CONFIG_USB_MON=m CONFIG_USB_WUSB=m CONFIG_USB_WUSB_CBAF=m @@ -3985,10 +4027,11 @@ CONFIG_USB_UHCI_HCD=m CONFIG_USB_U132_HCD=m CONFIG_USB_SL811_HCD=m # CONFIG_USB_SL811_HCD_ISO is not set -CONFIG_USB_SL811_CS=m CONFIG_USB_R8A66597_HCD=m +CONFIG_USB_RENESAS_USBHS_HCD=m CONFIG_USB_WHCI_HCD=m CONFIG_USB_HWA_HCD=m +CONFIG_USB_RENESAS_USBHS=m # # USB Device Class drivers @@ -4134,7 +4177,9 @@ CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG_FILES is not set # CONFIG_USB_GADGET_DEBUG_FS is not set CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 CONFIG_USB_R8A66597=m +CONFIG_USB_GADGET_DWC3=m CONFIG_USB_M66592=m CONFIG_USB_AMD5536UDC=m CONFIG_USB_CI13XXX_PCI=m @@ -4165,6 +4210,7 @@ CONFIG_USB_MIDI_GADGET=m CONFIG_USB_G_PRINTER=m # CONFIG_USB_CDC_COMPOSITE is not set CONFIG_USB_G_NOKIA=m +CONFIG_USB_G_ACM_MS=m CONFIG_USB_G_MULTI=m CONFIG_USB_G_MULTI_RNDIS=y CONFIG_USB_G_MULTI_CDC=y @@ -4209,7 +4255,6 @@ CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_WBSD=m CONFIG_MMC_TIFM_SD=m CONFIG_MMC_SPI=m -CONFIG_MMC_SDRICOH_CS=m CONFIG_MMC_CB710=m CONFIG_MMC_VIA_SDMMC=m CONFIG_MMC_VUB300=m @@ -4237,7 +4282,6 @@ CONFIG_LEDS_CLASS=y # CONFIG_LEDS_LM3530=m CONFIG_LEDS_NET5501=m -CONFIG_LEDS_ALIX2=m CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA9532_GPIO is not set CONFIG_LEDS_GPIO=m @@ -4300,7 +4344,6 @@ CONFIG_EDAC=y CONFIG_EDAC_DECODE_MCE=m CONFIG_EDAC_MCE_INJ=m CONFIG_EDAC_MM_EDAC=m -CONFIG_EDAC_MCE=y CONFIG_EDAC_AMD64=m CONFIG_EDAC_AMD64_ERROR_INJECTION=y CONFIG_EDAC_E752X=m @@ -4313,6 +4356,7 @@ CONFIG_EDAC_I7CORE=m CONFIG_EDAC_I5000=m CONFIG_EDAC_I5100=m CONFIG_EDAC_I7300=m +CONFIG_EDAC_SBRIDGE=m CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y @@ -4326,7 +4370,7 @@ CONFIG_RTC_INTF_SYSFS=y CONFIG_RTC_INTF_PROC=y CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set -# CONFIG_RTC_DRV_TEST is not set +CONFIG_RTC_DRV_TEST=m # # I2C RTC drivers @@ -4430,13 +4474,14 @@ CONFIG_VIRTIO_RING=m # CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_BALLOON=m +CONFIG_VIRTIO_MMIO=m # # Xen driver support # CONFIG_XEN_BALLOON=y # CONFIG_XEN_SELFBALLOONING is not set -CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y +# CONFIG_XEN_BALLOON_MEMORY_HOTPLUG is not set CONFIG_XEN_SCRUB_PAGES=y CONFIG_XEN_DEV_EVTCHN=m CONFIG_XEN_BACKEND=y @@ -4446,30 +4491,12 @@ CONFIG_XEN_SYS_HYPERVISOR=y CONFIG_XEN_XENBUS_FRONTEND=m CONFIG_XEN_GNTDEV=m CONFIG_XEN_GRANT_DEV_ALLOC=m -CONFIG_XEN_PLATFORM_PCI=m CONFIG_SWIOTLB_XEN=y CONFIG_XEN_TMEM=y CONFIG_XEN_PCIDEV_BACKEND=m CONFIG_STAGING=y CONFIG_ET131X=m -# CONFIG_ET131X_DEBUG is not set CONFIG_SLICOSS=m -CONFIG_VIDEO_GO7007=m -CONFIG_VIDEO_GO7007_USB=m -CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m -CONFIG_VIDEO_GO7007_OV7640=m -CONFIG_VIDEO_GO7007_SAA7113=m -CONFIG_VIDEO_GO7007_SAA7115=m -CONFIG_VIDEO_GO7007_TW9903=m -CONFIG_VIDEO_GO7007_UDA1342=m -CONFIG_VIDEO_GO7007_SONY_TUNER=m -CONFIG_VIDEO_GO7007_TW2804=m -CONFIG_VIDEO_CX25821=m -CONFIG_VIDEO_CX25821_ALSA=m -CONFIG_VIDEO_TM6000=m -CONFIG_VIDEO_TM6000_ALSA=m -CONFIG_VIDEO_TM6000_DVB=m -CONFIG_DVB_CXD2099=m CONFIG_USBIP_CORE=m CONFIG_USBIP_VHCI_HCD=m CONFIG_USBIP_HOST=m @@ -4477,10 +4504,6 @@ CONFIG_USBIP_HOST=m CONFIG_W35UND=m CONFIG_PRISM2_USB=m CONFIG_ECHO=m -CONFIG_BRCMUTIL=m -CONFIG_BRCMSMAC=m -# CONFIG_BRCMFMAC is not set -# CONFIG_BRCMDBG is not set CONFIG_COMEDI=m # CONFIG_COMEDI_DEBUG is not set CONFIG_COMEDI_MISC_DRIVERS=m @@ -4548,17 +4571,11 @@ CONFIG_COMEDI_S526=m CONFIG_COMEDI_S626=m CONFIG_COMEDI_SSV_DNP=m CONFIG_COMEDI_PCMCIA_DRIVERS=m -CONFIG_COMEDI_CB_DAS16_CS=m -CONFIG_COMEDI_DAS08_CS=m -CONFIG_COMEDI_NI_DAQ_700_CS=m -CONFIG_COMEDI_NI_DAQ_DIO24_CS=m -CONFIG_COMEDI_NI_LABPC_CS=m -CONFIG_COMEDI_NI_MIO_CS=m -CONFIG_COMEDI_QUATECH_DAQP_CS=m CONFIG_COMEDI_USB_DRIVERS=m CONFIG_COMEDI_DT9812=m CONFIG_COMEDI_USBDUX=m CONFIG_COMEDI_USBDUXFAST=m +CONFIG_COMEDI_USBDUXSIGMA=m CONFIG_COMEDI_VMK80XX=m CONFIG_COMEDI_NI_COMMON=m CONFIG_COMEDI_MITE=m @@ -4576,10 +4593,11 @@ CONFIG_R8712U=m # CONFIG_R8712_AP is not set CONFIG_RTS_PSTOR=m # CONFIG_RTS_PSTOR_DEBUG is not set +CONFIG_RTS5139=m +# CONFIG_RTS5139_DEBUG is not set # CONFIG_TRANZPORT is not set CONFIG_POHMELFS=m # CONFIG_POHMELFS_DEBUG is not set -CONFIG_POHMELFS_CRYPTO=y CONFIG_IDE_PHISON=m CONFIG_LINE6_USB=m # CONFIG_LINE6_USB_DEBUG is not set @@ -4588,7 +4606,6 @@ CONFIG_LINE6_USB=m # CONFIG_LINE6_USB_DUMP_PCM is not set # CONFIG_LINE6_USB_RAW is not set # CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set -CONFIG_DRM_VMWGFX=m CONFIG_DRM_NOUVEAU=m CONFIG_DRM_NOUVEAU_BACKLIGHT=y CONFIG_DRM_NOUVEAU_DEBUG=y @@ -4602,11 +4619,8 @@ CONFIG_USB_SERIAL_QUATECH2=m CONFIG_USB_SERIAL_QUATECH_USB2=m CONFIG_VT6655=m CONFIG_VT6656=m -CONFIG_HYPERV=m CONFIG_HYPERV_STORAGE=m -CONFIG_HYPERV_BLOCK=m CONFIG_HYPERV_NET=m -CONFIG_HYPERV_UTILS=m CONFIG_HYPERV_MOUSE=m CONFIG_VME_BUS=m @@ -4627,7 +4641,7 @@ CONFIG_VME_USER=m CONFIG_VMIVME_7805=m CONFIG_DX_SEP=m CONFIG_IIO=m -CONFIG_IIO_RING_BUFFER=y +CONFIG_IIO_BUFFER=y CONFIG_IIO_SW_RING=m CONFIG_IIO_KFIFO_BUF=m CONFIG_IIO_TRIGGER=y @@ -4649,13 +4663,10 @@ CONFIG_LIS3L02DQ_BUF_KFIFO=y CONFIG_SCA3000=m # -# Analog to digital convertors +# Analog to digital converters # -CONFIG_AD7150=m -CONFIG_AD7152=m CONFIG_AD7291=m CONFIG_AD7298=m -CONFIG_AD7314=m CONFIG_AD7606=m CONFIG_AD7606_IFACE_PARALLEL=m CONFIG_AD7606_IFACE_SPI=m @@ -4665,24 +4676,33 @@ CONFIG_AD7476=m CONFIG_AD7887=m CONFIG_AD7780=m CONFIG_AD7793=m -CONFIG_AD7745=m CONFIG_AD7816=m -CONFIG_ADT75=m +CONFIG_AD7192=m CONFIG_ADT7310=m CONFIG_ADT7410=m +CONFIG_AD7280=m CONFIG_MAX1363=m CONFIG_MAX1363_RING_BUFFER=y # -# Analog digital bi-direction convertors +# Analog digital bi-direction converters # CONFIG_ADT7316=m CONFIG_ADT7316_SPI=m CONFIG_ADT7316_I2C=m # -# Digital to analog convertors +# Capacitance to digital converters # +CONFIG_AD7150=m +CONFIG_AD7152=m +CONFIG_AD7746=m + +# +# Digital to analog converters +# +CONFIG_AD5064=m +CONFIG_AD5360=m CONFIG_AD5624R_SPI=m CONFIG_AD5446=m CONFIG_AD5504=m @@ -4710,6 +4730,11 @@ CONFIG_ADIS16130=m CONFIG_ADIS16260=m CONFIG_ADXRS450=m +# +# Network Analyzer, Impedance Converters +# +CONFIG_AD5933=m + # # Inertial measurement units # @@ -4743,7 +4768,7 @@ CONFIG_ADE7854_SPI=m # Resolver to digital converters # CONFIG_AD2S90=m -CONFIG_AD2S120X=m +CONFIG_AD2S1200=m CONFIG_AD2S1210=m # @@ -4752,29 +4777,19 @@ CONFIG_AD2S1210=m CONFIG_IIO_PERIODIC_RTC_TRIGGER=m CONFIG_IIO_GPIO_TRIGGER=m CONFIG_IIO_SYSFS_TRIGGER=m +# CONFIG_IIO_SIMPLE_DUMMY is not set CONFIG_XVMALLOC=y CONFIG_ZRAM=m # CONFIG_ZRAM_DEBUG is not set CONFIG_ZCACHE=m -CONFIG_WLAGS49_H2=m -CONFIG_WLAGS49_H25=m CONFIG_FB_SM7XX=m -CONFIG_VIDEO_DT3155=m -CONFIG_DT3155_CCIR=y -CONFIG_DT3155_STREAMING=y CONFIG_CRYSTALHD=m CONFIG_FB_XGI=m -# CONFIG_LIRC_STAGING is not set -CONFIG_EASYCAP=m -# CONFIG_EASYCAP_DEBUG is not set -# CONFIG_SOLO6X10 is not set CONFIG_ACPI_QUICKSTART=m -# CONFIG_ATH6K_LEGACY is not set # CONFIG_USB_ENESTORAGE is not set CONFIG_BCM_WIMAX=m CONFIG_FT1000=m CONFIG_FT1000_USB=m -CONFIG_FT1000_PCMCIA=m # # Speakup console speech @@ -4801,8 +4816,26 @@ CONFIG_DRM_PSB=m CONFIG_DRM_PSB_MRST=y CONFIG_DRM_PSB_MFLD=y CONFIG_DRM_PSB_CDV=y -CONFIG_ALTERA_STAPL=m -CONFIG_INTEL_MEI=m +CONFIG_STAGING_MEDIA=y +CONFIG_DVB_AS102=m +CONFIG_DVB_CXD2099=m +CONFIG_VIDEO_DT3155=m +CONFIG_DT3155_CCIR=y +CONFIG_DT3155_STREAMING=y +CONFIG_EASYCAP=m +# CONFIG_EASYCAP_DEBUG is not set +CONFIG_VIDEO_GO7007=m +CONFIG_VIDEO_GO7007_USB=m +CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m +CONFIG_VIDEO_GO7007_OV7640=m +CONFIG_VIDEO_GO7007_SAA7113=m +CONFIG_VIDEO_GO7007_SAA7115=m +CONFIG_VIDEO_GO7007_TW9903=m +CONFIG_VIDEO_GO7007_UDA1342=m +CONFIG_VIDEO_GO7007_SONY_TUNER=m +CONFIG_VIDEO_GO7007_TW2804=m +# CONFIG_SOLO6X10 is not set +# CONFIG_LIRC_STAGING is not set CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m @@ -4847,6 +4880,10 @@ CONFIG_SAMSUNG_LAPTOP=m CONFIG_MXM_WMI=m CONFIG_INTEL_OAKTRAIL=m CONFIG_SAMSUNG_Q10=m + +# +# Hardware Spinlock drivers +# CONFIG_CLKEVT_I8253=y CONFIG_I8253_LOCK=y CONFIG_CLKBLD_I8253=y @@ -4854,11 +4891,27 @@ CONFIG_IOMMU_API=y CONFIG_IOMMU_SUPPORT=y CONFIG_AMD_IOMMU=y # CONFIG_AMD_IOMMU_STATS is not set -CONFIG_DMAR=y -# CONFIG_DMAR_DEFAULT_ON is not set -CONFIG_DMAR_FLOPPY_WA=y -CONFIG_INTR_REMAP=y +CONFIG_DMAR_TABLE=y +CONFIG_INTEL_IOMMU=y +CONFIG_INTEL_IOMMU_DEFAULT_ON=y +CONFIG_INTEL_IOMMU_FLOPPY_WA=y +CONFIG_IRQ_REMAP=y CONFIG_VIRT_DRIVERS=y +CONFIG_HYPERV=m +CONFIG_HYPERV_UTILS=m +CONFIG_PM_DEVFREQ=y + +# +# DEVFREQ Governors +# +CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y +CONFIG_DEVFREQ_GOV_PERFORMANCE=y +CONFIG_DEVFREQ_GOV_POWERSAVE=y +CONFIG_DEVFREQ_GOV_USERSPACE=y + +# +# DEVFREQ Drivers +# # # Firmware Drivers @@ -5015,6 +5068,7 @@ CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_ZLIB=y CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS_XZ=y +# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set # CONFIG_SQUASHFS_EMBEDDED is not set CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # CONFIG_VXFS_FS is not set @@ -5254,6 +5308,7 @@ CONFIG_CRYPTO_PCOMP=m CONFIG_CRYPTO_PCOMP2=y CONFIG_CRYPTO_MANAGER=m CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y CONFIG_CRYPTO_GF128MUL=m CONFIG_CRYPTO_NULL=m @@ -5302,6 +5357,7 @@ CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD256=m CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA1_SSSE3=m CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_TGR192=m @@ -5317,6 +5373,8 @@ CONFIG_CRYPTO_AES_NI_INTEL=m CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_ARC4=m CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_BLOWFISH_COMMON=m +CONFIG_CRYPTO_BLOWFISH_X86_64=m CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m @@ -5331,6 +5389,7 @@ CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_TWOFISH_COMMON=m CONFIG_CRYPTO_TWOFISH_X86_64=m +CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m # # Compression @@ -5350,8 +5409,6 @@ CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m CONFIG_CRYPTO_DEV_PADLOCK_SHA=m -CONFIG_CRYPTO_DEV_HIFN_795X=m -CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y CONFIG_HAVE_KVM=y CONFIG_HAVE_KVM_IRQCHIP=y CONFIG_HAVE_KVM_EVENTFD=y @@ -5412,4 +5469,3 @@ CONFIG_NLATTR=y CONFIG_LRU_CACHE=m CONFIG_AVERAGE=y CONFIG_CORDIC=m -CONFIG_LLIST=y diff --git a/srcpkgs/kernel/patches/unionfs-2.5.10_for_3.1.0-rc4-pld.diff.gz b/srcpkgs/kernel/patches/unionfs-2.5.10_for_3.1.0-rc4-pld.diff.gz new file mode 100644 index 00000000000..81287451508 Binary files /dev/null and b/srcpkgs/kernel/patches/unionfs-2.5.10_for_3.1.0-rc4-pld.diff.gz differ diff --git a/srcpkgs/kernel/patches/unionfs-2.5.10_for_3.1.0-rc4.diff.gz.args b/srcpkgs/kernel/patches/unionfs-2.5.10_for_3.1.0-rc4-pld.diff.gz.args similarity index 100% rename from srcpkgs/kernel/patches/unionfs-2.5.10_for_3.1.0-rc4.diff.gz.args rename to srcpkgs/kernel/patches/unionfs-2.5.10_for_3.1.0-rc4-pld.diff.gz.args diff --git a/srcpkgs/kernel/patches/unionfs-2.5.10_for_3.1.0-rc4.diff.gz b/srcpkgs/kernel/patches/unionfs-2.5.10_for_3.1.0-rc4.diff.gz deleted file mode 100644 index 7d08c19085a..00000000000 Binary files a/srcpkgs/kernel/patches/unionfs-2.5.10_for_3.1.0-rc4.diff.gz and /dev/null differ diff --git a/srcpkgs/kmod/patches/fix-error-path-when-loading-deps.patch b/srcpkgs/kmod/patches/fix-error-path-when-loading-deps.patch deleted file mode 100644 index 423344487f4..00000000000 --- a/srcpkgs/kmod/patches/fix-error-path-when-loading-deps.patch +++ /dev/null @@ -1,34 +0,0 @@ -From cb0d0b72128ac566aad9a72800c5a64af66f0b6e Mon Sep 17 00:00:00 2001 -From: Lucas De Marchi -Date: Sun, 8 Jan 2012 18:08:05 -0200 -Subject: [PATCH] modprobe: fix error path when loading dependencies - -demarchi> scenario is the following: -demarchi> modA depends on modB and modC -demarchi> if there's a race when trying to insert a dependency of a module, say - modB, it will stop loading all the modules -demarchi> it should check by "module already loaded error" -demarchi> like it does for modA ---- - tools/kmod-modprobe.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c -index eaf9346..2cda935 100644 ---- a/tools/kmod-modprobe.c -+++ b/tools/kmod-modprobe.c -@@ -666,9 +666,11 @@ static int insmod_do_deps_list(struct kmod_module *parent, struct kmod_list *dep - flags |= KMOD_INSERT_FORCE_VERMAGIC; - - r = kmod_module_insert_module(dm, flags, opts); -+ if (r == -EEXIST && !first_time) -+ r = 0; - if (r < 0) { - WRN("could not insert '%s': %s\n", -- dmname, strerror(-r)); -+ dmname, strerror(-r)); - goto dep_error; - } - } --- -1.7.8.1 diff --git a/srcpkgs/kmod/patches/return-non-zero-on-fail.patch b/srcpkgs/kmod/patches/return-non-zero-on-fail.patch deleted file mode 100644 index 52780ea919a..00000000000 --- a/srcpkgs/kmod/patches/return-non-zero-on-fail.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/tools/kmod-modinfo.c b/tools/kmod-modinfo.c -index b6af26f..8506193 100644 ---- a/tools/kmod-modinfo.c -+++ b/tools/kmod-modinfo.c -@@ -279,6 +279,12 @@ static int modinfo_alias_do(struct kmod_ctx *ctx, const char *alias) - LOG("Module alias %s not found.\n", alias); - return err; - } -+ -+ if (list == NULL) { -+ LOG("Module %s not found.\n", alias); -+ return -ENOENT; -+ } -+ - kmod_list_foreach(l, list) { - struct kmod_module *mod = kmod_module_get_module(l); - int r = modinfo_do(mod); -diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c -index 8286b9b..6ca94f2 100644 ---- a/tools/kmod-modprobe.c -+++ b/tools/kmod-modprobe.c -@@ -856,7 +856,7 @@ static int insmod_alias(struct kmod_ctx *ctx, const char *alias, const char *ext - - if (list == NULL) { - LOG("Module %s not found.\n", alias); -- return err; -+ return -ENOENT; - } - - if (use_blacklist) { diff --git a/srcpkgs/kmod/patches/use-path-max-for-alias-names.patch b/srcpkgs/kmod/patches/use-path-max-for-alias-names.patch deleted file mode 100644 index 5a65b2988aa..00000000000 --- a/srcpkgs/kmod/patches/use-path-max-for-alias-names.patch +++ /dev/null @@ -1,146 +0,0 @@ -From 6daceb2f1f4d442ba04752aaa1cf43d554d5f646 Mon Sep 17 00:00:00 2001 -From: Lucas De Marchi -Date: Sun, 8 Jan 2012 01:02:29 -0200 -Subject: [PATCH] Replace NAME_MAX with PATH_MAX for module aliases - -Module aliases can be bigger than NAME_MAX. So, replace with PATH_MAX -that is bigger enough to hold them. - -Technically in some places NAME_MAX would be sufficient (those using -module names only), but they use functions that can be called with -alias. So increase the buffers in these cases to PATH_MAX too. ---- - libkmod/libkmod-module.c | 10 +++++----- - libkmod/libkmod-util.c | 10 +++++----- - libkmod/libkmod-util.h | 6 +++--- - tools/kmod-depmod.c | 4 ++-- - 4 files changed, 15 insertions(+), 15 deletions(-) - -diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c -index f2359a9..880bac5 100644 ---- a/libkmod/libkmod-module.c -+++ b/libkmod/libkmod-module.c -@@ -185,7 +185,7 @@ KMOD_EXPORT int kmod_module_new_from_name(struct kmod_ctx *ctx, - { - struct kmod_module *m; - size_t namelen; -- char name_norm[NAME_MAX]; -+ char name_norm[PATH_MAX]; - char *namesep; - - if (ctx == NULL || name == NULL || mod == NULL) -@@ -237,11 +237,11 @@ int kmod_module_new_from_alias(struct kmod_ctx *ctx, const char *alias, - const char *name, struct kmod_module **mod) - { - int err; -- char key[NAME_MAX]; -+ char key[PATH_MAX]; - size_t namelen = strlen(name); - size_t aliaslen = strlen(alias); - -- if (namelen + aliaslen + 2 > NAME_MAX) -+ if (namelen + aliaslen + 2 > PATH_MAX) - return -ENAMETOOLONG; - - memcpy(key, name, namelen); -@@ -283,7 +283,7 @@ KMOD_EXPORT int kmod_module_new_from_path(struct kmod_ctx *ctx, - struct kmod_module *m; - int err; - struct stat st; -- char name[NAME_MAX]; -+ char name[PATH_MAX]; - char *abspath; - size_t namelen; - -@@ -434,7 +434,7 @@ KMOD_EXPORT int kmod_module_new_from_lookup(struct kmod_ctx *ctx, - struct kmod_list **list) - { - int err; -- char alias[NAME_MAX]; -+ char alias[PATH_MAX]; - - if (ctx == NULL || given_alias == NULL) - return -ENOENT; -diff --git a/libkmod/libkmod-util.c b/libkmod/libkmod-util.c -index 75e2fea..344d94a 100644 ---- a/libkmod/libkmod-util.c -+++ b/libkmod/libkmod-util.c -@@ -121,11 +121,11 @@ char *underscores(struct kmod_ctx *ctx, char *s) - return s; - } - --inline int alias_normalize(const char *alias, char buf[NAME_MAX], size_t *len) -+inline int alias_normalize(const char *alias, char buf[PATH_MAX], size_t *len) - { - size_t s; - -- for (s = 0; s < NAME_MAX - 1; s++) { -+ for (s = 0; s < PATH_MAX - 1; s++) { - const char c = alias[s]; - switch (c) { - case '-': -@@ -160,12 +160,12 @@ finish: - return 0; - } - --inline char *modname_normalize(const char *modname, char buf[NAME_MAX], -+inline char *modname_normalize(const char *modname, char buf[PATH_MAX], - size_t *len) - { - size_t s; - -- for (s = 0; s < NAME_MAX - 1; s++) { -+ for (s = 0; s < PATH_MAX - 1; s++) { - const char c = modname[s]; - if (c == '-') - buf[s] = '_'; -@@ -183,7 +183,7 @@ inline char *modname_normalize(const char *modname, char buf[NAME_MAX], - return buf; - } - --char *path_to_modname(const char *path, char buf[NAME_MAX], size_t *len) -+char *path_to_modname(const char *path, char buf[PATH_MAX], size_t *len) - { - char *modname; - -diff --git a/libkmod/libkmod-util.h b/libkmod/libkmod-util.h -index 3cd352c..e8ed5ad 100644 ---- a/libkmod/libkmod-util.h -+++ b/libkmod/libkmod-util.h -@@ -20,9 +20,9 @@ int read_str_ulong(int fd, unsigned long *value, int base) __must_check __attrib - char *strchr_replace(char *s, int c, char r); - bool path_is_absolute(const char *p) __must_check __attribute__((nonnull(1))); - char *path_make_absolute_cwd(const char *p) __must_check __attribute__((nonnull(1))); --int alias_normalize(const char *alias, char buf[NAME_MAX], size_t *len) __must_check __attribute__((nonnull(1,2))); --char *modname_normalize(const char *modname, char buf[NAME_MAX], size_t *len) __attribute__((nonnull(1, 2))); --char *path_to_modname(const char *path, char buf[NAME_MAX], size_t *len) __attribute__((nonnull(2))); -+int alias_normalize(const char *alias, char buf[PATH_MAX], size_t *len) __must_check __attribute__((nonnull(1,2))); -+char *modname_normalize(const char *modname, char buf[PATH_MAX], size_t *len) __attribute__((nonnull(1, 2))); -+char *path_to_modname(const char *path, char buf[PATH_MAX], size_t *len) __attribute__((nonnull(2))); - unsigned long long ts_usec(const struct timespec *ts); - - #endif -diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c -index 70c397c..4726522 100644 ---- a/tools/kmod-depmod.c -+++ b/tools/kmod-depmod.c -@@ -1249,7 +1249,7 @@ static int depmod_modules_search_file(struct depmod *depmod, size_t baselen, siz - struct kmod_module *kmod; - struct mod *mod; - const char *relpath; -- char modname[NAME_MAX]; -+ char modname[PATH_MAX]; - const struct kmod_ext *eitr; - size_t modnamelen; - uint8_t matches = 0; -@@ -2101,7 +2101,7 @@ static int output_builtin_bin(struct depmod *depmod, FILE *out) - { - FILE *in; - struct index_node *idx; -- char infile[PATH_MAX], line[PATH_MAX], modname[NAME_MAX]; -+ char infile[PATH_MAX], line[PATH_MAX], modname[PATH_MAX]; - - if (out == stdout) - return 0; --- -1.7.8.1 diff --git a/srcpkgs/kmod/template b/srcpkgs/kmod/template index d586e880150..0bcebee03da 100644 --- a/srcpkgs/kmod/template +++ b/srcpkgs/kmod/template @@ -1,16 +1,14 @@ # Template file for 'kmod' pkgname=kmod -version=3 -patch_args="-Np1" +version=4 homepage="http://git.profusion.mobi/cgit.cgi/kmod.git" distfiles="http://packages.profusion.mobi//$pkgname/$pkgname-$version.tar.xz" build_style=gnu-configure -configure_args="--with-rootprefix= --with-rootlibdir=/lib --with-zlib ---with-xz" +configure_args="--with-rootprefix= --with-rootlibdir=/lib --with-zlib --with-xz" short_desc="Linux kernel module handling" maintainer="Juan RP " license="GPL-2" -checksum=4b32439703ab2837e81ae80f527f9e964ecb5883a9e80d1cc7518cf6e8593ad9 +checksum=4bcae464d1801f403e6c6454b922c4b117f61cb8cf1a85a3a24267fbf353ff68 long_desc=" kmod is a set of tools to handle common tasks with Linux kernel modules like insert, remove, list, check properties, resolve dependencies and aliases. diff --git a/srcpkgs/libfm/libfm-devel.template b/srcpkgs/libfm/libfm-devel.template index 9f74c9f73a1..c7b61370cb3 100644 --- a/srcpkgs/libfm/libfm-devel.template +++ b/srcpkgs/libfm/libfm-devel.template @@ -13,5 +13,6 @@ do_install() { vmove usr/include usr vmove usr/lib/pkgconfig usr/lib + vmove usr/share/gtk-doc usr/share vmove "usr/lib/*.a" usr/lib } diff --git a/srcpkgs/libfm/libfm.rshlibs b/srcpkgs/libfm/libfm.rshlibs index a73bfdddc81..eadaab76087 100644 --- a/srcpkgs/libfm/libfm.rshlibs +++ b/srcpkgs/libfm/libfm.rshlibs @@ -18,3 +18,5 @@ libgmodule-2.0.so.0 libgthread-2.0.so.0 librt.so.1 libm.so.6 +libdbus-glib-1.so.2 +libdbus-1.so.3 diff --git a/srcpkgs/libfm/patches/fix_configure_error.patch b/srcpkgs/libfm/patches/fix_configure_error.patch deleted file mode 100644 index 0500bc2f51e..00000000000 --- a/srcpkgs/libfm/patches/fix_configure_error.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2011-10-14 11:52:37.150473742 +0200 -+++ configure 2011-10-14 11:52:46.191239300 +0200 -@@ -14181,7 +14181,7 @@ cat >>confdefs.h <<_ACEOF - _ACEOF - - --ac_config_files="$ac_config_files Makefile src/Makefile src/tests/Makefile data/Makefile data/ui/Makefile po/Makefile.in docs/Makefile docs/reference/Makefile docs/reference/libfm/Makefile libfm.pc libfm-gtk.pc" -+ac_config_files="$ac_config_files Makefile src/Makefile src/tests/Makefile data/Makefile data/ui/Makefile po/Makefile.in libfm.pc libfm-gtk.pc" - - - cat >confcache <<\_ACEOF diff --git a/srcpkgs/libfm/template b/srcpkgs/libfm/template index 5a99eebd3a6..b1642c40c69 100644 --- a/srcpkgs/libfm/template +++ b/srcpkgs/libfm/template @@ -1,12 +1,12 @@ # Template file for 'libfm' pkgname=libfm -version=0.1.16 +version=0.1.17 distfiles="${SOURCEFORGE_SITE}/pcmanfm/$pkgname-$version.tar.gz" build_style=gnu-configure -revision=1 +configure_args="--enable-udisks" short_desc="LXDE GLib/GIO based library" maintainer="Juan RP " -checksum=ed49365319b941757c155b3790a2adf73f5072227c578d9bcba7329c6f9fcd3b +checksum=1740681cff4cd4c5a2eaa9805d8898269cfb6a49a0bda0acb242def15bc7131b long_desc=" libfm is a glib/gio-based lib used to develop file managers providing some file management utilities." @@ -19,7 +19,9 @@ conf_files=" Add_dependency build pkg-config Add_dependency build intltool +Add_dependency build dbus-glib-devel Add_dependency build gtk+-devel Add_dependency build menu-cache-devel Add_dependency full desktop-file-utils +Add_dependency full udisks diff --git a/srcpkgs/libopenbox b/srcpkgs/libopenbox new file mode 120000 index 00000000000..32be1cdf0f1 --- /dev/null +++ b/srcpkgs/libopenbox @@ -0,0 +1 @@ +openbox \ No newline at end of file diff --git a/srcpkgs/lxde/template b/srcpkgs/lxde/template index ad838dc6757..2a0fc0d876e 100644 --- a/srcpkgs/lxde/template +++ b/srcpkgs/lxde/template @@ -1,7 +1,7 @@ # Template file for 'lxde' pkgname=lxde version=0.5.0 -revision=1 +revision=3 build_style=meta-template short_desc="LXDE meta-package" maintainer="Juan RP " @@ -21,5 +21,7 @@ Add_dependency full lxlauncher Add_dependency full lxinput Add_dependency full lxrandr Add_dependency full lxpanel +Add_dependency full lxtask +Add_dependency full gpicview Add_dependency full xdg-utils Add_dependency full xdg-user-dirs diff --git a/srcpkgs/lxtask/lxtask.rshlibs b/srcpkgs/lxtask/lxtask.rshlibs new file mode 100644 index 00000000000..54e2be6dc7a --- /dev/null +++ b/srcpkgs/lxtask/lxtask.rshlibs @@ -0,0 +1,5 @@ +libgtk-x11-2.0.so.0 +libgobject-2.0.so.0 +libglib-2.0.so.0 +libpthread.so.0 +libc.so.6 diff --git a/srcpkgs/lxtask/template b/srcpkgs/lxtask/template new file mode 100644 index 00000000000..2466859c851 --- /dev/null +++ b/srcpkgs/lxtask/template @@ -0,0 +1,20 @@ +# Template file for 'lxtask' +pkgname=lxtask +version=0.1.4 +homepage="http://lxde.org/" +distfiles="${SOURCEFORGE_SITE}/lxde/$pkgname-$version.tar.gz" +build_style=gnu-configure +short_desc="LXDE Task Manager" +maintainer="Juan RP " +license="GPL-2" +checksum=39110c99e9e56101e25be35628abafd81b1e3ea47e2d8bea45b2cb12c1e3cd61 +long_desc=" + LXTask - lightweight and desktop-independent task manager derived from + xfce4-taskmanager with all dependencies on xfce removed, new features, + and some improvement of the user interface." + +Add_dependency build pkg-config +Add_dependency build intltool +Add_dependency build gtk+-devel + +Add_dependency full desktop-file-utils diff --git a/srcpkgs/openbox-devel b/srcpkgs/openbox-devel new file mode 120000 index 00000000000..32be1cdf0f1 --- /dev/null +++ b/srcpkgs/openbox-devel @@ -0,0 +1 @@ +openbox \ No newline at end of file diff --git a/srcpkgs/openbox/depends b/srcpkgs/openbox/depends new file mode 100644 index 00000000000..de997e86d89 --- /dev/null +++ b/srcpkgs/openbox/depends @@ -0,0 +1,2 @@ +abi_depends=">=3.5.0" +api_depends="${abi_depends}" diff --git a/srcpkgs/openbox/libopenbox.rshlibs b/srcpkgs/openbox/libopenbox.rshlibs new file mode 100644 index 00000000000..4ccfd963f1e --- /dev/null +++ b/srcpkgs/openbox/libopenbox.rshlibs @@ -0,0 +1,22 @@ +libSM.so.6 +libICE.so.6 +libpangoxft-1.0.so.0 +libpangoft2-1.0.so.0 +libXft.so.2 +libpango-1.0.so.0 +libgobject-2.0.so.0 +libgmodule-2.0.so.0 +libgthread-2.0.so.0 +librt.so.1 +libXrender.so.1 +libfontconfig.so.1 +libfreetype.so.6 +libX11.so.6 +libglib-2.0.so.0 +libImlib2.so.1 +libxml2.so.2 +libpthread.so.0 +libc.so.6 +libXinerama.so.1 +libXrandr.so.2 +libXext.so.6 diff --git a/srcpkgs/openbox/libopenbox.template b/srcpkgs/openbox/libopenbox.template new file mode 100644 index 00000000000..a456fde761d --- /dev/null +++ b/srcpkgs/openbox/libopenbox.template @@ -0,0 +1,11 @@ +# Template file for 'libopenbox'. +# +short_desc="openbox runtime shared libraries" +long_desc=" + ${long_desc} + + This package includes the runtime shared libraries." + +do_install() { + vmove "usr/lib/*.so*" usr/lib +} diff --git a/srcpkgs/openbox/openbox-devel.template b/srcpkgs/openbox/openbox-devel.template new file mode 100644 index 00000000000..44300124ecd --- /dev/null +++ b/srcpkgs/openbox/openbox-devel.template @@ -0,0 +1,15 @@ +# Template file for 'openbox-devel'. +# +short_desc="openbox development files" +long_desc=" + ${long_desc} + + This package includes development files: headers, static libs, etc." + +Add_dependency run libopenbox + +do_install() { + vmove "usr/lib/*.a" usr/lib + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib +} diff --git a/srcpkgs/openbox/openbox.rshlibs b/srcpkgs/openbox/openbox.rshlibs index d7735d32eed..8a47e63cbd5 100644 --- a/srcpkgs/openbox/openbox.rshlibs +++ b/srcpkgs/openbox/openbox.rshlibs @@ -1,4 +1,3 @@ -libXinerama.so.1 libXrandr.so.2 libXext.so.6 libglib-2.0.so.0 @@ -10,15 +9,7 @@ libstartup-notification-1.so.0 libxml2.so.2 libc.so.6 libXau.so.6 -libpangoxft-1.0.so.0 -libpangoft2-1.0.so.0 -libpango-1.0.so.0 -libgobject-2.0.so.0 -libgmodule-2.0.so.0 -libgthread-2.0.so.0 -librt.so.1 -libXft.so.2 -libXrender.so.1 -libfontconfig.so.1 -libfreetype.so.6 libpthread.so.0 +libXinerama.so.1 +libobrender.so.27 +libobt.so.0 diff --git a/srcpkgs/openbox/template b/srcpkgs/openbox/template index 4836faafca7..42c5554ec78 100644 --- a/srcpkgs/openbox/template +++ b/srcpkgs/openbox/template @@ -1,13 +1,15 @@ # Template file for 'openbox' pkgname=openbox -version=3.4.10 +version=3.5.0 +revision=1 +homepage="http://www.openbox.org" distfiles="http://icculus.org/openbox/releases/$pkgname-$version.tar.gz" build_style=gnu-configure configure_args="--enable-startup-notification" -revision=1 short_desc="Standards compliant, fast, light-weight, extensible window manager" maintainer="Juan RP " -checksum=20356f93c3334c3209284fba2628a9c48c3140a35febd0bdafa3a164d0eaed00 +license="GPL-2" +checksum=6fa90016530b3aa6102e254079461977439398531fb23e7ec076ff2c140fea0a long_desc=" Openbox works with your applications, and makes your desktop easier to manage. This is because the approach to its development was the opposite of @@ -29,18 +31,24 @@ long_desc=" * Multi-head Xinerama support! * Pipe menus" +subpackages="${pkgname}-devel lib${pkgname}" + conf_files=" /etc/xdg/openbox/menu.xml /etc/xdg/openbox/rc.xml -/etc/xdg/openbox/autostart.sh" +/etc/xdg/openbox/environment +/etc/xdg/openbox/autostart" Add_dependency build pkg-config +Add_dependency build startup-notification-devel +Add_dependency build libxml2-devel +Add_dependency build libXrandr-devel +Add_dependency build libXcursor-devel +Add_dependency build libXinerama-devel +Add_dependency build imlib2-devel +Add_dependency build pango-devel -_deps="fontconfig freetype glib pango libICE libSM libX11 libXau libXcursor" -_deps="${_deps} libXext libXft libXinerama libXrandr libXrender libxml2" -_deps="${_deps} startup-notification" - -for _dep_ in ${_deps}; do - Add_dependency run ${_dep_} - Add_dependency build ${_dep_}-devel -done +post_install() { + # Doesn't work with GNOME3. + rm -f ${DESTDIR}/usr/share/xsessions/openbox-gnome.desktop +} diff --git a/srcpkgs/pcmanfm/patches/pcmanfm_desktop_ceil.patch b/srcpkgs/pcmanfm/patches/pcmanfm_desktop_ceil.patch new file mode 100644 index 00000000000..3cfc0647d0e --- /dev/null +++ b/srcpkgs/pcmanfm/patches/pcmanfm_desktop_ceil.patch @@ -0,0 +1,12 @@ +pcmanfm-desktop.c uses ceil(3) so must be linked to libm. + +--- src/Makefile.am.orig 2012-01-16 17:03:19.091356701 +0100 ++++ src/Makefile.am 2012-01-16 17:03:34.625980985 +0100 +@@ -48,6 +48,7 @@ pcmanfm_LDADD = \ + $(GMODULE_LIBS) \ + $(FM_LIBS) \ + $(MENU_CACHE_LIBS) \ ++ -lm \ + $(NULL) + + noinst_PROGRAMS=xml-purge diff --git a/srcpkgs/pcmanfm/template b/srcpkgs/pcmanfm/template index 4fa6725de37..f244109629b 100644 --- a/srcpkgs/pcmanfm/template +++ b/srcpkgs/pcmanfm/template @@ -1,12 +1,11 @@ # Template file for 'pcmanfm' pkgname=pcmanfm -version=0.9.9 +version=0.9.10 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" build_style=gnu-configure -revision=3 short_desc="LXDE file manager" maintainer="Juan RP " -checksum=bc48af4ade638b47e4207cc274f6e38c2bd3786a811d20da47c3df9907c6fb6c +checksum=f133c6f207f719d1fc69fe8bc07b2de6883c6937ffa87448df42e3b1a30e0298 long_desc=" Features: * An extremly fast, lightweight, yet feature-rich file manager @@ -16,9 +15,15 @@ long_desc=" conf_files="/etc/xdg/pcmanfm/default/pcmanfm.conf" +Add_dependency build automake +Add_dependency build gettext-devel Add_dependency build pkg-config Add_dependency build intltool Add_dependency build gtk+-devel Add_dependency build libfm-devel Add_dependency full desktop-file-utils + +pre_configure() { + autoreconf -fi +} diff --git a/srcpkgs/perl-XML-Parser/template b/srcpkgs/perl-XML-Parser/template index 7aa00e8744e..d34d566aac3 100644 --- a/srcpkgs/perl-XML-Parser/template +++ b/srcpkgs/perl-XML-Parser/template @@ -1,13 +1,14 @@ # Template build file for 'perl-XML-Parser'. pkgname=perl-XML-Parser -version=2.40 +version=2.41 wrksrc="XML-Parser-$version" +homepage="http://search.cpan.org/dist/XML-Parser/" distfiles="${CPAN_SITE}/XML/XML-Parser-$version.tar.gz" build_style=perl-module -revision=1 short_desc="Perl extension interface to James Clark's XML parser, expat" maintainer="Juan RP " -checksum=e5e433684e799ef7b6b852c0ca31b71054717628555444d3dc9fceac0df71512 +license="GPL-2" +checksum=b48197cd2265a26c5f016489f11a7b450d8833cb8b3d6a46ee15975740894de9 long_desc=" This module provides ways to parse XML documents. It is built on top of XML::Parser::Expat, which is a lower level interface to James Clark's diff --git a/srcpkgs/rhythmbox/template b/srcpkgs/rhythmbox/template index 70c72724abd..d1efe0d694a 100644 --- a/srcpkgs/rhythmbox/template +++ b/srcpkgs/rhythmbox/template @@ -1,6 +1,7 @@ # Template file for 'rhythmbox'. pkgname=rhythmbox version=2.95 +revision=1 homepage="http://www.rhythmbox.org" distfiles="${GNOME_SITE}/$pkgname/2.95/$pkgname-$version.tar.xz" build_style=gnu-configure @@ -32,6 +33,8 @@ long_desc=" gtk_iconcache_dirs="/usr/share/icons/hicolor" subpackages="lib${pkgname} ${pkgname}-devel" +build_requires=15 +shlib_depends="libtdb>=1.2.6" Add_dependency build pkg-config Add_dependency build intltool diff --git a/srcpkgs/ristretto/template b/srcpkgs/ristretto/template index 4f72db0f57b..3c498d4006e 100644 --- a/srcpkgs/ristretto/template +++ b/srcpkgs/ristretto/template @@ -1,13 +1,13 @@ # Template file for 'ristretto' pkgname=ristretto -version=0.3.1 +version=0.3.2 homepage="http://goodies.xfce.org/projects/applications/ristretto" distfiles="http://archive.xfce.org/src/apps/$pkgname/${version%.*}/$pkgname-$version.tar.bz2" build_style=gnu-configure short_desc="Picture-viewer for the Xfce desktop environment" maintainer="Juan RP " license="GPL-2" -checksum=7b3d5de3be0db8beca20d4408de9beb4efe3a78c44e22c5f19956887fbf70173 +checksum=a28c9e472c329b5f3136ebea887dec5ba93a37d5562b493633161392aff5545f long_desc=" Ristretto is a fast and lightweight picture-viewer for the Xfce desktop environment." diff --git a/srcpkgs/sqlite/sqlite-tcl.template b/srcpkgs/sqlite/sqlite-tcl.template index aa6080152ab..1ab20549418 100644 --- a/srcpkgs/sqlite/sqlite-tcl.template +++ b/srcpkgs/sqlite/sqlite-tcl.template @@ -1,6 +1,5 @@ # Template file for 'sqlite-tcl'. # -revision=1 short_desc="${sourcepkg} TCL bindings" long_desc="${long_desc} diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template index ddbef191326..f5f0f06ddf8 100644 --- a/srcpkgs/sqlite/template +++ b/srcpkgs/sqlite/template @@ -1,16 +1,15 @@ # Template build file for 'sqlite'. pkgname=sqlite -version=3.7.9 -_amalgamationver=3070900 +version=3.7.10 +_amalgamationver=3071000 wrksrc=sqlite create_wrksrc=yes distfiles="http://www.sqlite.org/sqlite-autoconf-${_amalgamationver}.tar.gz" -revision=1 short_desc="SQL Database Engine in a C Library" maintainer="Juan RP " homepage="http://www.sqlite.org" license="Public Domain" -checksum=7be6cdb375505e5d9a4aee88b2ddb6ea0d9d29c9545114ff77b345e1fa812439 +checksum=9c1775057af5cc8b6cc64808b9553d77beccf3757e16ecee3bc878404d9c43e3 long_desc=" SQLite is a C library that implements an SQL database engine. Programs that link with the SQLite library can have SQL database access without diff --git a/srcpkgs/xbps-src/template b/srcpkgs/xbps-src/template index 3d46e98c2b4..14bc85d569e 100644 --- a/srcpkgs/xbps-src/template +++ b/srcpkgs/xbps-src/template @@ -1,6 +1,6 @@ # Template file for 'xbps-src' pkgname=xbps-src -version=14 +version=15 distfiles="https://github.com/downloads/xtraeme/xbps-src/xbps-src-${version}.tar.gz" build_style=gnu-makefile make_build_args="PREFIX=/usr ETCDIR=/etc/xbps" @@ -9,7 +9,7 @@ short_desc="The XBPS package system - binary package builder" maintainer="Juan RP " homepage="http://code.google.com/p/xbps" license="Simplified BSD" -checksum=9353f63c2ae61d181f7e13063cceefc963a5f17fd44a81392d891f8ebbf56709 +checksum=c4c4b1b954cb1456a06f8b01c09bfb81ff57cff66354ebf87b6cccdd4958ecc1 long_desc=" The XBPS package system. A new, fast, from scratch and simple binary package manager. This package includes xbps-src, the