diff options
author | twomyn | 2012-03-25 12:45:55 -0700 |
---|---|---|
committer | yar | 2015-07-03 16:58:14 -0700 |
commit | 7f5d598d02b41fb70c5091d296fbe7a86da1e1bd (patch) | |
tree | 4efdadb7b629c8be29f369eafc9f18009ab8cea1 | |
parent | b58a5cf11afa4f42bb5400aba9ca3317704cd878 (diff) | |
download | aur-7f5d598d02b41fb70c5091d296fbe7a86da1e1bd.tar.gz |
Bump 3.3
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | PKGBUILD | 15 | ||||
-rw-r--r-- | config.x86_64 | 83 | ||||
-rw-r--r-- | linux-linode.install | 2 |
4 files changed, 76 insertions, 34 deletions
@@ -1,6 +1,6 @@ pkgbase = linux pkgdesc = The Linux Kernel and modules - pkgver = 3.2.11 + pkgver = 3.3 pkgrel = 1 url = http://www.kernel.org/ install = linux-linode.install @@ -20,15 +20,13 @@ pkgbase = linux replaces = linux options = !strip backup = etc/mkinitcpio.d/linux-linode.preset - source = http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.tar.xz - source = http://www.kernel.org/pub/linux/kernel/v3.x/patch-3.2.11.xz + source = http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.3.tar.xz source = config.x86_64 source = menu.lst source = linux-linode.preset source = change-default-console-loglevel.patch - md5sums = 364066fa18767ec0ae5f4e4abcf9dc51 - md5sums = 39b3efb92f23130c3fd9c3cbdcd9ecb1 - md5sums = d44738cf084b5d58e6fc8b8a78127ad3 + md5sums = 7133f5a2086a7d7ef97abac610c094f5 + md5sums = 17cb4a818ff04d88fc7ec759afc963f5 md5sums = 7fc8bdda8379469552523e9296dc3799 md5sums = ee66f3cd0c5bc0ba0f65499784d19f30 md5sums = 9d3c56a4b999c8bfbd4018089a62f662 @@ -1,23 +1,22 @@ pkgbase=linux pkgname=linux-linode _kernelname=${pkgname#linux} -_basekernel=3.2 -pkgver=${_basekernel}.11 +_basekernel=3.3 +pkgver=${_basekernel} pkgrel=1 arch=(x86_64) url="http://www.kernel.org/" license=(GPL2) makedepends=(xmlto docbook-xsl) options=('!strip') -source=("http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.tar.xz" - "http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz" +source=("http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.3.tar.xz" + #"http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz" 'config.x86_64' 'menu.lst' "${pkgname}.preset" 'change-default-console-loglevel.patch') -md5sums=('364066fa18767ec0ae5f4e4abcf9dc51' - '39b3efb92f23130c3fd9c3cbdcd9ecb1' - 'd44738cf084b5d58e6fc8b8a78127ad3' +md5sums=('7133f5a2086a7d7ef97abac610c094f5' + '17cb4a818ff04d88fc7ec759afc963f5' '7fc8bdda8379469552523e9296dc3799' 'ee66f3cd0c5bc0ba0f65499784d19f30' '9d3c56a4b999c8bfbd4018089a62f662') @@ -31,7 +30,7 @@ install=${pkgname}.install build() { cd "${srcdir}/linux-${_basekernel}" - patch -p1 -i "${srcdir}/patch-${pkgver}" + #patch -p1 -i "${srcdir}/patch-${pkgver}" patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" cp "${srcdir}/config.x86_64" ./.config sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config diff --git a/config.x86_64 b/config.x86_64 index 71823880e616..4e78d2dfde11 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.2.11-1 Kernel Configuration +# Linux/x86_64 3.3.0-1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -18,11 +18,9 @@ CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_MMU=y -CONFIG_ZONE_DMA=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_SG_DMA_LENGTH=y # CONFIG_GENERIC_ISA_DMA is not set -CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y CONFIG_GENERIC_HWEIGHT=y @@ -41,7 +39,6 @@ CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ZONE_DMA32=y -CONFIG_ARCH_POPULATES_NODE_MAP=y CONFIG_AUDIT_ARCH=y CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y @@ -86,6 +83,7 @@ CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y CONFIG_AUDIT_WATCH=y CONFIG_AUDIT_TREE=y +# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set CONFIG_HAVE_GENERIC_HARDIRQS=y # @@ -124,6 +122,7 @@ CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y # CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set +# CONFIG_CGROUP_MEM_RES_CTLR_KMEM is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -131,6 +130,7 @@ CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_CGROUP=y # CONFIG_DEBUG_BLK_CGROUP is not set +# CONFIG_CHECKPOINT_RESTORE is not set CONFIG_NAMESPACES=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y @@ -187,6 +187,7 @@ CONFIG_SLUB=y # CONFIG_SLOB is not set # CONFIG_PROFILING is not set CONFIG_HAVE_OPROFILE=y +CONFIG_OPROFILE_NMI_TIMER=y # CONFIG_KPROBES is not set CONFIG_JUMP_LABEL=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y @@ -205,6 +206,9 @@ CONFIG_HAVE_USER_RETURN_NOTIFIER=y CONFIG_HAVE_PERF_EVENTS_NMI=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y +CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y +CONFIG_HAVE_CMPXCHG_LOCAL=y +CONFIG_HAVE_CMPXCHG_DOUBLE=y # # GCOV-based kernel profiling @@ -225,6 +229,12 @@ CONFIG_BLK_DEV_BSG=y # CONFIG_BLK_DEV_BSGLIB is not set # CONFIG_BLK_DEV_INTEGRITY is not set # CONFIG_BLK_DEV_THROTTLING is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y CONFIG_BLOCK_COMPAT=y # @@ -271,6 +281,7 @@ CONFIG_FREEZER=y # # Processor type and features # +CONFIG_ZONE_DMA=y CONFIG_TICK_ONESHOT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y @@ -284,7 +295,7 @@ CONFIG_PARAVIRT_GUEST=y # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set CONFIG_XEN=y # CONFIG_XEN_PRIVILEGED_GUEST is not set -CONFIG_XEN_MAX_DOMAIN_MEMORY=128 +CONFIG_XEN_MAX_DOMAIN_MEMORY=500 CONFIG_XEN_SAVE_RESTORE=y CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y @@ -301,8 +312,6 @@ CONFIG_MCORE2=y # CONFIG_GENERIC_CPU is not set CONFIG_X86_INTERNODE_CACHE_SHIFT=6 CONFIG_X86_CMPXCHG=y -CONFIG_CMPXCHG_LOCAL=y -CONFIG_CMPXCHG_DOUBLE=y CONFIG_X86_L1_CACHE_SHIFT=6 CONFIG_X86_XADD=y CONFIG_X86_WP_WORKS_OK=y @@ -360,6 +369,8 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y CONFIG_SPARSEMEM_VMEMMAP=y CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MEMBLOCK_NODE_MAP=y +CONFIG_ARCH_DISCARD_MEMBLOCK=y # CONFIG_MEMORY_HOTPLUG is not set CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 @@ -432,6 +443,7 @@ CONFIG_PM=y # CONFIG_BINFMT_ELF=y CONFIG_COMPAT_BINFMT_ELF=y +CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set # CONFIG_HAVE_AOUT is not set CONFIG_BINFMT_MISC=y @@ -449,6 +461,7 @@ CONFIG_NET=y # CONFIG_PACKET=y CONFIG_UNIX=y +CONFIG_UNIX_DIAG=m CONFIG_XFRM=y CONFIG_XFRM_USER=y # CONFIG_XFRM_SUB_POLICY is not set @@ -487,6 +500,7 @@ CONFIG_INET_XFRM_MODE_BEET=y CONFIG_INET_LRO=y CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y +CONFIG_INET_UDP_DIAG=m # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" @@ -523,11 +537,13 @@ CONFIG_NETFILTER_ADVANCED=y # Core Netfilter Configuration # CONFIG_NETFILTER_NETLINK=y +CONFIG_NETFILTER_NETLINK_ACCT=m CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NF_CONNTRACK=y CONFIG_NF_CONNTRACK_MARK=y CONFIG_NF_CONNTRACK_ZONES=y +CONFIG_NF_CONNTRACK_PROCFS=y CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CONNTRACK_TIMESTAMP=y # CONFIG_NF_CT_PROTO_DCCP is not set @@ -590,6 +606,7 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y # CONFIG_NETFILTER_XT_MATCH_DCCP is not set # CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set # CONFIG_NETFILTER_XT_MATCH_DSCP is not set +CONFIG_NETFILTER_XT_MATCH_ECN=y # CONFIG_NETFILTER_XT_MATCH_ESP is not set CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y CONFIG_NETFILTER_XT_MATCH_HELPER=y @@ -600,6 +617,7 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=y CONFIG_NETFILTER_XT_MATCH_MAC=y CONFIG_NETFILTER_XT_MATCH_MARK=y CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y +CONFIG_NETFILTER_XT_MATCH_NFACCT=m CONFIG_NETFILTER_XT_MATCH_OSF=y CONFIG_NETFILTER_XT_MATCH_OWNER=y CONFIG_NETFILTER_XT_MATCH_POLICY=y @@ -641,6 +659,7 @@ CONFIG_IP_NF_QUEUE=m CONFIG_IP_NF_IPTABLES=y CONFIG_IP_NF_MATCH_AH=y CONFIG_IP_NF_MATCH_ECN=y +CONFIG_IP_NF_MATCH_RPFILTER=m CONFIG_IP_NF_MATCH_TTL=y CONFIG_IP_NF_FILTER=y CONFIG_IP_NF_TARGET_REJECT=y @@ -683,6 +702,7 @@ CONFIG_IP6_NF_IPTABLES=y # CONFIG_IP6_NF_MATCH_HL is not set # CONFIG_IP6_NF_MATCH_IPV6HEADER is not set # CONFIG_IP6_NF_MATCH_MH is not set +CONFIG_IP6_NF_MATCH_RPFILTER=m # CONFIG_IP6_NF_MATCH_RT is not set # CONFIG_IP6_NF_TARGET_HL is not set CONFIG_IP6_NF_TARGET_LOG=y @@ -720,9 +740,12 @@ CONFIG_LLC2=m # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y # CONFIG_BATMAN_ADV is not set +# CONFIG_OPENVSWITCH is not set CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y +# CONFIG_NETPRIO_CGROUP is not set +CONFIG_BQL=y CONFIG_HAVE_BPF_JIT=y # CONFIG_BPF_JIT is not set @@ -764,6 +787,8 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set CONFIG_SYS_HYPERVISOR=y +# CONFIG_GENERIC_CPU_DEVICES is not set +# CONFIG_DMA_SHARED_BUFFER is not set CONFIG_CONNECTOR=m # CONFIG_MTD is not set # CONFIG_PARPORT is not set @@ -783,8 +808,27 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 CONFIG_XEN_BLKDEV_FRONTEND=y # CONFIG_BLK_DEV_HD is not set # CONFIG_BLK_DEV_RBD is not set + +# +# Misc devices +# # CONFIG_SENSORS_LIS3LV02D is not set -# CONFIG_MISC_DEVICES is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_VMWARE_BALLOON is not set +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +# CONFIG_EEPROM_93CX6 is not set + +# +# Texas Instruments shared transport line discipline +# + +# +# Altera FPGA firmware download module +# CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -830,6 +874,7 @@ CONFIG_BONDING=m CONFIG_DUMMY=y # CONFIG_EQUALIZER is not set # CONFIG_MII is not set +# CONFIG_NET_TEAM is not set # CONFIG_MACVLAN is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set @@ -992,11 +1037,6 @@ CONFIG_BCMA_POSSIBLE=y # CONFIG_BACKLIGHT_LCD_SUPPORT is not set # -# Display device support -# -# CONFIG_DISPLAY_SUPPORT is not set - -# # Console display driver support # # CONFIG_VGA_CONSOLE is not set @@ -1021,6 +1061,10 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_VIRTIO_MMIO is not set # +# Microsoft Hyper-V guest support +# + +# # Xen driver support # CONFIG_XEN_BALLOON=y @@ -1032,6 +1076,7 @@ CONFIG_XEN_SYS_HYPERVISOR=y CONFIG_XEN_XENBUS_FRONTEND=y CONFIG_XEN_GNTDEV=m CONFIG_XEN_GRANT_DEV_ALLOC=m +CONFIG_XEN_PRIVCMD=y # CONFIG_STAGING is not set # CONFIG_X86_PLATFORM_DEVICES is not set @@ -1083,6 +1128,7 @@ CONFIG_FS_MBCACHE=y # CONFIG_OCFS2_FS is not set CONFIG_BTRFS_FS=y CONFIG_BTRFS_FS_POSIX_ACL=y +# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set # CONFIG_NILFS2_FS is not set CONFIG_FS_POSIX_ACL=y CONFIG_FILE_LOCKING=y @@ -1173,12 +1219,6 @@ CONFIG_CEPH_FS=m # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set - -# -# Partition Types -# -# CONFIG_PARTITION_ADVANCED is not set -CONFIG_MSDOS_PARTITION=y # CONFIG_NLS is not set CONFIG_DLM=m # CONFIG_DLM_DEBUG is not set @@ -1290,6 +1330,7 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0 # CONFIG_CPA_DEBUG is not set CONFIG_OPTIMIZE_INLINING=y # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set +# CONFIG_DEBUG_NMI_SELFTEST is not set # # Security options @@ -1414,6 +1455,7 @@ CONFIG_CRYPTO_SALSA20=y CONFIG_CRYPTO_SALSA20_X86_64=y CONFIG_CRYPTO_SEED=y CONFIG_CRYPTO_SERPENT=y +CONFIG_CRYPTO_SERPENT_SSE2_X86_64=y CONFIG_CRYPTO_TEA=y CONFIG_CRYPTO_TWOFISH=y CONFIG_CRYPTO_TWOFISH_COMMON=y @@ -1445,6 +1487,8 @@ CONFIG_HAVE_KVM=y CONFIG_RAID6_PQ=y CONFIG_BITREVERSE=y CONFIG_GENERIC_FIND_FIRST_BIT=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_IOMAP=y CONFIG_CRC_CCITT=m CONFIG_CRC16=y # CONFIG_CRC_T10DIF is not set @@ -1479,6 +1523,7 @@ CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_CPU_RMAP=y +CONFIG_DQL=y CONFIG_NLATTR=y CONFIG_AVERAGE=y CONFIG_CORDIC=y diff --git a/linux-linode.install b/linux-linode.install index 1ee9dbbd50f1..3c7b803607b6 100644 --- a/linux-linode.install +++ b/linux-linode.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-linode -KERNEL_VERSION=3.2.11-1-linode +KERNEL_VERSION=3.3.0-1-linode post_install () { echo ">>> Updating module dependencies. Please wait ..." |