diff options
author | Milan P. Stanić <mps@arvanta.net> | 2020-01-14 22:15:40 +0100 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2020-01-16 13:53:37 +0100 |
commit | 4ba922eec2b83f9b2882690e0a031865863af497 (patch) | |
tree | 1da8fa76cd3268610ebdfcd2dda85f7512bd6534 | |
parent | c47887f293d630d7370f6a5bbea89fcfca8ad8d5 (diff) | |
download | alpine_aports-4ba922eec2b83f9b2882690e0a031865863af497.tar.bz2 alpine_aports-4ba922eec2b83f9b2882690e0a031865863af497.tar.xz alpine_aports-4ba922eec2b83f9b2882690e0a031865863af497.zip |
main/linux-lts: upgrade to 5.4.12
enable CONFIG_HAVE_COPY_THREAD_TLS=y for architectures which got it
(aarch64 and armv7)
(cherry picked from commit 4f0d7adeb3e7ec177864a6adf62a5b27344cdce0)
-rw-r--r-- | main/linux-lts/APKBUILD | 22 | ||||
-rw-r--r-- | main/linux-lts/config-lts.aarch64 | 3 | ||||
-rw-r--r-- | main/linux-lts/config-lts.armv7 | 3 | ||||
-rw-r--r-- | main/linux-lts/config-lts.ppc64le | 2 | ||||
-rw-r--r-- | main/linux-lts/config-lts.s390x | 2 | ||||
-rw-r--r-- | main/linux-lts/config-lts.x86 | 2 | ||||
-rw-r--r-- | main/linux-lts/config-lts.x86_64 | 2 | ||||
-rw-r--r-- | main/linux-lts/config-virt.aarch64 | 3 | ||||
-rw-r--r-- | main/linux-lts/config-virt.x86 | 2 | ||||
-rw-r--r-- | main/linux-lts/config-virt.x86_64 | 2 |
10 files changed, 23 insertions, 20 deletions
diff --git a/main/linux-lts/APKBUILD b/main/linux-lts/APKBUILD index 438f811fcf..2afae109d0 100644 --- a/main/linux-lts/APKBUILD +++ b/main/linux-lts/APKBUILD | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | _flavor=lts | 3 | _flavor=lts |
4 | pkgname=linux-${_flavor} | 4 | pkgname=linux-${_flavor} |
5 | pkgver=5.4.11 | 5 | pkgver=5.4.12 |
6 | case $pkgver in | 6 | case $pkgver in |
7 | *.*.*) _kernver=${pkgver%.*};; | 7 | *.*.*) _kernver=${pkgver%.*};; |
8 | *.*) _kernver=$pkgver;; | 8 | *.*) _kernver=$pkgver;; |
@@ -220,13 +220,13 @@ _dev() { | |||
220 | } | 220 | } |
221 | 221 | ||
222 | sha512sums="9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f linux-5.4.tar.xz | 222 | sha512sums="9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f linux-5.4.tar.xz |
223 | 702842e7e28fc9ecb780b789fc0c865a37b3404489cfd13b9ce8ac7c515a03ec842f31260cb449b46c1ef462de507fb2557267b34e84c5d7ea760bb7685543d4 config-lts.aarch64 | 223 | fd04da56524b14674b463fbbbf2330609589551c7115a18fa499fc48cdc43ad33004faaa7f2d9bee471f3abac47ef8c1cdecea3976125347b10fbef2305de371 config-lts.aarch64 |
224 | 55404d3bb48f6a9431691625a305086bf576cc1012f55cd87efcd906c25b15bc63ff92255fed387f790f4a46a445aa15f5c7d9dc8a0c05c59b33f2caa134850c config-lts.armv7 | 224 | 1d4e969b2fd4c97afc12444ccbd2d496003b656e8c5204a4777650be2bd9794e146124b12304e045e78eaa8b2db0a3ab1930a1ba641ac96e7e85cf4f00c2c641 config-lts.armv7 |
225 | 2972f3fe6d846818919e18d1d0202ea6e263dfa533b741439d1fd00bff24d17103f45f3afb0d4bacf76789bf0508ea8367285774033c35f9845f17f4ce22afbe config-lts.x86 | 225 | b72abac8ba722e0d6bd075f2dcddc06441dca018aed63a564da63421b5f34e14d4ab6f17ee086084482203b540c94e808fac4675d08247ccb8904d8d40e57b24 config-lts.x86 |
226 | 8cb2add61f99545b0c99430621714e05db382eb915d094b0ca8eedcddb4760ed359933df2b08f82d9dbe7aca8224e4510d6017cd6fb8892ecf811245c280cddc config-lts.x86_64 | 226 | 8c57616074c8154f81add71ea15b9ea5fc3b6b8d0954706220209be7efb0c90be15961e52d83ab2328b745b8edcb1e4c32dc54c46e8a1e12d1c52d54921eaef9 config-lts.x86_64 |
227 | 7ad09c7ae2ff1403effd3d1aff1d0de8974f2393864c3406db2e8600e347b92bf9cfbb82df5143f9ed1ecdee57760e67ea88846042dd4e270299e7073c2a550f config-lts.ppc64le | 227 | 6ad827f496e468451c97571fa48c3018cf192859ba5f9b2876d6a4a5d4b5c37deae14173c14bfccd01594ce8523f555f836f4d978ae64bcdfc862dd10a3f4901 config-lts.ppc64le |
228 | 5669bc487679a7e2125708e7d6af4abcc193892669ef1e698810ccffe432015edbb820adf3f124919c76202861201dc48b20f9f300c9ebe426de4b70fc5f0f5f config-lts.s390x | 228 | 0a82f1b084e4cfe117fcd698f3cea3aec33ad4641914469fd12f13923b2fa3200e11b7ae68516f83206476350f1a4a1df6071226a047be0e4c573ac20d82bdef config-lts.s390x |
229 | 22b0775012fdbe52c370c1bf07df894ad9005c54856012f9206eb073c2db13fdd5745cad04556860eb698e653047743fc78248558701decfcfe3c0f00ab6cd1a config-virt.aarch64 | 229 | 68a094ef89b559f17a5b851595994facce76b2e6c2cff3c33467fc91e075121c5a4988ad276806bd7b31b4ce1a7b439c3e0d552be5650fefb66c9bb96adcfc8d config-virt.aarch64 |
230 | 487f21f6be9ed001487b9c5fded67fe85287d6cbce08ed42b280d9298a7038f5f7f7c0db701d652457d8833219b1de37374d1ecc0c313e5875f8c05ddffd5ffd config-virt.x86 | 230 | 6436011bdd5a86c8a75ef4858e5e2ca0822a80de712b16fa32b85c60f3e2d2a5f55d242af7ec5b17f3deee7a9d733f3da8c1f88cf1e0338b17929e3a03951794 config-virt.x86 |
231 | 031d6709c6765bd17bbe1a9432697b0f7b44b889a896c5a2709ae20ab688b2b51172f5a77cdf5708be6c8e05a3d39d31a4d4570312c7283b6b6fbaa99d15b1a8 config-virt.x86_64 | 231 | 5ffc40633772704c4c6cfa3a00485b42470845a210b8205ad2e8094935ddb842d21f42c5415c9a28091e456820f280f1742b5e3b24231e6da8a357bd1f380050 config-virt.x86_64 |
232 | c8da64a992edb27fc4c9faf79f35edacfdc9c00b72a684d00486fab7eecbd5179bc1826be1598751fa5b1f61ff819d8ccfcebc215b3fff98b75cb46156b7e164 patch-5.4.11.xz" | 232 | a5f247f9d8acb855936278679469de199a49366d79ea63b2a987a2bebb4fe5b7eeb698181fe6d561fd3de3c0736e42fd499c881abd6cd5fee996506133e4d143 patch-5.4.12.xz" |
diff --git a/main/linux-lts/config-lts.aarch64 b/main/linux-lts/config-lts.aarch64 index d55ae08e4e..cbb7b29be9 100644 --- a/main/linux-lts/config-lts.aarch64 +++ b/main/linux-lts/config-lts.aarch64 | |||
@@ -1,6 +1,6 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated file; DO NOT EDIT. | 2 | # Automatically generated file; DO NOT EDIT. |
3 | # Linux/arm64 5.4.11 Kernel Configuration | 3 | # Linux/arm64 5.4.12 Kernel Configuration |
4 | # | 4 | # |
5 | 5 | ||
6 | # | 6 | # |
@@ -726,6 +726,7 @@ CONFIG_ARCH_MMAP_RND_BITS=24 | |||
726 | CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y | 726 | CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y |
727 | CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11 | 727 | CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11 |
728 | CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y | 728 | CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y |
729 | CONFIG_HAVE_COPY_THREAD_TLS=y | ||
729 | CONFIG_CLONE_BACKWARDS=y | 730 | CONFIG_CLONE_BACKWARDS=y |
730 | CONFIG_OLD_SIGSUSPEND3=y | 731 | CONFIG_OLD_SIGSUSPEND3=y |
731 | CONFIG_COMPAT_OLD_SIGACTION=y | 732 | CONFIG_COMPAT_OLD_SIGACTION=y |
diff --git a/main/linux-lts/config-lts.armv7 b/main/linux-lts/config-lts.armv7 index 23feb11304..0e2117991f 100644 --- a/main/linux-lts/config-lts.armv7 +++ b/main/linux-lts/config-lts.armv7 | |||
@@ -1,6 +1,6 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated file; DO NOT EDIT. | 2 | # Automatically generated file; DO NOT EDIT. |
3 | # Linux/arm 5.4.11 Kernel Configuration | 3 | # Linux/arm 5.4.12 Kernel Configuration |
4 | # | 4 | # |
5 | 5 | ||
6 | # | 6 | # |
@@ -826,6 +826,7 @@ CONFIG_HAVE_ARCH_MMAP_RND_BITS=y | |||
826 | CONFIG_HAVE_EXIT_THREAD=y | 826 | CONFIG_HAVE_EXIT_THREAD=y |
827 | CONFIG_ARCH_MMAP_RND_BITS=8 | 827 | CONFIG_ARCH_MMAP_RND_BITS=8 |
828 | CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y | 828 | CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y |
829 | CONFIG_HAVE_COPY_THREAD_TLS=y | ||
829 | CONFIG_CLONE_BACKWARDS=y | 830 | CONFIG_CLONE_BACKWARDS=y |
830 | CONFIG_OLD_SIGSUSPEND3=y | 831 | CONFIG_OLD_SIGSUSPEND3=y |
831 | CONFIG_OLD_SIGACTION=y | 832 | CONFIG_OLD_SIGACTION=y |
diff --git a/main/linux-lts/config-lts.ppc64le b/main/linux-lts/config-lts.ppc64le index e121192971..f3502c5fc5 100644 --- a/main/linux-lts/config-lts.ppc64le +++ b/main/linux-lts/config-lts.ppc64le | |||
@@ -1,6 +1,6 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated file; DO NOT EDIT. | 2 | # Automatically generated file; DO NOT EDIT. |
3 | # Linux/powerpc 5.4.11 Kernel Configuration | 3 | # Linux/powerpc 5.4.12 Kernel Configuration |
4 | # | 4 | # |
5 | 5 | ||
6 | # | 6 | # |
diff --git a/main/linux-lts/config-lts.s390x b/main/linux-lts/config-lts.s390x index 6e403787e9..bb5f689091 100644 --- a/main/linux-lts/config-lts.s390x +++ b/main/linux-lts/config-lts.s390x | |||
@@ -1,6 +1,6 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated file; DO NOT EDIT. | 2 | # Automatically generated file; DO NOT EDIT. |
3 | # Linux/s390 5.4.11 Kernel Configuration | 3 | # Linux/s390 5.4.12 Kernel Configuration |
4 | # | 4 | # |
5 | 5 | ||
6 | # | 6 | # |
diff --git a/main/linux-lts/config-lts.x86 b/main/linux-lts/config-lts.x86 index 90cac6139c..acba65227c 100644 --- a/main/linux-lts/config-lts.x86 +++ b/main/linux-lts/config-lts.x86 | |||
@@ -1,6 +1,6 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated file; DO NOT EDIT. | 2 | # Automatically generated file; DO NOT EDIT. |
3 | # Linux/x86 5.4.11 Kernel Configuration | 3 | # Linux/x86 5.4.12 Kernel Configuration |
4 | # | 4 | # |
5 | 5 | ||
6 | # | 6 | # |
diff --git a/main/linux-lts/config-lts.x86_64 b/main/linux-lts/config-lts.x86_64 index 6f1a9aada3..2190f7791f 100644 --- a/main/linux-lts/config-lts.x86_64 +++ b/main/linux-lts/config-lts.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_64 5.4.11 Kernel Configuration | 3 | # Linux/x86_64 5.4.12 Kernel Configuration |
4 | # | 4 | # |
5 | 5 | ||
6 | # | 6 | # |
diff --git a/main/linux-lts/config-virt.aarch64 b/main/linux-lts/config-virt.aarch64 index 6139147a3b..d2b245c04c 100644 --- a/main/linux-lts/config-virt.aarch64 +++ b/main/linux-lts/config-virt.aarch64 | |||
@@ -1,6 +1,6 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated file; DO NOT EDIT. | 2 | # Automatically generated file; DO NOT EDIT. |
3 | # Linux/arm64 5.4.11 Kernel Configuration | 3 | # Linux/arm64 5.4.12 Kernel Configuration |
4 | # | 4 | # |
5 | 5 | ||
6 | # | 6 | # |
@@ -688,6 +688,7 @@ CONFIG_ARCH_HAS_ELF_RANDOMIZE=y | |||
688 | CONFIG_HAVE_ARCH_MMAP_RND_BITS=y | 688 | CONFIG_HAVE_ARCH_MMAP_RND_BITS=y |
689 | CONFIG_ARCH_MMAP_RND_BITS=18 | 689 | CONFIG_ARCH_MMAP_RND_BITS=18 |
690 | CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y | 690 | CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y |
691 | CONFIG_HAVE_COPY_THREAD_TLS=y | ||
691 | CONFIG_CLONE_BACKWARDS=y | 692 | CONFIG_CLONE_BACKWARDS=y |
692 | CONFIG_64BIT_TIME=y | 693 | CONFIG_64BIT_TIME=y |
693 | CONFIG_HAVE_ARCH_VMAP_STACK=y | 694 | CONFIG_HAVE_ARCH_VMAP_STACK=y |
diff --git a/main/linux-lts/config-virt.x86 b/main/linux-lts/config-virt.x86 index d16a1dd734..816e5f89ea 100644 --- a/main/linux-lts/config-virt.x86 +++ b/main/linux-lts/config-virt.x86 | |||
@@ -1,6 +1,6 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated file; DO NOT EDIT. | 2 | # Automatically generated file; DO NOT EDIT. |
3 | # Linux/x86 5.4.11 Kernel Configuration | 3 | # Linux/x86 5.4.12 Kernel Configuration |
4 | # | 4 | # |
5 | 5 | ||
6 | # | 6 | # |
diff --git a/main/linux-lts/config-virt.x86_64 b/main/linux-lts/config-virt.x86_64 index 61d5e8177f..07d258243c 100644 --- a/main/linux-lts/config-virt.x86_64 +++ b/main/linux-lts/config-virt.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_64 5.4.11 Kernel Configuration | 3 | # Linux/x86_64 5.4.12 Kernel Configuration |
4 | # | 4 | # |
5 | 5 | ||
6 | # | 6 | # |