diff --git a/core/linux-armv5/PKGBUILD b/core/linux-armv5/PKGBUILD index 7b64b81ac..e0e5ba5a3 100644 --- a/core/linux-armv5/PKGBUILD +++ b/core/linux-armv5/PKGBUILD @@ -4,11 +4,11 @@ buildarch=2 pkgbase=linux-armv5 -_srcname=linux-3.11-rc2 +_srcname=linux-3.11-rc4 _kernelname=${pkgbase#linux} _desc="ARMv5 based platforms" pkgver=3.11.0 -pkgrel=2 +pkgrel=3 arch=('armv7h') url="http://www.kernel.org/" license=('GPL2') @@ -17,8 +17,8 @@ options=('!strip') source=("http://www.kernel.org/pub/linux/kernel/v3.x/testing/${_srcname}.tar.xz" 'config' 'imx23-olinuxino.patch') -md5sums=('561448f8e18af681d562db331a3b9c19' - '48fd27095f4ee14ff0480749ba405c9d' +md5sums=('e1f1ab33167e0bcd48df7d5bceced194' + '8a80e5df40e71d6aab793ef4130596dd' 'f536078d41d92941951b92489e5d7600') prepare() { diff --git a/core/linux-armv5/config b/core/linux-armv5/config index 68752250a..89ef9fad6 100644 --- a/core/linux-armv5/config +++ b/core/linux-armv5/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.11.0-rc1 Kernel Configuration +# Linux/arm 3.11.0-rc4 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -332,6 +332,8 @@ CONFIG_ARM_THUMB=y # CONFIG_CPU_DCACHE_DISABLE is not set # CONFIG_CPU_DCACHE_WRITETHROUGH is not set # CONFIG_CPU_CACHE_ROUND_ROBIN is not set +CONFIG_NEED_KUSER_HELPERS=y +CONFIG_KUSER_HELPERS=y # CONFIG_CACHE_L2X0 is not set CONFIG_ARM_L1_CACHE_SHIFT=5 CONFIG_ARM_NR_BANKS=8 @@ -424,8 +426,7 @@ CONFIG_BINFMT_ELF=y CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y CONFIG_BINFMT_SCRIPT=y -CONFIG_HAVE_AOUT=y -CONFIG_BINFMT_AOUT=y +# CONFIG_HAVE_AOUT is not set CONFIG_BINFMT_MISC=y CONFIG_COREDUMP=y @@ -792,7 +793,7 @@ CONFIG_DNS_RESOLVER=y # CONFIG_NETLINK_DIAG is not set # CONFIG_NET_MPLS_GSO is not set # CONFIG_NETPRIO_CGROUP is not set -CONFIG_NET_LL_RX_POLL=y +CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y # CONFIG_BPF_JIT is not set @@ -1459,9 +1460,11 @@ CONFIG_RT2X00_LIB_CRYPTO=y CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_LIB_DEBUGFS is not set # CONFIG_RT2X00_DEBUG is not set -CONFIG_RTLWIFI=m -CONFIG_RTLWIFI_DEBUG=y +CONFIG_RTL_CARDS=m CONFIG_RTL8192CU=m +CONFIG_RTLWIFI=m +CONFIG_RTLWIFI_USB=m +CONFIG_RTLWIFI_DEBUG=y CONFIG_RTL8192C_COMMON=m # CONFIG_WL_TI is not set CONFIG_ZD1211RW=m @@ -2729,6 +2732,7 @@ CONFIG_USB_SERIAL_ZTE=m CONFIG_USB_SERIAL_SSU100=m CONFIG_USB_SERIAL_QT2=m # CONFIG_USB_SERIAL_FLASHLOADER is not set +# CONFIG_USB_SERIAL_SUUNTO is not set # CONFIG_USB_SERIAL_DEBUG is not set # @@ -3105,7 +3109,6 @@ CONFIG_LIRC_ZILOG=m # CONFIG_ANDROID is not set CONFIG_USB_WPAN_HCD=m # CONFIG_WIMAX_GDM72XX is not set -# CONFIG_CSR_WIFI is not set # CONFIG_CED1401 is not set # CONFIG_DGRP is not set # CONFIG_USB_BTMTK is not set @@ -3749,7 +3752,6 @@ CONFIG_CRYPTO_HMAC=y # CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_CRC32 is not set -CONFIG_CRYPTO_CRCT10DIF=y # CONFIG_CRYPTO_GHASH is not set CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y diff --git a/core/linux-armv7/PKGBUILD b/core/linux-armv7/PKGBUILD index 89a625532..adec7974c 100644 --- a/core/linux-armv7/PKGBUILD +++ b/core/linux-armv7/PKGBUILD @@ -4,22 +4,22 @@ buildarch=4 pkgbase=linux-armv7 -_srcname=linux-3.11-rc3 +_srcname=linux-3.11-rc4 _kernelname=${pkgbase#linux} _desc="ARMv7 multi-platform" pkgver=3.11.0 -pkgrel=3 +pkgrel=5 arch=('armv7h') url="http://www.kernel.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git') options=('!strip') source=("http://www.kernel.org/pub/linux/kernel/v3.x/testing/${_srcname}.tar.xz" - "rcn.patch.gz::http://rcn-ee.net/deb/sid-armhf/v3.11.0-rc3-armv7-x5/patch-3.11-rc3-armv7-x5.diff.gz" + "rcn.patch.gz::http://rcn-ee.net/deb/sid-armhf/v3.11.0-rc4-armv7-x6/patch-3.11-rc4-armv7-x6.diff.gz" 'config') -md5sums=('87e993df0f96a9a83372dcf78ca9bb1b' - '4fe400bf960b4871b56fcafc79045e44' - 'aa24a6fd948d0e66045b197d14879eea') +md5sums=('e1f1ab33167e0bcd48df7d5bceced194' + '7b09ea222dd7a7e9e18625f957bbc491' + 'e3441994882da399868fe568fb32f46c') prepare() { cd "${srcdir}/${_srcname}" diff --git a/core/linux-armv7/config b/core/linux-armv7/config index b94daba3c..da97c72ae 100644 --- a/core/linux-armv7/config +++ b/core/linux-armv7/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.11.0-rc3 Kernel Configuration +# Linux/arm 3.11.0-rc4 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -391,7 +391,7 @@ CONFIG_MACH_OMAP_GENERIC=y CONFIG_ARCH_OMAP=y CONFIG_ARCH_OMAP3=y CONFIG_ARCH_OMAP4=y -# CONFIG_SOC_OMAP5 is not set +CONFIG_SOC_OMAP5=y CONFIG_SOC_AM33XX=y CONFIG_SOC_AM43XX=y CONFIG_ARCH_OMAP2PLUS=y @@ -401,6 +401,7 @@ CONFIG_ARCH_OMAP2PLUS=y # CONFIG_ARCH_OMAP2PLUS_TYPICAL=y CONFIG_SOC_HAS_OMAP2_SDRC=y +CONFIG_SOC_HAS_REALTIME_COUNTER=y CONFIG_SOC_OMAP3430=y CONFIG_SOC_TI81XX=y CONFIG_OMAP_PACKAGE_CBB=y @@ -490,6 +491,7 @@ CONFIG_SWP_EMULATE=y # CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_DCACHE_DISABLE is not set # CONFIG_CPU_BPREDICT_DISABLE is not set +CONFIG_KUSER_HELPERS=y CONFIG_OUTER_CACHE=y CONFIG_OUTER_CACHE_SYNC=y CONFIG_MIGHT_HAVE_CACHE_L2X0=y @@ -511,7 +513,7 @@ CONFIG_ARM_ERRATA_754322=y CONFIG_ARM_ERRATA_764369=y CONFIG_PL310_ERRATA_769419=y CONFIG_ARM_ERRATA_775420=y -# CONFIG_ARM_ERRATA_798181 is not set +CONFIG_ARM_ERRATA_798181=y CONFIG_ICST=y CONFIG_TI_PRIV_EDMA=y @@ -543,7 +545,7 @@ CONFIG_NR_CPUS=4 CONFIG_HOTPLUG_CPU=y # CONFIG_ARM_PSCI is not set CONFIG_LOCAL_TIMERS=y -CONFIG_ARCH_NR_GPIO=0 +CONFIG_ARCH_NR_GPIO=512 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set @@ -658,8 +660,7 @@ CONFIG_BINFMT_ELF=y CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y CONFIG_BINFMT_SCRIPT=y -CONFIG_HAVE_AOUT=y -CONFIG_BINFMT_AOUT=m +# CONFIG_HAVE_AOUT is not set CONFIG_BINFMT_MISC=m CONFIG_COREDUMP=y @@ -1198,7 +1199,7 @@ CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y CONFIG_NETPRIO_CGROUP=m -CONFIG_NET_LL_RX_POLL=y +CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y CONFIG_BPF_JIT=y CONFIG_NET_FLOW_LIMIT=y @@ -1980,9 +1981,11 @@ CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2X00_LIB_CRYPTO=y CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set -CONFIG_RTLWIFI=m -# CONFIG_RTLWIFI_DEBUG is not set +CONFIG_RTL_CARDS=m CONFIG_RTL8192CU=m +CONFIG_RTLWIFI=m +CONFIG_RTLWIFI_USB=m +# CONFIG_RTLWIFI_DEBUG is not set CONFIG_RTL8192C_COMMON=m CONFIG_WL_TI=y CONFIG_WL1251=m @@ -2678,6 +2681,7 @@ CONFIG_IMX_THERMAL=y CONFIG_TI_SOC_THERMAL=y CONFIG_TI_THERMAL=y CONFIG_OMAP4_THERMAL=y +CONFIG_OMAP5_THERMAL=y CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_NOWAYOUT=y @@ -3523,7 +3527,7 @@ CONFIG_SND_OMAP_SOC_HDMI=y CONFIG_SND_OMAP_SOC_OMAP_TWL4030=y CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=y CONFIG_SND_OMAP_SOC_OMAP_HDMI=y -# CONFIG_SND_OMAP_SOC_OMAP3_PANDORA is not set +CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=y CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_SOC_ALL_CODECS is not set CONFIG_SND_SOC_DMIC=y @@ -3662,7 +3666,7 @@ CONFIG_USB_MON=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y -# CONFIG_USB_EHCI_MXC is not set +CONFIG_USB_EHCI_MXC=y CONFIG_USB_EHCI_HCD_OMAP=y # CONFIG_USB_EHCI_HCD_PLATFORM is not set # CONFIG_USB_OXU210HP_HCD is not set @@ -3793,6 +3797,7 @@ CONFIG_USB_SERIAL_ZTE=m CONFIG_USB_SERIAL_SSU100=m CONFIG_USB_SERIAL_QT2=m # CONFIG_USB_SERIAL_FLASHLOADER is not set +CONFIG_USB_SERIAL_SUUNTO=m CONFIG_USB_SERIAL_DEBUG=m # @@ -4115,8 +4120,8 @@ CONFIG_USBIP_CORE=m CONFIG_USBIP_VHCI_HCD=m CONFIG_USBIP_HOST=m # CONFIG_USBIP_DEBUG is not set -# CONFIG_W35UND is not set -# CONFIG_PRISM2_USB is not set +CONFIG_W35UND=m +CONFIG_PRISM2_USB=m # CONFIG_ECHO is not set # CONFIG_COMEDI is not set # CONFIG_ASUS_OLED is not set @@ -4125,7 +4130,8 @@ CONFIG_RTLLIB_CRYPTO_CCMP=m CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m CONFIG_R8712U=m -# CONFIG_RTS5139 is not set +CONFIG_RTS5139=m +# CONFIG_RTS5139_DEBUG is not set # CONFIG_TRANZPORT is not set # CONFIG_LINE6_USB is not set # CONFIG_USB_SERIAL_QUATECH2 is not set @@ -4237,7 +4243,17 @@ CONFIG_ADIS16240=m # CONFIG_SPEAKUP is not set # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set -# CONFIG_STAGING_MEDIA is not set +CONFIG_STAGING_MEDIA=y +# CONFIG_DVB_AS102 is not set +# CONFIG_VIDEO_GO7007 is not set +CONFIG_LIRC_STAGING=y +CONFIG_LIRC_IGORPLUGUSB=m +CONFIG_LIRC_IMON=m +CONFIG_LIRC_SASEM=m +CONFIG_LIRC_SERIAL=m +CONFIG_LIRC_SERIAL_TRANSMITTER=y +CONFIG_LIRC_SIR=m +CONFIG_LIRC_ZILOG=m # # Android @@ -4262,6 +4278,7 @@ CONFIG_DRM_IMX_TVE=y CONFIG_DRM_IMX_LDB=y CONFIG_DRM_IMX_IPUV3_CORE=y CONFIG_DRM_IMX_IPUV3=y +CONFIG_DRM_IMX_HDMI=y # CONFIG_DGRP is not set CONFIG_USB_BTMTK=m CONFIG_CLKDEV_LOOKUP=y @@ -4473,7 +4490,6 @@ CONFIG_IPACK_BUS=y # CONFIG_SERIAL_IPOCTAL is not set CONFIG_ARCH_HAS_RESET_CONTROLLER=y CONFIG_RESET_CONTROLLER=y -CONFIG_RESET_GPIO=y # CONFIG_FMC is not set # diff --git a/core/linux-kirkwood/PKGBUILD b/core/linux-kirkwood/PKGBUILD index e17c40299..0fc89296d 100644 --- a/core/linux-kirkwood/PKGBUILD +++ b/core/linux-kirkwood/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=linux-kirkwood pkgname=('linux-kirkwood' 'linux-headers-kirkwood') #pkgname=linux-test # Build kernel with a different name _kernelname=${pkgname#linux} -_basekernel=3.10.4 +_basekernel=3.10.5 pkgver=${_basekernel} pkgrel=1 cryptover=1.6 @@ -29,7 +29,7 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.xz" "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-4).0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-$(echo $_basekernel |cut -c 1-4).patch" "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-4).0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-$(echo $_basekernel |cut -c 1-4).0.patch") -md5sums=('0378156d0a4ebf155d083531c3cb3826' +md5sums=('853d4bca2752a7ec6ca11a14d557d691' 'c84965943b804f763f892e4f704ba73b' 'f5d3635da03cb45904bedd69b47133de' 'eb059648b877ab24d3689c6c3ce173ed' @@ -64,10 +64,8 @@ msg2 "Add the USB_QUIRK_RESET_RESUME for several webcams" # FS#26528 patch -Np1 -i "${srcdir}/usb-add-reset-resume-quirk-for-several-webcams.patch" -msg2 "Add Arch Linux ARM patch for ARMv5te plug computers," -msg2 "requested additional support, mach-types" +msg2 "Add Arch Linux ARM patch for ARMv5te plug computers, mach-types" patch -Np1 -i "${srcdir}/archlinuxarm.patch" - patch -Np1 -i "${srcdir}/support.patch" cp "${srcdir}/mach-types" arch/arm/tools msg2 "Add BFQ patches" diff --git a/core/linux-kirkwood/support.patch b/core/linux-kirkwood/support.patch deleted file mode 100644 index 36cb5b665..000000000 --- a/core/linux-kirkwood/support.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/drivers/usb/misc/sisusbvga/sisusb.c -+++ b/drivers/usb/misc/sisusbvga/sisusb.c -@@ -3247,6 +3247,7 @@ - { USB_DEVICE(0x0711, 0x0903) }, - { USB_DEVICE(0x0711, 0x0918) }, - { USB_DEVICE(0x0711, 0x0920) }, -+ { USB_DEVICE(0x0711, 0x0950) }, - { USB_DEVICE(0x182d, 0x021c) }, - { USB_DEVICE(0x182d, 0x0269) }, - { } diff --git a/core/linux-mvebu/PKGBUILD b/core/linux-mvebu/PKGBUILD index 5ed58b87e..aa1e34a08 100644 --- a/core/linux-mvebu/PKGBUILD +++ b/core/linux-mvebu/PKGBUILD @@ -5,11 +5,11 @@ buildarch=4 pkgbase=linux-mvebu pkgname=("${pkgbase}" "${pkgbase}-smileplug" "${pkgbase}-mirabox" "${pkgbase}-ax3" "${pkgbase}-headers") -_srcname=linux-3.11-rc3 +_srcname=linux-3.11-rc4 _kernelname=${pkgbase#linux} _desc="Marvell SOCs with Device Tree support" pkgver=3.11.0 -pkgrel=4 +pkgrel=5 arch=('armv7h') url="http://www.kernel.org/" license=('GPL2') @@ -18,8 +18,8 @@ options=('!strip') source=("http://www.kernel.org/pub/linux/kernel/v3.x/testing/${_srcname}.tar.xz" 'config' 'smile.patch') -md5sums=('87e993df0f96a9a83372dcf78ca9bb1b' - '3728a2d0bbf73c8256580ab6bb2e517b' +md5sums=('e1f1ab33167e0bcd48df7d5bceced194' + 'e6a1f9341e07803122e18a181b462b45' '6924012ef66bc46aa809368ea47ef467') prepare() { diff --git a/core/linux-mvebu/config b/core/linux-mvebu/config index c2873e1bf..6976d5020 100644 --- a/core/linux-mvebu/config +++ b/core/linux-mvebu/config @@ -1,13 +1,12 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.11.0-rc3 Kernel Configuration +# Linux/arm 3.11.0-rc4 Kernel Configuration # CONFIG_ARM=y CONFIG_MIGHT_HAVE_PCI=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_HAVE_PROC_CPU=y CONFIG_STACKTRACE_SUPPORT=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_RWSEM_GENERIC_SPINLOCK=y @@ -24,7 +23,6 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y # # General setup # -CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" # CONFIG_COMPILE_TEST is not set @@ -64,6 +62,8 @@ CONFIG_SPARSE_IRQ=y CONFIG_KTIME_SCALAR=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_ARCH_HAS_TICK_BROADCAST=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y # # Timers subsystem @@ -89,6 +89,7 @@ CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_TREE_PREEMPT_RCU=y CONFIG_PREEMPT_RCU=y CONFIG_RCU_STALL_COMMON=y +# CONFIG_RCU_USER_QS is not set CONFIG_RCU_FANOUT=32 CONFIG_RCU_FANOUT_LEAF=16 # CONFIG_RCU_FANOUT_EXACT is not set @@ -187,6 +188,7 @@ CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_DMA_ATTRS=y CONFIG_HAVE_DMA_CONTIGUOUS=y +CONFIG_USE_GENERIC_SMP_HELPERS=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_IDLE_POLL_SETUP=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y @@ -219,6 +221,7 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_MODULE_SIG is not set +CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_LBDAF=y CONFIG_BLK_DEV_BSG=y @@ -262,6 +265,7 @@ CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_UNINLINE_SPIN_UNLOCK=y +CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_FREEZER=y # @@ -391,6 +395,7 @@ CONFIG_SWP_EMULATE=y # CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_DCACHE_DISABLE is not set # CONFIG_CPU_BPREDICT_DISABLE is not set +CONFIG_KUSER_HELPERS=y CONFIG_OUTER_CACHE=y CONFIG_OUTER_CACHE_SYNC=y CONFIG_CACHE_L2X0=y @@ -403,12 +408,16 @@ CONFIG_MULTI_IRQ_HANDLER=y CONFIG_PJ4B_ERRATA_4742=y # CONFIG_ARM_ERRATA_430973 is not set # CONFIG_PL310_ERRATA_588369 is not set +# CONFIG_ARM_ERRATA_643719 is not set # CONFIG_ARM_ERRATA_720789 is not set # CONFIG_PL310_ERRATA_727915 is not set # CONFIG_PL310_ERRATA_753970 is not set # CONFIG_ARM_ERRATA_754322 is not set +# CONFIG_ARM_ERRATA_754327 is not set +# CONFIG_ARM_ERRATA_764369 is not set # CONFIG_PL310_ERRATA_769419 is not set # CONFIG_ARM_ERRATA_775420 is not set +# CONFIG_ARM_ERRATA_798181 is not set # # Bus support @@ -433,13 +442,21 @@ CONFIG_PCI_MVEBU=y # Kernel Features # CONFIG_HAVE_SMP=y -# CONFIG_SMP is not set -# CONFIG_HAVE_ARM_ARCH_TIMER is not set +CONFIG_SMP=y +CONFIG_SMP_ON_UP=y +CONFIG_ARM_CPU_TOPOLOGY=y +# CONFIG_SCHED_MC is not set +# CONFIG_SCHED_SMT is not set +CONFIG_HAVE_ARM_ARCH_TIMER=y +# CONFIG_MCPM is not set CONFIG_VMSPLIT_3G=y # CONFIG_VMSPLIT_2G is not set # CONFIG_VMSPLIT_1G is not set CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_NR_CPUS=4 +CONFIG_HOTPLUG_CPU=y # CONFIG_ARM_PSCI is not set +CONFIG_LOCAL_TIMERS=y CONFIG_ARCH_NR_GPIO=0 # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set @@ -467,9 +484,8 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_ZONE_DMA_FLAG=0 CONFIG_BOUNCE=y # CONFIG_KSM is not set -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 CONFIG_CROSS_MEMORY_ATTACH=y -CONFIG_NEED_PER_CPU_KM=y # CONFIG_CLEANCACHE is not set # CONFIG_FRONTSWAP is not set # CONFIG_ZBUD is not set @@ -521,8 +537,7 @@ CONFIG_BINFMT_ELF=y CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y CONFIG_BINFMT_SCRIPT=y -CONFIG_HAVE_AOUT=y -CONFIG_BINFMT_AOUT=y +# CONFIG_HAVE_AOUT is not set CONFIG_BINFMT_MISC=y CONFIG_COREDUMP=y @@ -532,6 +547,7 @@ CONFIG_COREDUMP=y CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_SMP=y # CONFIG_PM_AUTOSLEEP is not set # CONFIG_PM_WAKELOCKS is not set # CONFIG_PM_RUNTIME is not set @@ -920,10 +936,14 @@ CONFIG_BATMAN_ADV_NC=y # CONFIG_NETLINK_MMAP is not set # CONFIG_NETLINK_DIAG is not set # CONFIG_NET_MPLS_GSO is not set +CONFIG_RPS=y +CONFIG_RFS_ACCEL=y +CONFIG_XPS=y CONFIG_NETPRIO_CGROUP=m -CONFIG_NET_LL_RX_POLL=y +CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y # CONFIG_BPF_JIT is not set +CONFIG_NET_FLOW_LIMIT=y # # Network testing @@ -1798,14 +1818,16 @@ CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2X00_LIB_CRYPTO=y CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set -CONFIG_RTLWIFI=m -CONFIG_RTLWIFI_DEBUG=y +CONFIG_RTL_CARDS=y # CONFIG_RTL8192CE is not set # CONFIG_RTL8192SE is not set # CONFIG_RTL8192DE is not set # CONFIG_RTL8723AE is not set # CONFIG_RTL8188EE is not set CONFIG_RTL8192CU=m +CONFIG_RTLWIFI=m +CONFIG_RTLWIFI_USB=m +CONFIG_RTLWIFI_DEBUG=y CONFIG_RTL8192C_COMMON=m # CONFIG_WL_TI is not set CONFIG_ZD1211RW=m @@ -3184,6 +3206,7 @@ CONFIG_USB_SERIAL_ZTE=m CONFIG_USB_SERIAL_SSU100=m CONFIG_USB_SERIAL_QT2=m CONFIG_USB_SERIAL_FLASHLOADER=m +# CONFIG_USB_SERIAL_SUUNTO is not set # CONFIG_USB_SERIAL_DEBUG is not set # @@ -3485,8 +3508,10 @@ CONFIG_ARMADA_XP_CLK=y # # Hardware Spinlock drivers # +CONFIG_CLKSRC_OF=y CONFIG_CLKSRC_MMIO=y CONFIG_ARMADA_370_XP_TIMER=y +CONFIG_ARM_ARCH_TIMER=y # CONFIG_MAILBOX is not set # CONFIG_IOMMU_SUPPORT is not set @@ -3785,6 +3810,7 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_VM is not set # CONFIG_DEBUG_MEMORY_INIT is not set +# CONFIG_DEBUG_PER_CPU_MAPS is not set # CONFIG_DEBUG_HIGHMEM is not set # CONFIG_DEBUG_SHIRQ is not set @@ -3834,7 +3860,6 @@ CONFIG_RCU_CPU_STALL_VERBOSE=y # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set -# CONFIG_LATENCYTOP is not set CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_DYNAMIC_FTRACE=y @@ -3926,6 +3951,7 @@ CONFIG_CRYPTO_MANAGER2=y CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y # CONFIG_CRYPTO_GF128MUL is not set # CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_PCRYPT is not set CONFIG_CRYPTO_WORKQUEUE=y # CONFIG_CRYPTO_CRYPTD is not set CONFIG_CRYPTO_AUTHENC=y @@ -4070,6 +4096,7 @@ CONFIG_TEXTSEARCH_FSM=m CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y +CONFIG_CPU_RMAP=y CONFIG_DQL=y CONFIG_NLATTR=y CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index ab638a387..5373c3edc 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -7,22 +7,22 @@ # - patch to fix qreal ARMisms pkgbase=calligra -pkgname=('calligra-filters' - 'calligra-libs' - 'calligra-plugins' - 'calligra-tools' +pkgname=('calligra-braindump' + 'calligra-extras' + 'calligra-filters' + 'calligra-flow' + 'calligra-handbook' 'calligra-karbon' 'calligra-kexi' - 'calligra-plan' - 'calligra-stage' 'calligra-krita' + 'calligra-libs' + 'calligra-plan' + 'calligra-plugins' 'calligra-sheets' - 'calligra-words' - 'calligra-handbook' - 'calligra-braindump' - 'calligra-flow') -pkgver=2.6.4 -pkgrel=2 + 'calligra-stage' + 'calligra-words') +pkgver=2.7.1 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') @@ -31,10 +31,10 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen2' 'kdeedu-marble' 'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw' 'openjpeg' 'kdegraphics-okular' 'pstoedit') groups=('calligra') -source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2" +source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz" "arm.patch") -md5sums=('a38fdc882888469ea8b0dea949c05dda' - '51f443435a0cf022bec3db041b4047bb') +md5sums=('9cf909ddf57ecb16d4370cc1062d0f7f' + '03b3eb02a50239abb31067f08ca537c2') prepare() { cd $pkgbase-$pkgver @@ -91,16 +91,8 @@ package_calligra-plugins() { cd "${srcdir}"/build/plugins make DESTDIR="${pkgdir}" install -} -package_calligra-tools() { - pkgdesc="Tools for the Calligra office suite" - depends=('calligra-libs') - conflicts=('koffice-tools') - replaces=('koffice-tools') - install=calligra-tools.install - - cd "${srcdir}"/build/tools + cd "${srcdir}"/build/3rdparty/kdchart make DESTDIR="${pkgdir}" install } @@ -233,3 +225,15 @@ package_calligra-flow() { cd "${srcdir}"/build/flow make DESTDIR="${pkgdir}" install } + +package_calligra-extras() { + pkgdesc="Calligra suite extras" + depends=('calligra-libs') + optdepends=('kdegraphics-okular') + conflicts=('calligra-tools') + replaces=('calligra-tools') + install=calligra-extras.install + + cd "${srcdir}"/build/extras + make DESTDIR="${pkgdir}" install +} diff --git a/extra/calligra/arm.patch b/extra/calligra/arm.patch index 0164f2002..372c192fc 100644 --- a/extra/calligra/arm.patch +++ b/extra/calligra/arm.patch @@ -1,6 +1,18 @@ +diff -urN a/krita/image/tests/kis_filter_weights_buffer_test.cpp b/krita/image/tests/kis_filter_weights_buffer_test.cpp +--- a/krita/image/tests/kis_filter_weights_buffer_test.cpp 2013-07-29 00:27:14.000000000 -0600 ++++ b/krita/image/tests/kis_filter_weights_buffer_test.cpp 2013-08-05 11:57:02.906735729 -0600 +@@ -38,7 +38,7 @@ + KisFixedPoint fp2; + + const int startIndex = 1; +- const int endIndex = 255 * qMin(scale, 1.0); ++ const int endIndex = 255 * qMin((double)scale, 1.0); + + fp1.from256Frac(startIndex); + fp2.from256Frac(endIndex); diff -urN a/krita/ui/kis_image_view_converter.cpp b/krita/ui/kis_image_view_converter.cpp ---- a/krita/ui/kis_image_view_converter.cpp 2013-04-08 03:23:17.000000000 -0500 -+++ b/krita/ui/kis_image_view_converter.cpp 2013-05-21 17:20:34.227367776 -0500 +--- a/krita/ui/kis_image_view_converter.cpp 2013-07-29 00:27:15.000000000 -0600 ++++ b/krita/ui/kis_image_view_converter.cpp 2013-08-05 11:55:36.212128142 -0600 @@ -40,7 +40,7 @@ // remember here; document is postscript points; view is krita pixels. @@ -11,8 +23,8 @@ diff -urN a/krita/ui/kis_image_view_converter.cpp b/krita/ui/kis_image_view_conv Q_ASSERT(zoomX); Q_ASSERT(zoomY); diff -urN a/krita/ui/kis_image_view_converter.h b/krita/ui/kis_image_view_converter.h ---- a/krita/ui/kis_image_view_converter.h 2013-04-08 03:23:17.000000000 -0500 -+++ b/krita/ui/kis_image_view_converter.h 2013-05-21 17:19:52.171064761 -0500 +--- a/krita/ui/kis_image_view_converter.h 2013-07-29 00:27:15.000000000 -0600 ++++ b/krita/ui/kis_image_view_converter.h 2013-08-05 11:55:36.212128142 -0600 @@ -52,7 +52,7 @@ using KoViewConverter::viewToDocument; @@ -23,9 +35,9 @@ diff -urN a/krita/ui/kis_image_view_converter.h b/krita/ui/kis_image_view_conver qreal documentToViewX(qreal documentX) const; qreal documentToViewY(qreal documentY) const; diff -urN a/krita/ui/tests/kis_zoom_and_pan_test.cpp b/krita/ui/tests/kis_zoom_and_pan_test.cpp ---- a/krita/ui/tests/kis_zoom_and_pan_test.cpp 2013-04-08 03:24:15.000000000 -0500 -+++ b/krita/ui/tests/kis_zoom_and_pan_test.cpp 2013-05-21 19:09:55.408078960 -0500 -@@ -220,7 +220,7 @@ +--- a/krita/ui/tests/kis_zoom_and_pan_test.cpp 2013-07-29 00:27:15.000000000 -0600 ++++ b/krita/ui/tests/kis_zoom_and_pan_test.cpp 2013-08-05 11:55:36.212128142 -0600 +@@ -218,7 +218,7 @@ qreal oldPreferredCenterFractionY = 1.0 * oldPreferredCenter.y() / oldDocumentSize.height(); qreal roundingTolerance = diff --git a/extra/calligra/calligra-tools.install b/extra/calligra/calligra-extras.install similarity index 65% rename from extra/calligra/calligra-tools.install rename to extra/calligra/calligra-extras.install index 6c87527e2..b8c7ebf27 100644 --- a/extra/calligra/calligra-tools.install +++ b/extra/calligra/calligra-extras.install @@ -1,5 +1,4 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null update-desktop-database -q } diff --git a/extra/texlive-bin/PKGBUILD b/extra/texlive-bin/PKGBUILD index 8c73996ea..0102d548e 100644 --- a/extra/texlive-bin/PKGBUILD +++ b/extra/texlive-bin/PKGBUILD @@ -9,11 +9,11 @@ pkgname=texlive-bin pkgver=2013.30973 -pkgrel=2 +pkgrel=3 pkgdesc="TeX Live binaries" license=('GPL') arch=('i686' 'x86_64') -depends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler>=0.22.0' +depends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler>=0.24.0' 'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2' 'icu' 'harfbuzz' 'harfbuzz-icu') makedepends=('perl' 'clisp' 'ffcall')