From 56be2b35a7d5715efbcf8382739399a5cd8fcc57 Mon Sep 17 00:00:00 2001 From: Sergey Zhemoytel Date: Mon, 26 Dec 2022 22:29:44 +0300 Subject: [PATCH] Version %{kversion} Versionize Versionize --- .abf.yml | 9 +-------- .config.append | 5 +++++ kernel.spec | 19 ++++++++++--------- 3 files changed, 16 insertions(+), 17 deletions(-) create mode 100644 .config.append diff --git a/.abf.yml b/.abf.yml index 9573a35..3250893 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,15 +1,8 @@ sources: linux-5.15.tar.xz: ac61f2459040c09af1d5abd4ed100c3d316b443e + patch-5.15.79.xz: 2444de3d1e19537f117b0c9e2f257261e3887678 public_key_GOST_1.pem: b4fb6bf1cf73824944931a8f0c2cb7bf427e0774 public_key_GOST_2.pem: cba209bd331f29031c5d945949b230a8d7a4dc12 public_key_GOST_3.pem: e5a223dd7c556d4d0cac326f5ed9fc12dd769afb public_key_GOST_4.pem: faa508628621920681f37f8022f5201cb2151a47 public_key_GOST_5.pem: 5e9869ff488d76ddd51075abef4d18b4656e2de4 - public_key_GOST_6.pem: 737b1331d0b4fde999b86888770217aef44978fc - public_key_RSA_7.pem: 5daae59c847c31e786890ad77f66ba3545b26811 - public_key_RSA_8.pem: bd70516e3391f344a5072b3ccf1380af7f8d9eb0 - public_key_RSA_9.pem: 28d20bffc2a3d27993985c69d82626484edca7fd - public_key_RSA_10.pem: ea4752f0a0671a998ba83050acad926a1cbd8c37 - public_key_RSA_11.pem: b71d76f7f322fcd107b3607dfcacb99a0ca20892 - public_key_RSA_12.pem: ce9600ed7fb5c505dc7208a4a2fab4c8ba20df72 - patch-5.15.79.xz: 2444de3d1e19537f117b0c9e2f257261e3887678 diff --git a/.config.append b/.config.append new file mode 100644 index 0000000..db7473d --- /dev/null +++ b/.config.append @@ -0,0 +1,5 @@ +CONFIG_MODULE_SIG_FORCE=n +CONFIG_MODULE_SIG_KEY="certs/signing_key_priv.key" +CONFIG_SYSTEM_TRUSTED_KEYS="certs/public.pem" +CONFIG_INIT_ON_ALLOC_DEFAULT_ON=n +CONFIG_INIT_ON_FREE_DEFAULT_ON=n diff --git a/kernel.spec b/kernel.spec index 61e831c..d6db7d9 100644 --- a/kernel.spec +++ b/kernel.spec @@ -279,7 +279,7 @@ Source2: 0001-disable-mrproper-prepare-scripts-configs-in-devel-rp.patch # TODO: Make a separate package "ksobirator" and BR it # after testing these macros properly Source3: macros.ksobirator -%{load:%{SOURCE3}} +#{load:%{SOURCE3}} # Kernel configuration files. Source111: kernel-x86_64.config @@ -328,7 +328,7 @@ Patch102: 0001-audit-make-it-less-verbose.patch %if %{with aufs} # AUFS 5 from http://aufs.sourceforge.net/ -Patch109: 0001-Apply-AUFS-5.patch +#Patch109: 0001-Apply-AUFS-5.patch %endif # For kmod() generator of RPM Provides @@ -358,7 +358,7 @@ Patch306: 0001-ROSA-ima-allow-to-off-modules-signature-check-dynami.patch # 256 and 512 MB values are too big as a distro default because many systems have 512MB-2GB RAM # TODO: tune 50 and 100 MB to some not random and mathemetically explainable values # https://www.linux.org.ru/news/kernel/16052362?cid=16075323 -Patch307: le9pf.diff +#Patch307: le9pf.diff Patch308: 0001-Revert-kallsyms-unexport-kallsyms_lookup_name-and-ka.patch # Support sound on notebook Aquarius NS685U R11 (https://linux-hardware.org/?probe=339dc3db60) @@ -465,7 +465,8 @@ BuildRequires: ccache BuildRequires: flex BuildRequires: gcc # ./scripts/mkcompile_h -BuildRequires: hostname +#BuildRequires: hostname +BuildRequires: net-tools BuildRequires: kmod-compat BuildRequires: rsync %if %{with compress_modules} @@ -582,7 +583,7 @@ Requires(posttrans): dracut >= 053-0.git5eb736.5 Requires(posttrans): kmod >= 28-3 # Need for rebuild dkms drivers -Requires: (%{name}-devel%{_isa} = %{EVRD} if dkms) +#Requires: (%{name}-devel%{_isa} = %{EVRD} if dkms) # Usually necessary, but sometimes user may want to not install them Recommends: crda @@ -721,14 +722,14 @@ Provides: kernel-%{flavour}-devel = %{kverrel} Provides: installonlypkg(kernel) = %{EVRD}.devel # Have dkms updated/installed before the kernel, scriptlet here checks if dkms exists -OrderWithRequires(post): dkms +#OrderWithRequires(post): dkms # Try to remove the main kernel package after removing this devel package # because there may be dkms-built kernel modules inside directories owned # by the main package, try to get rid of such files before RPM starts to # deal with directories owned in the main package # (note that the devel package does not explicitly require the main package, # there is no need to do so, a kernel module may be built using just the devel part). -OrderWithRequires(postun): %{name} = %{EVRD} +#OrderWithRequires(postun): %{name} = %{EVRD} %ifarch %{ix86} Conflicts: arch(x86_64) @@ -1131,7 +1132,7 @@ This package does nothing, just owns a directory for third-party binary kernel m %prep # Avoid accidental merge %if 0%{?rpm5} -%{error:Package structure is for dnf, not for urpmi!} +#{error:Package structure is for dnf, not for urpmi!} %endif %setup -q -n %{top_dir_name} -c @@ -1732,7 +1733,7 @@ cp -fR drivers/acpi/acpica/*.h %{temp_devel_root}/drivers/acpi/acpica/ %if %{with aufs} # 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 %endif # SELinux needs security/selinux/include