From 3ed5a853132266dab30cd597b80680839decfdea Mon Sep 17 00:00:00 2001 From: moonman Date: Sun, 23 Jun 2013 18:53:42 -0600 Subject: [PATCH 1/4] core/linux-kirkwood to 3.9.7 --- core/linux-kirkwood/PKGBUILD | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/linux-kirkwood/PKGBUILD b/core/linux-kirkwood/PKGBUILD index d1dde1fb2..c5c374bc6 100644 --- a/core/linux-kirkwood/PKGBUILD +++ b/core/linux-kirkwood/PKGBUILD @@ -7,11 +7,11 @@ pkgbase=linux-kirkwood pkgname=('linux-kirkwood' 'linux-headers-kirkwood') #pkgname=linux-test # Build kernel with a different name _kernelname=${pkgname#linux} -_basekernel=3.9.6 +_basekernel=3.9.7 pkgver=${_basekernel} pkgrel=1 cryptover=1.6 -bfqver=v6r1 +bfqver=v6r2 arch=('arm') url="http://www.kernel.org/" license=('GPL2') @@ -31,7 +31,7 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2 "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-3).0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-$(echo $_basekernel |cut -c 1-3).patch" "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-3).0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-$(echo $_basekernel |cut -c 1-3).0.patch") -md5sums=('4a3ffd2e9ade96909db94c598f9e0dc1' +md5sums=('2de8f625249279a071005b57250e9b20' '1cf669d8e55b2a25590f37e8106723f8' 'f5d3635da03cb45904bedd69b47133de' 'd699018dcf0cd8850743daa605c7ab66' @@ -41,9 +41,9 @@ md5sums=('4a3ffd2e9ade96909db94c598f9e0dc1' 'bf6900bb056ba2b213bd9e23693889ad' '30ed1ba9b6c391e371d022fbcf79f7ed' 'eade38998313c25fd7934719cdf8a2ea' - '62dff7101a1381d33faf2e1f101ba684' - '2c719719165dccf5fc52705e59797d26' - '9ed2a747850739647673d019af378e1a') + 'fa01a94252d6495786e3a6f6b092ecc2' + '3d234367fb89e7b25f08f4c836ba11db' + 'b404f87a581474a0b8f5c0bc68074e84') build() { cd "${srcdir}/linux-${_basekernel}" From ac8f935b1ae5188b0d2dcdab51742889329665e2 Mon Sep 17 00:00:00 2001 From: moonman Date: Sun, 23 Jun 2013 18:57:07 -0600 Subject: [PATCH 2/4] core/linux-kirkwood update config file for 3.9.7 --- core/linux-kirkwood/config | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/linux-kirkwood/config b/core/linux-kirkwood/config index d216b197d..2682b7ade 100644 --- a/core/linux-kirkwood/config +++ b/core/linux-kirkwood/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.9.2-1 Kernel Configuration +# Linux/arm 3.9.7-1 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -59,7 +59,6 @@ CONFIG_HARDIRQS_SW_RESEND=y CONFIG_GENERIC_IRQ_CHIP=y CONFIG_IRQ_DOMAIN=y # CONFIG_IRQ_DOMAIN_DEBUG is not set -# CONFIG_ALWAYS_USE_PERSISTENT_CLOCK is not set CONFIG_KTIME_SCALAR=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -1804,7 +1803,7 @@ CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y CONFIG_ATH9K_AHB=y # CONFIG_ATH9K_DEBUGFS is not set -CONFIG_ATH9K_RATE_CONTROL=y +# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_CARL9170=m From c19c24a2ffd9942dbf1a27bf950db0472d196d1c Mon Sep 17 00:00:00 2001 From: moonman Date: Sun, 23 Jun 2013 19:21:29 -0600 Subject: [PATCH 3/4] core/linux-raspberrypi-latest to 3.9.7 --- core/linux-raspberrypi-latest/PKGBUILD | 13 +++++++------ core/linux-raspberrypi-latest/config | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/core/linux-raspberrypi-latest/PKGBUILD b/core/linux-raspberrypi-latest/PKGBUILD index e1462e629..bbd377510 100644 --- a/core/linux-raspberrypi-latest/PKGBUILD +++ b/core/linux-raspberrypi-latest/PKGBUILD @@ -8,9 +8,9 @@ pkgname=('linux-raspberrypi-latest' 'linux-headers-raspberrypi-latest') # pkgname=linux-custom # Build kernel with a different name _kernelname=${pkgname#linux} _basekernel=3.9 -pkgver=${_basekernel}.6 -pkgrel=2 -bfqver=v6r1 +pkgver=${_basekernel}.7 +pkgrel=1 +bfqver=v6r2 arch=('arm armv6h') url="http://www.kernel.org/" license=('GPL2') @@ -32,9 +32,10 @@ md5sums=('6fc8024d0000e07b23a0c458de5aae1a' '9335d1263fd426215db69841a380ea26' 'a00e424e2fbb8c5a5f77ba2c4871bed4' '2f82dbe5752af65ff409d737caf11954' - '62dff7101a1381d33faf2e1f101ba684' - '2c719719165dccf5fc52705e59797d26' - '9ed2a747850739647673d019af378e1a') + 'fa01a94252d6495786e3a6f6b092ecc2' + '3d234367fb89e7b25f08f4c836ba11db' + 'b404f87a581474a0b8f5c0bc68074e84') + build() { git clone --branch=rpi-${_basekernel}.y --depth=1 https://github.com/raspberrypi/linux.git diff --git a/core/linux-raspberrypi-latest/config b/core/linux-raspberrypi-latest/config index 983d5c6b4..4ca39ec10 100644 --- a/core/linux-raspberrypi-latest/config +++ b/core/linux-raspberrypi-latest/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.9.6-1 Kernel Configuration +# Linux/arm 3.9.7-1 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1440,7 +1440,7 @@ CONFIG_ATH9K=m CONFIG_ATH9K_AHB=y # CONFIG_ATH9K_DEBUGFS is not set # CONFIG_ATH9K_DFS_CERTIFIED is not set -CONFIG_ATH9K_RATE_CONTROL=y +# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_CARL9170=m From 3b7e0dc48690c6b730e7f68f078fa3564cb3f506 Mon Sep 17 00:00:00 2001 From: moonman Date: Sun, 23 Jun 2013 19:38:04 -0600 Subject: [PATCH 4/4] aur/monkey to 1.2.2 --- aur/monkey/PKGBUILD | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/aur/monkey/PKGBUILD b/aur/monkey/PKGBUILD index a154d9576..963b53348 100644 --- a/aur/monkey/PKGBUILD +++ b/aur/monkey/PKGBUILD @@ -8,8 +8,8 @@ # -changed default User from nobody to http (for compatibility) pkgname=monkey -pkgver=1.2.1 -pkgrel=2 +pkgver=1.2.2 +pkgrel=1 pkgdesc="A very small and fast open source web server for Linux" arch=('arm') url="http://www.monkey-project.com/" @@ -20,7 +20,7 @@ source=("http://www.monkey-project.com/releases/$(echo $pkgver |cut -c 1-3)/$pkg monkey monkey.service) install=monkey.install -md5sums=('d6f68d28490e5fba7d8170dcc050b456' +md5sums=('0eae7644dd5060b0e9c25874f9f1dccc' '1527d1fbddddcfd69ad328639dcd0eed' 'ae1f2da03aa2a515a3bed0fb16ab7130') @@ -36,9 +36,6 @@ build() { package() { cd $srcdir/$pkgname-$pkgver -# msg2 "Fix typo in Makefile" -# sed -i -e "s/src\/libmonkey.so.1.2/src\/libmonkey.so/" $srcdir/$pkgname-$pkgver/Makefile - make DESTDIR=$pkgdir install msg2 "Changing default pid file location from /var/log to /var/run"