Merge branch 'master' of abf.io:kernels_stable/kernel-5.3

eshatokhin@: CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE is not used since
mainline commit be6ec88f41ba "selinux: Remove SECURITY_SELINUX_BOOTPARAM_VALUE",
so it is not set here.
This commit is contained in:
Mikhail Novosyolov 2019-11-11 15:27:16 +03:00
commit 95836da65c
2 changed files with 2 additions and 4 deletions

View file

@ -1,3 +1,3 @@
sources:
linux-5.3.tar.xz: 988855d1fee4eb12495a5b3602e2f3471623ec3e
patch-5.3.4.xz: 957d364cad85b7605b9c36de280755063bd5e8fd
patch-5.3.7.xz: 11729edc0ae0cedccc25683f5c697aed2d8c74d0

View file

@ -1,7 +1,7 @@
%define kernelversion 5
%define patchlevel 3
# sublevel is used for stable-based kernels
%define sublevel 4
%define sublevel 7
# Release number. Increase this before a rebuild.
%define rpmrel 2
@ -715,8 +715,6 @@ echo CONFIG_SECURITY_SELINUX_DISABLE=y >> .config
# enable selinux in kernel by default if not disabled explicitly
sed -i '/CONFIG_SECURITY_SELINUX_BOOTPARAM/d' .config
echo CONFIG_SECURITY_SELINUX_BOOTPARAM=y >> .config
sed -i '/CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE/d' .config
echo CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 >> .config
%endif
# Store the config file in the appropriate directory.