summaryrefslogtreecommitdiffstats
path: root/kernels
diff options
context:
space:
mode:
authorFlorian Franzmann2021-05-02 15:46:28 +0200
committerFlorian Franzmann2021-05-02 15:46:28 +0200
commitf4fd0897a1bdf3d716ceec5e36628471acd45d83 (patch)
tree3f63f1efa29b77b3b9d9a5c59f2bc9542ab707dc /kernels
parent83295fe5fa95f55198b32a4a2a23d342e4104b58 (diff)
kernels/linux: version 5.12.1
Diffstat (limited to 'kernels')
-rw-r--r--kernels/linux/0001-fix-hard-coded-path-to-awk.patch10
-rw-r--r--kernels/linux/HISTORY8
-rwxr-xr-xkernels/linux/info/kernels/5.114
-rwxr-xr-xkernels/linux/info/kernels/5.124
-rwxr-xr-xkernels/linux/info/patches/maintenance_patches_5/patch-5.11.165
-rwxr-xr-xkernels/linux/info/patches/maintenance_patches_5/patch-5.12.15
-rw-r--r--kernels/linux/latest.defaults4
7 files changed, 19 insertions, 21 deletions
diff --git a/kernels/linux/0001-fix-hard-coded-path-to-awk.patch b/kernels/linux/0001-fix-hard-coded-path-to-awk.patch
index c3c760d682..b17c144676 100644
--- a/kernels/linux/0001-fix-hard-coded-path-to-awk.patch
+++ b/kernels/linux/0001-fix-hard-coded-path-to-awk.patch
@@ -20,16 +20,6 @@ index 7be1b8aa7..b09b6bfb8 100755
#
# Copyright 2010 Ben Dooks <ben-linux@fluff.org>
#
-diff --git a/scripts/ld-version.sh b/scripts/ld-version.sh
-index f2be0ff9a..65a8bb8a7 100755
---- a/scripts/ld-version.sh
-+++ b/scripts/ld-version.sh
-@@ -1,4 +1,4 @@
--#!/usr/bin/awk -f
-+#!/bin/awk -f
- # SPDX-License-Identifier: GPL-2.0
- # extract linker version number from stdin and turn into single number
- {
diff --git a/scripts/ver_linux b/scripts/ver_linux
index 0968a3070..9a7bcccb8 100755
--- a/scripts/ver_linux
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index b1cb9d2a41..3a08d1d445 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,11 @@
+2021-05-02 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * latest.defaults: latest_maintenance_patches_5=patch-5.12.1
+ * info/patches/maintenance_patches_5/patch-5.11.16: removed
+ * info/patches/maintenance_patches_5/patch-5.12.1: added
+ * 0001-fix-hard-coded-path-to-awk.patch: adapt to 5.12
+ * info/kernels/5.12: added
+ * info/kernels/5.11: removed
+
2021-04-23 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* latest.defaults: latest_maintenance_patches_5=patch-5.11.16
* info/patches/maintenance_patches_5/patch-5.11.16: added
diff --git a/kernels/linux/info/kernels/5.11 b/kernels/linux/info/kernels/5.11
deleted file mode 100755
index ffa49e13f6..0000000000
--- a/kernels/linux/info/kernels/5.11
+++ /dev/null
@@ -1,4 +0,0 @@
-version="5.11"
-source="linux-${version}.tar.xz"
-source_url="${KERNEL_URL}/pub/linux/kernel/v5.x/${source}"
-source_hash="sha512:a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330"
diff --git a/kernels/linux/info/kernels/5.12 b/kernels/linux/info/kernels/5.12
new file mode 100755
index 0000000000..f571488431
--- /dev/null
+++ b/kernels/linux/info/kernels/5.12
@@ -0,0 +1,4 @@
+version="5.12"
+source="linux-${version}.tar.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v5.x/${source}"
+source_hash="sha512:be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d"
diff --git a/kernels/linux/info/patches/maintenance_patches_5/patch-5.11.16 b/kernels/linux/info/patches/maintenance_patches_5/patch-5.11.16
deleted file mode 100755
index eb050462b9..0000000000
--- a/kernels/linux/info/patches/maintenance_patches_5/patch-5.11.16
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="5.11"
-patchversion="${appliedkernels}.16"
-source="patch-${patchversion}.xz"
-source_url="${KERNEL_URL}/pub/linux/kernel/v5.x/${source}"
-sha512sum="01afd5bacfa3464ba948b2f8f03a34b0fff9ba47f38ec46509160279862aaebafeb20b0939e19725380ed91e4abf1a88e7393c4c0a1abbd3c2f2fd1e41d6cf78"
diff --git a/kernels/linux/info/patches/maintenance_patches_5/patch-5.12.1 b/kernels/linux/info/patches/maintenance_patches_5/patch-5.12.1
new file mode 100755
index 0000000000..33a6efd6c8
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_5/patch-5.12.1
@@ -0,0 +1,5 @@
+appliedkernels="5.12"
+patchversion="${appliedkernels}.1"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v5.x/${source}"
+sha512sum="82499f14e1d559ed060478109720ac33b14a58be55f1e155f87902ed9df7c723cd05e001034c5f89b9716c396fc154e1176b55e83b22c15b043e8fec63e6814b"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index a4b5ea99d3..440305e07d 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,2 +1,2 @@
-LATEST_5=5.11
-LATEST_maintenance_patches_5=patch-5.11.16
+LATEST_5=5.12
+LATEST_maintenance_patches_5=patch-5.12.1