mirror of
https://abf.rosa.ru/djam/kernel-5.15.git
synced 2025-02-23 10:32:54 +00:00
Upd to 5.4 series (v5.4.2), rediffed patches, disabled AUFS for now
This commit is contained in:
Mikhail Novosyolov
parent
eb0db6c1dd
commit
f439835bb0
7 changed files with 77 additions and 45 deletions
4
.abf.yml
4
.abf.yml
|
|
@ -1,6 +1,6 @@
|
|||
sources:
|
||||
linux-5.3.tar.xz: 988855d1fee4eb12495a5b3602e2f3471623ec3e
|
||||
patch-5.3.15.xz: fe9a01fb17002a8e826b61a256eaaba772569990
|
||||
linux-5.4.tar.xz: 98ae49ad49397d5a4dcb3ff9a082223edf7c5bbd
|
||||
patch-5.4.2.xz: 0ff6456efe29c524d1de5c345ee73ebcbeb5951a
|
||||
public_rsa_1.pem: 566af3655617863906dbe38e741d2eabf12ab5fd
|
||||
public_rsa_2.pem: 7a12031abe1c60c5126e78c1b26197c076aa0574
|
||||
public_rsa_3.pem: 0b817d48a087945355999c745af58bcefe02bc91
|
||||
|
|
|
|||
|
|
@ -1,3 +1,15 @@
|
|||
From 686598dcff4fd9f91a77b95fb1cf852971283a49 Mon Sep 17 00:00:00 2001
|
||||
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
||||
Date: Wed, 11 Dec 2019 21:17:15 +0300
|
||||
Subject: [PATCH 4/4] (WIP) Sign modules with GOST by LibreSSL
|
||||
|
||||
[ work in progress ]
|
||||
---
|
||||
certs/Makefile | 1 +
|
||||
init/Kconfig | 10 ++++++++++
|
||||
scripts/sign-file.c | 4 +---
|
||||
3 files changed, 12 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/certs/Makefile b/certs/Makefile
|
||||
index f4c25b67aad9..39fb3a53bfe3 100644
|
||||
--- a/certs/Makefile
|
||||
|
|
@ -11,10 +23,10 @@ index f4c25b67aad9..39fb3a53bfe3 100644
|
|||
-batch -x509 -config $(obj)/x509.genkey \
|
||||
-outform PEM -out $(obj)/signing_key.pem \
|
||||
diff --git a/init/Kconfig b/init/Kconfig
|
||||
index bd7d650d4a99..eef670c9571b 100644
|
||||
index b4daad2bac23..0a733a1399e1 100644
|
||||
--- a/init/Kconfig
|
||||
+++ b/init/Kconfig
|
||||
@@ -2070,6 +2070,14 @@ config MODULE_SIG_SHA512
|
||||
@@ -2119,6 +2119,14 @@ config MODULE_SIG_SHA512
|
||||
bool "Sign modules with SHA-512"
|
||||
select CRYPTO_SHA512
|
||||
|
||||
|
|
@ -29,7 +41,7 @@ index bd7d650d4a99..eef670c9571b 100644
|
|||
endchoice
|
||||
|
||||
config MODULE_SIG_HASH
|
||||
@@ -2080,6 +2088,8 @@ config MODULE_SIG_HASH
|
||||
@@ -2129,6 +2137,8 @@ config MODULE_SIG_HASH
|
||||
default "sha256" if MODULE_SIG_SHA256
|
||||
default "sha384" if MODULE_SIG_SHA384
|
||||
default "sha512" if MODULE_SIG_SHA512
|
||||
|
|
@ -53,3 +65,6 @@ index fbd34b8e8f57..010c5f02ff5e 100644
|
|||
#define USE_PKCS7
|
||||
#endif
|
||||
#ifndef USE_PKCS7
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
@ -1,3 +1,8 @@
|
|||
From bd9b98a36fb8afa9d3a3900817b340543215da6d Mon Sep 17 00:00:00 2001
|
||||
From: Evgenii Shatokhin <eugene.shatokhin@rosalab.ru>
|
||||
Date: Wed, 11 Dec 2019 21:10:42 +0300
|
||||
Subject: [PATCH 1/4] audit: make it less verbose
|
||||
|
||||
It seems, if audit itself is not installed and therefore nothing listens
|
||||
to the messages from the kernel's audit subsystem, the latter spams the
|
||||
kernel log with such messages.
|
||||
|
|
@ -6,12 +11,15 @@ Let us make them debug-level and thus invisible by default.
|
|||
|
||||
http://bugs.rosalinux.ru/show_bug.cgi?id=6235
|
||||
http://bugs.rosalinux.ru/show_bug.cgi?id=6459
|
||||
---
|
||||
kernel/audit.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/kernel/audit.c b/kernel/audit.c
|
||||
index ba4481d..1f19177 100644
|
||||
index da8dc0db5bd3..b1d0cebb78dd 100644
|
||||
--- a/kernel/audit.c
|
||||
+++ b/kernel/audit.c
|
||||
@@ -490,7 +490,7 @@ static void kauditd_printk_skb(struct sk_buff *skb)
|
||||
@@ -529,7 +529,7 @@ static void kauditd_printk_skb(struct sk_buff *skb)
|
||||
char *data = nlmsg_data(nlh);
|
||||
|
||||
if (nlh->nlmsg_type != AUDIT_EOE && printk_ratelimit())
|
||||
|
|
@ -20,3 +28,6 @@ index ba4481d..1f19177 100644
|
|||
}
|
||||
|
||||
/**
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,19 @@
|
|||
From 48ce0cd16a2ea82bf0146ca82d883d677e1ab574 Mon Sep 17 00:00:00 2001
|
||||
From: Evgenii Shatokhin <eshatokhin@virtuozzo.com>
|
||||
Date: Wed, 11 Dec 2019 21:15:36 +0300
|
||||
Subject: [PATCH 3/4] disable mrproper prepare scripts configs in devel rpms
|
||||
|
||||
Signed-off-by: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
||||
---
|
||||
Makefile | 23 ++++++-----------------
|
||||
scripts/kconfig/Makefile | 17 -----------------
|
||||
2 files changed, 6 insertions(+), 34 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 2b600604e4b7..c8ac7b9cf35b 100644
|
||||
index e67f2e95b71d..a30833efd9a2 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1120,8 +1120,7 @@ include/config/kernel.release: FORCE
|
||||
@@ -1093,8 +1093,7 @@ include/config/kernel.release: FORCE
|
||||
# Carefully list dependencies so we do not try to build scripts twice
|
||||
# in parallel
|
||||
PHONY += scripts
|
||||
|
|
@ -12,7 +23,7 @@ index 2b600604e4b7..c8ac7b9cf35b 100644
|
|||
|
||||
# Things we need to do before we recursively start building the kernel
|
||||
# or the modules are listed in "prepare".
|
||||
@@ -1154,7 +1153,7 @@ prepare0: archprepare
|
||||
@@ -1112,7 +1111,7 @@ prepare0: archprepare
|
||||
$(Q)$(MAKE) $(build)=.
|
||||
|
||||
# All the preparing..
|
||||
|
|
@ -21,23 +32,25 @@ index 2b600604e4b7..c8ac7b9cf35b 100644
|
|||
|
||||
# Support for using generic headers in asm-generic
|
||||
asm-generic := -f $(srctree)/scripts/Makefile.asm-generic obj
|
||||
@@ -1409,13 +1408,8 @@ CLEAN_DIRS += include/ksym
|
||||
@@ -1363,15 +1362,8 @@ CLEAN_DIRS += include/ksym
|
||||
CLEAN_FILES += modules.builtin.modinfo
|
||||
|
||||
# Directories & files removed with 'make mrproper'
|
||||
-MRPROPER_DIRS += include/config include/generated \
|
||||
- arch/$(SRCARCH)/include/generated .tmp_objdiff
|
||||
- arch/$(SRCARCH)/include/generated .tmp_objdiff \
|
||||
- debian/ snap/ tar-install/
|
||||
-MRPROPER_FILES += .config .config.old .version \
|
||||
- Module.symvers \
|
||||
- signing_key.pem signing_key.priv signing_key.x509 \
|
||||
- x509.genkey extra_certificates signing_key.x509.keyid \
|
||||
- signing_key.x509.signer vmlinux-gdb.py
|
||||
- signing_key.x509.signer vmlinux-gdb.py \
|
||||
- *.spec
|
||||
+MRPROPER_DIRS += ""
|
||||
+MRPROPER_FILES += ""
|
||||
|
||||
# Directories & files removed with 'make distclean'
|
||||
DISTCLEAN_DIRS +=
|
||||
@@ -1441,13 +1435,10 @@ clean: archclean vmlinuxclean
|
||||
@@ -1394,13 +1386,10 @@ clean: archclean vmlinuxclean
|
||||
#
|
||||
mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS))
|
||||
mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
|
||||
|
|
@ -54,7 +67,7 @@ index 2b600604e4b7..c8ac7b9cf35b 100644
|
|||
$(call cmd,rmfiles)
|
||||
|
||||
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
|
||||
index 7656e1137b6b..ebb4d0caacab 100644
|
||||
index ef2f2336c469..0a8eb06085ba 100644
|
||||
--- a/scripts/kconfig/Makefile
|
||||
+++ b/scripts/kconfig/Makefile
|
||||
@@ -24,19 +24,14 @@ endif
|
||||
|
|
@ -114,3 +127,6 @@ index 7656e1137b6b..ebb4d0caacab 100644
|
|||
|
||||
configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/configs/$@)
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
|
|||
15
kernel.spec
15
kernel.spec
|
|
@ -6,12 +6,12 @@
|
|||
%define __strip %(which true)
|
||||
|
||||
%define kernelversion 5
|
||||
%define patchlevel 3
|
||||
%define patchlevel 4
|
||||
# sublevel is used for stable-based kernels
|
||||
%define sublevel 15
|
||||
%define sublevel 2
|
||||
|
||||
# Release number. Increase this before a rebuild.
|
||||
%define rpmrel 2
|
||||
%define rpmrel 1
|
||||
%define fullrpmrel %{rpmrel}
|
||||
|
||||
%define rpmtag %{disttag}
|
||||
|
|
@ -203,13 +203,10 @@ Patch101: perf-xmlto-skip-validation.patch
|
|||
# http://bugs.rosalinux.ru/show_bug.cgi?id=6459
|
||||
Patch102: audit-make-it-less-verbose.patch
|
||||
|
||||
# May help when building with GCC 8+.
|
||||
Patch105: perf-silence-format-warnings-gcc8.patch
|
||||
|
||||
# AUFS from http://aufs.sourceforge.net/
|
||||
Patch109: fs-aufs.patch
|
||||
#Patch109: fs-aufs.patch
|
||||
|
||||
Patch200: modsig-streebog.diff
|
||||
Patch200: WIP-Sign-modules-with-GOST-by-LibreSSL.patch
|
||||
####################################################################
|
||||
|
||||
Autoreqprov: no
|
||||
|
|
@ -1028,7 +1025,7 @@ cp -fR drivers/media/common/btcx-risc.h %{temp_devel_root}/drivers/media/common/
|
|||
cp -fR drivers/acpi/acpica/*.h %{temp_devel_root}/drivers/acpi/acpica/
|
||||
|
||||
# aufs2 has a special file needed
|
||||
cp -fR fs/aufs/magic.mk %{temp_devel_root}/fs/aufs
|
||||
#cp -fR fs/aufs/magic.mk %{temp_devel_root}/fs/aufs
|
||||
|
||||
# SELinux needs security/selinux/include
|
||||
cp -fR security/selinux/include %{temp_devel_root}/security/selinux
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
perf: Silence two kinds of format warnings from GCC 8
|
||||
|
||||
perf may be fixed properly in the newer kernel versions but for now, it is
|
||||
easier to just silence -Werror=format-overflow and -Werror=format-truncation.
|
||||
---
|
||||
|
||||
diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
|
||||
index 3ec1969b6d3e..3d924b43db4f 100644
|
||||
--- a/tools/perf/Makefile.config
|
||||
+++ b/tools/perf/Makefile.config
|
||||
@@ -203,6 +203,7 @@ CFLAGS += -funwind-tables
|
||||
CFLAGS += -Wall
|
||||
CFLAGS += -Wextra
|
||||
CFLAGS += -std=gnu99
|
||||
+CFLAGS += -Wno-format-truncation -Wno-format-overflow
|
||||
|
||||
CXXFLAGS += -std=gnu++11 -fno-exceptions -fno-rtti
|
||||
CXXFLAGS += -Wall
|
||||
--
|
||||
|
|
@ -1,8 +1,17 @@
|
|||
From fca5cb9534cbe7da52c234021aa802542fccceff Mon Sep 17 00:00:00 2001
|
||||
From: Evgenii Shatokhin <eugene.shatokhin@rosalab.ru>
|
||||
Date: Wed, 11 Dec 2019 21:12:06 +0300
|
||||
Subject: [PATCH 2/4] perf: skip xmlto validation
|
||||
|
||||
---
|
||||
tools/perf/Documentation/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tools/perf/Documentation/Makefile b/tools/perf/Documentation/Makefile
|
||||
index 42261a9b280e..e1f6baf693e9 100644
|
||||
index adc5a7e44b98..317dac191d8c 100644
|
||||
--- a/tools/perf/Documentation/Makefile
|
||||
+++ b/tools/perf/Documentation/Makefile
|
||||
@@ -50,7 +50,7 @@ ASCIIDOC=asciidoc
|
||||
@@ -51,7 +51,7 @@ ASCIIDOC=asciidoc
|
||||
ASCIIDOC_EXTRA = --unsafe -f asciidoc.conf
|
||||
ASCIIDOC_HTML = xhtml11
|
||||
MANPAGE_XSL = manpage-normal.xsl
|
||||
|
|
@ -11,3 +20,6 @@ index 42261a9b280e..e1f6baf693e9 100644
|
|||
INSTALL?=install
|
||||
RM ?= rm -f
|
||||
DOC_REF = origin/man
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue