Skip to content

Commit 9bd6153

Browse files
committed
Kernels (310, 314, 319, 41, 43)
- bump to 3.10.95 - bump to 3.14.59 - bump to 3.19.8.13 - bump to 4.1.16 - bump to 4.3.4 - see also manjaro/packages-core#28
1 parent 035079a commit 9bd6153

11 files changed

+67
-100
lines changed

kernel-modules-i686.sum

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
abd9707ef22c5bcbd71e235b036d250e Kernel: 3.10.95-1-MANJARO
2+
23bd8cfe07df108e0f78e782b04737e3 Kernel: 3.12.52-1-MANJARO
3+
d63f445634be4663909d0d5a95a200b8 Kernel: 3.13.11.32-1-MANJARO
4+
200e08350144937f0eb6195e8a5799fd Kernel: 3.14.59-1-MANJARO
5+
c08b895574aa91c169db9db1e8d0d6ce Kernel: 3.16.7.22-1-MANJARO
6+
9d6a9ab46f74afbb92197706087ed162 Kernel: 3.18.25-1-MANJARO
7+
af40c4f4e9665a6a6826fa2698bfe73e Kernel: 3.19.8.13-1-MANJARO
8+
9858141bc42a2383207359fb1697d0a6 Kernel: 4.1.16-1-MANJARO
9+
20c3342d58e98eb35d4bc244aaee78a1 Kernel: 4.2.8.2-1-MANJARO
10+
d9151c5f6d22c5e6a095ab4378e31fd1 Kernel: 4.3.4-1-MANJARO
11+
1cae883dd00a09f80cd2c18d86bfa961 Kernel: 4.4.0-4-MANJARO

