diff options
author | Timo Teräs <timo.teras@iki.fi> | 2015-07-03 08:21:56 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-07-08 09:40:03 +0000 |
commit | fd210c1dcd02231a4afb6921430389eb4baf0d94 (patch) | |
tree | 999f89f915e499fb8b5d4d9d43646033fbb1f1c0 | |
parent | 54a04c67e08e794c4b0fcbe25403b87318f5535a (diff) | |
download | alpine_aports-fd210c1dcd02231a4afb6921430389eb4baf0d94.tar.bz2 alpine_aports-fd210c1dcd02231a4afb6921430389eb4baf0d94.tar.xz alpine_aports-fd210c1dcd02231a4afb6921430389eb4baf0d94.zip |
main/linux-vanilla: upgrade to 3.18.17
(cherry picked from commit 7b30ba05f5f1d97f2a9430b7f4dd87002f32ca04)
-rw-r--r-- | main/linux-vanilla/APKBUILD | 26 | ||||
-rw-r--r-- | main/linux-vanilla/kernelconfig.armhf | 3 | ||||
-rw-r--r-- | main/linux-vanilla/kernelconfig.x86 | 3 | ||||
-rw-r--r-- | main/linux-vanilla/kernelconfig.x86_64 | 3 |
4 files changed, 19 insertions, 16 deletions
diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD index cf457ba609..2af9892f56 100644 --- a/main/linux-vanilla/APKBUILD +++ b/main/linux-vanilla/APKBUILD | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | _flavor=vanilla | 3 | _flavor=vanilla |
4 | pkgname=linux-${_flavor} | 4 | pkgname=linux-${_flavor} |
5 | pkgver=3.18.16 | 5 | pkgver=3.18.17 |
6 | case $pkgver in | 6 | case $pkgver in |
7 | *.*.*) _kernver=${pkgver%.*};; | 7 | *.*.*) _kernver=${pkgver%.*};; |
8 | *.*) _kernver=$pkgver;; | 8 | *.*) _kernver=$pkgver;; |
@@ -161,17 +161,17 @@ dev() { | |||
161 | } | 161 | } |
162 | 162 | ||
163 | md5sums="9e854df51ca3fef8bfe566dbd7b89241 linux-3.18.tar.xz | 163 | md5sums="9e854df51ca3fef8bfe566dbd7b89241 linux-3.18.tar.xz |
164 | 60efa66cae174e7689220f940862b2d8 kernelconfig.armhf | 164 | 707d82314ca27d172cbe78e203a5fddd kernelconfig.armhf |
165 | c901b226acb933420d3fc065ced7edc5 kernelconfig.x86 | 165 | 3743aa6a4a71941f009f560cc9eaa3d6 kernelconfig.x86 |
166 | 6a8535780a6bfd4c49273ffb923fff06 kernelconfig.x86_64 | 166 | 311b55b48a9ea39861fa21f442c9c073 kernelconfig.x86_64 |
167 | 96aeccef48037aee98911634664af68e patch-3.18.16.xz" | 167 | ff54e954e26589a2a8a237bfe793ac41 patch-3.18.17.xz" |
168 | sha256sums="becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd linux-3.18.tar.xz | 168 | sha256sums="becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd linux-3.18.tar.xz |
169 | 236a0c28dd9a354bb9aad1686a71e017c61863514669811dc86a71d55c400bc9 kernelconfig.armhf | 169 | a99916736298f752a41a8b241f4176a019899364a6f5f2aee7012b850df08279 kernelconfig.armhf |
170 | c174ae130cd9e21e1d7d32f2bf53e8e847777e4230ba800d9585018bd25f7f9e kernelconfig.x86 | 170 | c50a69418a51d7afb7f6b40131e35f4d69a7cf66bfa57b921491fa56e6877249 kernelconfig.x86 |
171 | 98f05fa2f66bb50a409f445ab620662ee12366e5c06fae71121d8c8610718b7f kernelconfig.x86_64 | 171 | 58f819b7a1ef249c0620cc029f64da28031b34419a851dc3cc151297fc615d01 kernelconfig.x86_64 |
172 | f60602c8de2ae7b1507c538b6af65d5b933727a06f56075898ff64fdcf650313 patch-3.18.16.xz" | 172 | 190b769580a766add68c3e3a8878a725b36fe6877991f3af0cb4a1d6b5eeccf8 patch-3.18.17.xz" |
173 | sha512sums="2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 linux-3.18.tar.xz | 173 | sha512sums="2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 linux-3.18.tar.xz |
174 | 2e8c35d6d7c88a8742dd3ccc62e45584ca634847d21a712325092d607b96ab417377864baa559c4ad1e5041e591e8938d40a41c4ece8a52ac916a97ae57f7347 kernelconfig.armhf | 174 | 3e8763433334c7683e55e97dda5a48411d393f8234d049d6a4886b226838632032b6a1d3e5e811ad11272f0667a628920b6b91b5d1c5ab48d330440df59035e1 kernelconfig.armhf |
175 | 4f5ebd4739e9c84ab3a1633df5180248f937f4a7147cf1b40e30806cb7455305acb9e85dff01f6352bf6d7ee54ccc11e3f5ed59a9114681a8fc06aa0438d8175 kernelconfig.x86 | 175 | 0da7c7e46f0669ef8cb6d5bea0163ceca1a1b6668bb875ca63570903bcd34279a98a762efa8844f190d82a9345795d6d51fba0cfe8d67300a253e5acc64edd0e kernelconfig.x86 |
176 | 060d69eec9ec07a6f468a4545730893509c3893cd3247ac770bfe486f17fe1b6c3d20118aea8dd42ad1506e0500208bf7ca1e4d4108bd8e661cd2ca39d0496f2 kernelconfig.x86_64 | 176 | ac0183c6bfa08dbda938ac3b9fe3b409f6a9f9fad7d4ebe4052a8264c64253a0df1f164e06e9a41c536bba9189423f1cf7a92da68d1064eab88f8549407be903 kernelconfig.x86_64 |
177 | 868de9793e67e741dc69d61339f66c25d08d36a7d67b09d5644e855e05faf239c1e6e01299812a68edc52a39e132d7ec459929cb5d8a0936fe6aa580a72af80c patch-3.18.16.xz" | 177 | 03a78cc7b72150570fd0f24ad44f491dc57913e0675f31b7322af8ccbf41deea05a0b04c7058f9c85352cb03a976b3817d3544d8c690cc67e26ec08672c09afa patch-3.18.17.xz" |
diff --git a/main/linux-vanilla/kernelconfig.armhf b/main/linux-vanilla/kernelconfig.armhf index afb99eaafd..dc6ae86bcd 100644 --- a/main/linux-vanilla/kernelconfig.armhf +++ b/main/linux-vanilla/kernelconfig.armhf | |||
@@ -1,6 +1,6 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated file; DO NOT EDIT. | 2 | # Automatically generated file; DO NOT EDIT. |
3 | # Linux/arm 3.18.11 Kernel Configuration | 3 | # Linux/arm 3.18.17 Kernel Configuration |
4 | # | 4 | # |
5 | CONFIG_ARM=y | 5 | CONFIG_ARM=y |
6 | CONFIG_ARM_HAS_SG_CHAIN=y | 6 | CONFIG_ARM_HAS_SG_CHAIN=y |
@@ -3639,6 +3639,7 @@ CONFIG_HID_LCPOWER=m | |||
3639 | # CONFIG_HID_LENOVO is not set | 3639 | # CONFIG_HID_LENOVO is not set |
3640 | CONFIG_HID_LOGITECH=m | 3640 | CONFIG_HID_LOGITECH=m |
3641 | CONFIG_HID_LOGITECH_DJ=m | 3641 | CONFIG_HID_LOGITECH_DJ=m |
3642 | CONFIG_HID_LOGITECH_HIDPP=m | ||
3642 | CONFIG_LOGITECH_FF=y | 3643 | CONFIG_LOGITECH_FF=y |
3643 | CONFIG_LOGIRUMBLEPAD2_FF=y | 3644 | CONFIG_LOGIRUMBLEPAD2_FF=y |
3644 | CONFIG_LOGIG940_FF=y | 3645 | CONFIG_LOGIG940_FF=y |
diff --git a/main/linux-vanilla/kernelconfig.x86 b/main/linux-vanilla/kernelconfig.x86 index baabb41067..29a676592d 100644 --- a/main/linux-vanilla/kernelconfig.x86 +++ b/main/linux-vanilla/kernelconfig.x86 | |||
@@ -1,6 +1,6 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated file; DO NOT EDIT. | 2 | # Automatically generated file; DO NOT EDIT. |
3 | # Linux/x86 3.18.11 Kernel Configuration | 3 | # Linux/x86 3.18.17 Kernel Configuration |
4 | # | 4 | # |
5 | # CONFIG_64BIT is not set | 5 | # CONFIG_64BIT is not set |
6 | CONFIG_X86_32=y | 6 | CONFIG_X86_32=y |
@@ -4668,6 +4668,7 @@ CONFIG_HID_LCPOWER=m | |||
4668 | CONFIG_HID_LENOVO=m | 4668 | CONFIG_HID_LENOVO=m |
4669 | CONFIG_HID_LOGITECH=m | 4669 | CONFIG_HID_LOGITECH=m |
4670 | CONFIG_HID_LOGITECH_DJ=m | 4670 | CONFIG_HID_LOGITECH_DJ=m |
4671 | CONFIG_HID_LOGITECH_HIDPP=m | ||
4671 | CONFIG_LOGITECH_FF=y | 4672 | CONFIG_LOGITECH_FF=y |
4672 | CONFIG_LOGIRUMBLEPAD2_FF=y | 4673 | CONFIG_LOGIRUMBLEPAD2_FF=y |
4673 | CONFIG_LOGIG940_FF=y | 4674 | CONFIG_LOGIG940_FF=y |
diff --git a/main/linux-vanilla/kernelconfig.x86_64 b/main/linux-vanilla/kernelconfig.x86_64 index 2361bdc345..8c9d47893c 100644 --- a/main/linux-vanilla/kernelconfig.x86_64 +++ b/main/linux-vanilla/kernelconfig.x86_64 | |||
@@ -1,6 +1,6 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated file; DO NOT EDIT. | 2 | # Automatically generated file; DO NOT EDIT. |
3 | # Linux/x86 3.18.11 Kernel Configuration | 3 | # Linux/x86 3.18.17 Kernel Configuration |
4 | # | 4 | # |
5 | CONFIG_64BIT=y | 5 | CONFIG_64BIT=y |
6 | CONFIG_X86_64=y | 6 | CONFIG_X86_64=y |
@@ -4626,6 +4626,7 @@ CONFIG_HID_LCPOWER=m | |||
4626 | CONFIG_HID_LENOVO=m | 4626 | CONFIG_HID_LENOVO=m |
4627 | CONFIG_HID_LOGITECH=m | 4627 | CONFIG_HID_LOGITECH=m |
4628 | CONFIG_HID_LOGITECH_DJ=m | 4628 | CONFIG_HID_LOGITECH_DJ=m |
4629 | CONFIG_HID_LOGITECH_HIDPP=m | ||
4629 | CONFIG_LOGITECH_FF=y | 4630 | CONFIG_LOGITECH_FF=y |
4630 | CONFIG_LOGIRUMBLEPAD2_FF=y | 4631 | CONFIG_LOGIRUMBLEPAD2_FF=y |
4631 | CONFIG_LOGIG940_FF=y | 4632 | CONFIG_LOGIG940_FF=y |