diff options
author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-06-25 11:38:05 -0500 |
---|---|---|
committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-06-25 11:38:05 -0500 |
commit | 34d2a41861ed00853c7cc7ccb52bc6f20771c358 (patch) | |
tree | 754504229aac195dabc0a39bf119211e4dfb707f | |
parent | 8b8f6df8b52c27f5069af0ed88d5f1324684cda8 (diff) | |
parent | 98323a21eb3d0e681aea360e483fb52dfcd9bb82 (diff) | |
download | abslibre-34d2a41861ed00853c7cc7ccb52bc6f20771c358.tar.gz abslibre-34d2a41861ed00853c7cc7ccb52bc6f20771c358.tar.bz2 abslibre-34d2a41861ed00853c7cc7ccb52bc6f20771c358.zip |
Merge branch 'master' of vparabola:~/projects/abslibre
-rw-r--r-- | libre/kernel26-libre-lts/PKGBUILD | 8 | ||||
-rw-r--r-- | libre/kernel26-libre-lts/config | 30 | ||||
-rw-r--r-- | libre/kernel26-libre-lts/config.x86_64 | 30 | ||||
-rw-r--r-- | libre/kernel26-libre-lts/kernel26-libre-lts.install | 4 | ||||
-rw-r--r-- | social/tinc/PKGBUILD | 4 |
5 files changed, 44 insertions, 32 deletions
diff --git a/libre/kernel26-libre-lts/PKGBUILD b/libre/kernel26-libre-lts/PKGBUILD index 63d0d83da..acbdde5ad 100644 --- a/libre/kernel26-libre-lts/PKGBUILD +++ b/libre/kernel26-libre-lts/PKGBUILD @@ -7,7 +7,7 @@ pkgname=('kernel26-libre-lts' 'kernel26-libre-lts-headers') # Build stock -lts k _kernelname=${pkgname#kernel26-libre} _basekernel=2.6.32 _preset=kernel26-lts.preset -pkgver=${_basekernel}.41 +pkgver=${_basekernel}.42 pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') @@ -211,8 +211,8 @@ package_kernel26-libre-lts-headers() { # remove unneeded architectures rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa} } -md5sums=('759ac16149fea3bca10a2d723c03e53a' +md5sums=('4344dc9016b73a4910566e4a45087465' '3298f542840c52a8b8abc1b3795e455b' - 'e9fd751f4e7c4bbce027aa83ea90202d' + '9990806b3bf3cec6f8bd419249903613' '2cbfeb3e2a18d45f82f613e97fc23355' - 'fbfc7a1af3208c7b729055d91e1c149a') + 'a03a56a3cd700f0c9004b17e7391f8ff') diff --git a/libre/kernel26-libre-lts/config b/libre/kernel26-libre-lts/config index fcf978f36..c538b3196 100644 --- a/libre/kernel26-libre-lts/config +++ b/libre/kernel26-libre-lts/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Mon Apr 18 12:31:05 2011 +# Tue Jun 7 06:41:37 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4517,6 +4517,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_NOP_TRACER=y +CONFIG_HAVE_FTRACE_NMI_ENTER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y @@ -4524,7 +4525,9 @@ CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_TRACER_MAX_TRACE=y CONFIG_RING_BUFFER=y +CONFIG_FTRACE_NMI_ENTER=y CONFIG_EVENT_TRACING=y CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_RING_BUFFER_ALLOW_SWAP=y @@ -4532,24 +4535,28 @@ CONFIG_TRACING=y CONFIG_GENERIC_TRACER=y CONFIG_TRACING_SUPPORT=y CONFIG_FTRACE=y -# CONFIG_FUNCTION_TRACER is not set +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_IRQSOFF_TRACER is not set -# CONFIG_SYSPROF_TRACER is not set -# CONFIG_SCHED_TRACER is not set -# CONFIG_FTRACE_SYSCALLS is not set -# CONFIG_BOOT_TRACER is not set +CONFIG_SYSPROF_TRACER=y +CONFIG_SCHED_TRACER=y +CONFIG_FTRACE_SYSCALLS=y +CONFIG_BOOT_TRACER=y CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set -# CONFIG_POWER_TRACER is not set -# CONFIG_STACK_TRACER is not set -# CONFIG_KMEMTRACE is not set -# CONFIG_WORKQUEUE_TRACER is not set +CONFIG_POWER_TRACER=y +CONFIG_STACK_TRACER=y +CONFIG_KMEMTRACE=y +CONFIG_WORKQUEUE_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_FUNCTION_PROFILER=y +CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set -# CONFIG_RING_BUFFER_BENCHMARK is not set +CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set # CONFIG_DYNAMIC_DEBUG is not set @@ -4558,7 +4565,6 @@ CONFIG_MMIOTRACE=y CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y -# CONFIG_KMEMCHECK is not set CONFIG_STRICT_DEVMEM=y CONFIG_X86_VERBOSE_BOOTUP=y CONFIG_EARLY_PRINTK=y diff --git a/libre/kernel26-libre-lts/config.x86_64 b/libre/kernel26-libre-lts/config.x86_64 index 2202caeeb..5f7e05284 100644 --- a/libre/kernel26-libre-lts/config.x86_64 +++ b/libre/kernel26-libre-lts/config.x86_64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Tue May 10 08:27:04 2011 +# Tue Jun 7 08:38:42 2011 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -4328,6 +4328,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_NOP_TRACER=y +CONFIG_HAVE_FTRACE_NMI_ENTER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y @@ -4335,7 +4336,9 @@ CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_TRACER_MAX_TRACE=y CONFIG_RING_BUFFER=y +CONFIG_FTRACE_NMI_ENTER=y CONFIG_EVENT_TRACING=y CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_RING_BUFFER_ALLOW_SWAP=y @@ -4343,24 +4346,28 @@ CONFIG_TRACING=y CONFIG_GENERIC_TRACER=y CONFIG_TRACING_SUPPORT=y CONFIG_FTRACE=y -# CONFIG_FUNCTION_TRACER is not set +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_IRQSOFF_TRACER is not set -# CONFIG_SYSPROF_TRACER is not set -# CONFIG_SCHED_TRACER is not set -# CONFIG_FTRACE_SYSCALLS is not set -# CONFIG_BOOT_TRACER is not set +CONFIG_SYSPROF_TRACER=y +CONFIG_SCHED_TRACER=y +CONFIG_FTRACE_SYSCALLS=y +CONFIG_BOOT_TRACER=y CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set -# CONFIG_POWER_TRACER is not set -# CONFIG_STACK_TRACER is not set -# CONFIG_KMEMTRACE is not set -# CONFIG_WORKQUEUE_TRACER is not set +CONFIG_POWER_TRACER=y +CONFIG_STACK_TRACER=y +CONFIG_KMEMTRACE=y +CONFIG_WORKQUEUE_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_FUNCTION_PROFILER=y +CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set -# CONFIG_RING_BUFFER_BENCHMARK is not set +CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set # CONFIG_DYNAMIC_DEBUG is not set @@ -4369,7 +4376,6 @@ CONFIG_MMIOTRACE=y CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y -# CONFIG_KMEMCHECK is not set CONFIG_STRICT_DEVMEM=y CONFIG_X86_VERBOSE_BOOTUP=y CONFIG_EARLY_PRINTK=y diff --git a/libre/kernel26-libre-lts/kernel26-libre-lts.install b/libre/kernel26-libre-lts/kernel26-libre-lts.install index c3249445a..8bc94634d 100644 --- a/libre/kernel26-libre-lts/kernel26-libre-lts.install +++ b/libre/kernel26-libre-lts/kernel26-libre-lts.install @@ -7,7 +7,7 @@ KERNEL_VERSION=2.6.32-lts post_install () { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - depmod $KERNEL_VERSION + /sbin/depmod $KERNEL_VERSION # generate init ramdisks echo ">>> MKINITCPIO SETUP" echo ">>> ----------------" @@ -84,7 +84,7 @@ post_upgrade() { fi # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - depmod $KERNEL_VERSION + /sbin/depmod $KERNEL_VERSION echo ">>> MKINITCPIO SETUP" echo ">>> ----------------" if [ "`vercmp $2 2.6.18`" -lt 0 ]; then diff --git a/social/tinc/PKGBUILD b/social/tinc/PKGBUILD index c2a7dc51c..1dd9ad328 100644 --- a/social/tinc/PKGBUILD +++ b/social/tinc/PKGBUILD @@ -1,5 +1,5 @@ pkgname=tinc -pkgver=1.0.14 +pkgver=1.0.15 pkgrel=1 pkgdesc="VPN (Virtual Private Network) daemon" arch=(i686 x86_64) @@ -7,7 +7,6 @@ url="http://www.tinc-vpn.org/" license=('GPL') depends=('lzo2' 'zlib' 'openssl') source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz) -md5sums=('967dfafc4aa41a614c1d2739df8a8372') build() { cd "$srcdir/$pkgname-$pkgver" @@ -24,3 +23,4 @@ package() { install -d $pkgdir/etc/tinc tar xzvf doc/sample-config.tar.gz -C $pkgdir/etc/tinc/ } +md5sums=('44bb7d1618955a0a56e9e159f1c46362') |