kernel-modules-sum.sh

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#!/bin/bash
2+
# This file should be updated after every kernel build.
3+
#
4+
# If the checksum changes for one of the kernel, all extra
5+
# modules need to be recompiled.
6+
#
7+
# In rare cases extra modules need to been recompliled,
8+
# even if the checksum is same.
9+
#
10+
# Please also test your system with at least one virtualbox
11+
# module installed
12+
13+
arch=$(uname -m)
14+
15+
if [ -e kernel-modules-$arch.sum ]; then
16+
timestamp=$(stat -c %y kernel-modules-$arch.sum | sed s'~ ~-~'g | cut -d. -f1)
17+
mv kernel-modules-$arch.sum kernel-modules-$timestamp-$arch.sum
18+
fi
19+
md5sum /usr/lib/modules/*/build/Module.symvers | sed s'~/usr/lib/modules/~Kernel: ~'g | sed s'~/build/Module.symvers~~'g > kernel-modules-$arch.sum
20+
if [ -e kernel-modules-$timestamp-$arch.sum ]; then
21+
echo "Possible ABI-change detected. Please check:"
22+
echo " "
23+
diff -Npur kernel-modules-$timestamp-$arch.sum kernel-modules-$arch.sum > abi-change-since-$timestamp-$arch.abi
24+
cat abi-change-since-$timestamp-$arch.abi
25+
fi

kernel-modules-x86_64.sum

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
97f7f5b296fb386c6a2301b14be70786 Kernel: 3.10.95-1-MANJARO
2+
65113fda0e6be7a91f3f0344a1ffd374 Kernel: 3.12.52-1-MANJARO
3+
1846108204aaf3b533756cb687d75cd2 Kernel: 3.13.11.32-1-MANJARO
4+
085bdd758d8ad0ffc2f49fbd686cf4db Kernel: 3.14.59-1-MANJARO
5+
2520ffb0d5b6a47a513811618a103452 Kernel: 3.16.7.22-1-MANJARO
6+
48ab37e67b23807c0210b33753aa3a83 Kernel: 3.18.25-1-MANJARO
7+
216e04e73fa632e0ba296095e88be509 Kernel: 3.19.8.13-1-MANJARO
8+
244e4badd927337da5aa354abfa73711 Kernel: 4.1.16-1-MANJARO
9+
0d7e7a693b1e358fd4b22d4c97fe936e Kernel: 4.2.8.2-1-MANJARO
10+
6aeadf3f0f146e2f7502c32e6fe470c1 Kernel: 4.3.4-1-MANJARO
11+
8808c4affbbd22f411f95086caa96900 Kernel: 4.4.0-4-MANJARO

linux310/PKGBUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ _basekernel=3.10
1212
_basever=310
1313
_aufs=20141215 #last version
1414
_bfq=v7r8
15-
pkgver=${_basekernel}.94
15+
pkgver=${_basekernel}.95
1616
pkgrel=1
1717
arch=('i686' 'x86_64')
1818
url="http://www.kernel.org/"
@@ -49,7 +49,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.xz
4949
"0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${_bfq}.patch::http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.10.8+-${_bfq}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${_bfq}-for-3.10.8+.patch")
5050

5151
sha256sums=('df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544'
52-
'8cae358c7c2dd7f14485b4e2f4963ad7e41400884e72a0c30cf8b0e4c9c3d40f'
52+
'ab24f03f4226d1d1e33cdc9b4184fc7342bc5e5c56db65bdc1c30089a2cf6b12'
5353
'1fd1a2835badd1243343021eb2338e11eaa07b718503ad6f247225315f4bfe40'
5454
'581d427a701099f76a535389f1ae175d0d9a1fd34de8d416c36cdedcc136b2cc'
5555
'd1cecc720df66c70f43bdb86e0169d6b756161c870db8d7d39c32c04dc36ed36'

linux314/PKGBUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ _basekernel=3.14
1212
_basever=314
1313
_aufs=20150928 #Last version
1414
_bfq=v7r8
15-
pkgver=${_basekernel}.58
15+
pkgver=${_basekernel}.59
1616
pkgrel=1
1717
arch=('i686' 'x86_64')
1818
url="http://www.kernel.org/"
@@ -46,7 +46,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.xz
4646
'0006-genksyms-fix-typeof-handling.patch')
4747

4848
sha256sums=('61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa'
49-
'e65bbccf03522a609b88c8186eef4cdb41c35bd6f9416b767b67c11718e26d6b'
49+
'd46594d3ddf56dd6b6b47b48cd0952a62f275bd1b54285d20060550bbb41908b'
5050
'19602e12972e1ef635a11a467b1ee00fabc949347e5d5e3454c29027544039e7'
5151
'073c5c5cb58db8745c2cb279a6c52575a1bd00862c8cfb743a8f4bb1f16cb6f9'
5252
'd1cecc720df66c70f43bdb86e0169d6b756161c870db8d7d39c32c04dc36ed36'

linux41/0001-key-fix-keyring-ref-leak-in-join_session_keyring.patch

-75
This file was deleted.

linux41/PKGBUILD

+6-11
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ _basekernel=4.1
1313
_basever=41
1414
_aufs=20160118
1515
_bfq=v7r8
16-
pkgver=${_basekernel}.15
17-
pkgrel=2
16+
pkgver=${_basekernel}.16
17+
pkgrel=1
1818
arch=('i686' 'x86_64')
1919
url="http://www.kernel.org/"
2020
license=('GPL2')
@@ -45,12 +45,11 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/linux-${_basekernel}.tar.x
4545
'0001-ovl-dont-traverse-automount-points.patch::https://github.com/torvalds/linux/commit/a6f15d9a756571babbb2b2cd4fdd1b64a5de232b.patch'
4646
'0002-ovl-allow-distributed-fs-as-lower-layer.patch::https://github.com/torvalds/linux/commit/7c03b5d45b8eebf0111125053d8fe887cc262ba6.patch'
4747
'0003-ovl-fix-open-in-stacked-overlay.patch::https://github.com/torvalds/linux/commit/1c8a47df36d72ace8cf78eb6c228aa0f8027d3c2.patch'
48-
'0001-key-fix-keyring-ref-leak-in-join_session_keyring.patch'
4948
)
5049
sha256sums=('caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f'
51-
'0ffca8557f1aa191da2f2260ad279c9cc858e6308a8af8a76f7ca3d3c0540344'
52-
'e8960e484065c928ff3a271c68407a14f42a920c2723b5047394631afbcf33f9'
53-
'102bb6e03ca706f7bc4fabb0cd1ca82b232821724119be4f18369a461c347dc0'
50+
'53eb9ab07a1b23b350f899f86962a92635faf917ca2ca8554343fa3e58e565fd'
51+
'f3ad2809f5eda0b957d5bc09648260242aa8849ff00ae4eb116ff59cdaf8c5ec'
52+
'c6ecfeaf7edda6e152c1471b441e3d6dfa8be237c9186cc210b8abf906261df5'
5453
'd1cecc720df66c70f43bdb86e0169d6b756161c870db8d7d39c32c04dc36ed36'
5554
'6d058de24e029651eef6e7e0133616eddf710aa51dfbba1652026f57a35e42ad'
5655
'0a86769e46298d26d1bcb79a2bc38bd83da4c0cb080417c7398634600528f41a'
@@ -69,8 +68,7 @@ sha256sums=('caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f'
6968
'44e7e15c95af9676f715569e72688fd64304a70d2854b0f804c156d4961c72c0'
7069
'55431bdbb2b099a92f8a5848e63be1906b87763e24584b1c7f322f5fd1340a96'
7170
'6bb3f7a4119230c61e68a51f4233dc4dcf82af2cf62c753e7d9753b52eec2aa9'
72-
'1d3bfab9203e6e773044a40ad229d524bcd50714aa8b6160a62224071cb2f85b'
73-
'b6ce060a6997861e14d1061d72b96c35476e8967dd26c8020fcff4a5f0fe453d')
71+
'1d3bfab9203e6e773044a40ad229d524bcd50714aa8b6160a62224071cb2f85b')
7472

7573
prepare() {
7674
cd "${srcdir}/linux-${_basekernel}"
@@ -83,9 +81,6 @@ prepare() {
8381
# enable only if you have "gen-stable-queue-patch.sh" executed before
8482
#patch -Np1 -i "${srcdir}/prepatch-${_basekernel}`-date +%Y%m%d`"
8583

86-
# Fix CVE-2016-0728
87-
patch -Np1 -i ../0001-key-fix-keyring-ref-leak-in-join_session_keyring.patch
88-
8984
# Fix https://github.com/manjaro/release-plan/issues/8
9085
# Backports from v4.2 and v4.3
9186
patch -Np1 -i ../0001-ovl-dont-traverse-automount-points.patch

linux43/PKGBUILD

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ pkgname=('linux43' 'linux43-headers')
1111
_kernelname=-MANJARO
1212
_basekernel=4.3
1313
_basever=43
14-
_aufs=20151109
14+
_aufs=20160118
1515
_bfq=v7r8
16-
pkgver=${_basekernel}.3
17-
pkgrel=3
16+
pkgver=${_basekernel}.4
17+
pkgrel=1
1818
arch=('i686' 'x86_64')
1919
url="http://www.kernel.org/"
2020
license=('GPL2')
@@ -45,15 +45,15 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/linux-${_basekernel}.tar.x
4545
'nvidia-304xx-mtrr-unknown-symbol.patch'
4646
)
4747
sha256sums=('4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae'
48-
'95cd81fcbb87953f672150d60950548edc04a88474c42de713b91811557fefa5'
49-
'c33149da38c8826559e470cbb2184df4abdf032fe9d3cf949743aa013f1c2adf'
50-
'08f5dfce7dda68ee98f3a308d4dec238012ea16866ae51ba0ddbe7489c347877'
48+
'1867a17e108ae8d10163b2494c3b3aa23c03d9a47cda7381aea2f97366bed80d'
49+
'1ec64a292bbecd8425d40d7432e399e48f6cc74a333d30dfa09ca7a71f0b4445'
50+
'0a4b5e06e3b4dd724d48420dc9e6740fb949a06db118783906a3642204fa033f'
5151
'd1cecc720df66c70f43bdb86e0169d6b756161c870db8d7d39c32c04dc36ed36'
5252
'6d058de24e029651eef6e7e0133616eddf710aa51dfbba1652026f57a35e42ad'
53-
'7bce95e04a7ff18e389e8e58874064d84cd0eff41cd89beae90319e0ee0e97ca'
53+
'f57cd0483aff18f4701cfb40fc5a28da5c211cacb92e97c5e34768fb629a2d53'
5454
'd342681a53bc6fd2a19fec85de77904305f32ce8298606a88323aca60e7de980'
5555
'0fe3bd21da99ff475c67ec1cd3bf76d53c39e3de36df5849962e1d737ee89500'
56-
'fc3f3e558f3c72537ba0bb4eebc6aa02875cb98f1437abc8ab9646cf5b959aff'
56+
'886ca55204458d4af0e7916bd91278ac186ba371a3657d46af63c5af69a25dfc'
5757
'c3e6ebaab4d523bb31717a6b02e75220759ab8c74ae8d0d4f2fe18fb2374a4db'
5858
'ddea5274b439d76f7ca0d29122f750e512d5f507ddf2f3227e791cb6346fd434'
5959
'feff4cfcc0abb1c8e7c280a7c9d01b2ddbe5a9b3c1c662083944adbbcdbdfeb1'

linux43/aufs4-loopback.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -242,10 +242,10 @@ index 6d9864d..3322557 100644
242242

243243
#endif /* __KERNEL__ */
244244
diff --git a/fs/aufs/super.c b/fs/aufs/super.c
245-
index 1b25343..3b0c6c5 100644
245+
index 98cfd64..a705a0e 100644
246246
--- a/fs/aufs/super.c
247247
+++ b/fs/aufs/super.c
248-
@@ -831,7 +831,10 @@ static const struct super_operations aufs_sop = {
248+
@@ -832,7 +832,10 @@ static const struct super_operations aufs_sop = {
249249
.statfs = aufs_statfs,
250250
.put_super = aufs_put_super,
251251
.sync_fs = aufs_sync_fs,

linux43/aufs4.3-20151109.patch.bz2

-138 KB
Binary file not shown.

linux43/aufs4.3-20160118.patch.bz2

138 KB
Binary file not shown.

0 commit comments

Comments
 (0)