diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2015-04-23 14:48:18 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2015-04-23 14:48:18 +0300 |
| commit | c1965861f826135803a07c9b668d890dee845abc (patch) | |
| tree | 992b48714770ce4606ef26082ca08799da5ba920 | |
| parent | 16e6a80e21e75bf61c4a1a738133a1425848d300 (diff) | |
| download | aports-c1965861f826135803a07c9b668d890dee845abc.tar.bz2 aports-c1965861f826135803a07c9b668d890dee845abc.tar.xz | |
main/linux-rpi: upgrade to 3.18.12, fix config
fixes #4097
| -rw-r--r-- | main/linux-rpi/APKBUILD | 22 | ||||
| -rw-r--r-- | main/linux-rpi/config-rpi.armhf | 2 | ||||
| -rw-r--r-- | main/linux-rpi/config-rpi2.armhf | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/main/linux-rpi/APKBUILD b/main/linux-rpi/APKBUILD index d655f91d94..a5fc81bfe9 100644 --- a/main/linux-rpi/APKBUILD +++ b/main/linux-rpi/APKBUILD @@ -2,12 +2,12 @@ _mainflavor=rpi pkgname=linux-$_mainflavor -pkgver=3.18.11 +pkgver=3.18.12 case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=${pkgver};; esac -pkgrel=4 +pkgrel=0 pkgdesc="Linux kernel with Raspberry Pi patches" url=https://github.com/raspberrypi/linux depends="mkinitfs linux-firmware" @@ -200,23 +200,23 @@ dev() { } md5sums="9e854df51ca3fef8bfe566dbd7b89241 linux-3.18.tar.xz -ac5c93edbc9385793ccc33f4ced85950 patch-3.18.11.xz +84d1fb9f072df226e920f6a0a3e7d10a patch-3.18.12.xz 5b6f84850feedc7d6f84120f693f751d linux-3.18.y-rpi-20150420.patch f901100a661ec62aac12000872d0276c aslr-pie.patch -970d1e16e16c912adf4e284a3a4d254e config-rpi.armhf -028352dfd131435162ffe3724e53cdce config-rpi2.armhf +6a62fbc4673397b2bdec224fa545e3d6 config-rpi.armhf +364f132269304e5effd94473e4012488 config-rpi2.armhf 1f3dda659442fa7e2afc62bffeceb129 markdt" sha256sums="becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd linux-3.18.tar.xz -e4c44f887f507b2470a5c2f1c286a38fec6e84c4d433c929981abab7b83f80d5 patch-3.18.11.xz +53245c0a5b172575867afe88c91fc46468ae06ed7bf4fa6d2150072e27f7209e patch-3.18.12.xz 9ffda4b8cf2f144de565c7b38fd37ab72ec463c82d972f7bc7aea221810c2ef6 linux-3.18.y-rpi-20150420.patch 07e9b089c0d5d57e91256ff6e8fe373519c8bd4ae4cba4eb4a2edad3e2cc9a8e aslr-pie.patch -92ee4726cb855cfe06521edbeec5a849d2b1d35f0b21d9601e9aaccaf830bf72 config-rpi.armhf -ef5115cdbe38d307cb0d3d63a29ecc87303d61be21ec39fb0f35b389bab16ecc config-rpi2.armhf +69c075126c8de0ceb07d1f3669958cd8df02a9963304615059ec455b6bd92253 config-rpi.armhf +36ab7dd794a66e4fc743b6b2d45f94424ba748a62be5b5d8fbe11a0aa158cfbd config-rpi2.armhf 289a7509bc294295b65680c7fff0b2ec07cf359ea8a57cef00267396885f9b54 markdt" sha512sums="2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 linux-3.18.tar.xz -cc4ac5d341ca4e9d71ef1ba45a839b18947e3e7ffdc7f7efe2c211c95483518a1983bc3637edd607e0631f14c1cc9bfb9164926261d2cf5c2bb2eb91206f43b9 patch-3.18.11.xz +285322919b8638d821414bb494709008710ac55c0bc33d477b28013d51e9791a8487e9671cfdaaf0fa937fab119f40180c4577caac95263d1bb0c6e821069908 patch-3.18.12.xz c55434312a1ee155f424a1df9ec049ce92319a4ff84ab42d806748a24131c8a17c522a51fa4d227c1abee804c39ecddb32e552f88a71e04350ca9c67b9ed9f53 linux-3.18.y-rpi-20150420.patch 35055eea7fce660a200cf6f56490a88f1601b4ea95d2364191ad0d890633e8811f2753b5816dad9640384a764b147a4a80b95f39e3bd7a66a15fd5b3ec0c794a aslr-pie.patch -49c099e0c2104ee0017d18a181a2645babea3c798ca3be266974618b495a90edc6fd559098c257f2496cd2de9720223b59c79993c7e6c40066cabac50be124ab config-rpi.armhf -e6e1d25d4347b879040aa7980b6fe435326caf4e944a954bb2f985194340d95dd8102de69d63329a11346305cfda3cdf99b8835519070083d32ed26417ab8ca6 config-rpi2.armhf +ab0209e5ab5a050fd44f2b7b628bac6b94ef9e3ce6f171c147f4b90b67c7dbddc029fd84a35130108b9fb669453190b252818df53dd253bcf29c647ce7c34ef7 config-rpi.armhf +5d489ff5d362b09f263ed52b3081a254d47835738f985bbcf6c09ebdbd06428410d344a493cce1d42693560dba03ed58d473ba856dce679dc8412a403d7645c2 config-rpi2.armhf 89601aa0e4f77fb07fb1d58c6a9394c8683bc7dfc905ca6612d607ef4188637662d295fa3d5640e3e0a4cd08c98c10511a4f3cea41e7568167b12d0a6c813e8b markdt" diff --git a/main/linux-rpi/config-rpi.armhf b/main/linux-rpi/config-rpi.armhf index a39ec1247c..5b131255d6 100644 --- a/main/linux-rpi/config-rpi.armhf +++ b/main/linux-rpi/config-rpi.armhf @@ -3423,7 +3423,7 @@ CONFIG_DMADEVICES=y # CONFIG_DW_DMAC_CORE is not set # CONFIG_DW_DMAC is not set # CONFIG_PL330_DMA is not set -CONFIG_DMA_BCM2708=m +CONFIG_DMA_BCM2708=y # CONFIG_FSL_EDMA is not set # CONFIG_NBPFAXI_DMA is not set CONFIG_DMA_ENGINE=y diff --git a/main/linux-rpi/config-rpi2.armhf b/main/linux-rpi/config-rpi2.armhf index f7f602a6ef..81c7085576 100644 --- a/main/linux-rpi/config-rpi2.armhf +++ b/main/linux-rpi/config-rpi2.armhf @@ -3463,7 +3463,7 @@ CONFIG_DMADEVICES=y # CONFIG_DW_DMAC_CORE is not set # CONFIG_DW_DMAC is not set # CONFIG_PL330_DMA is not set -CONFIG_DMA_BCM2708=m +CONFIG_DMA_BCM2708=y # CONFIG_FSL_EDMA is not set # CONFIG_NBPFAXI_DMA is not set CONFIG_DMA_ENGINE=y |