Compare commits

...

6 Commits

2
.gitignore vendored

@ -1 +1 @@
SOURCES/linux-6.1.104.tar.xz SOURCES/linux-stable-6.1.111-lvc4.tar.gz

@ -1 +1 @@
3b6144217da2b96883a68c3f48be05512896701b SOURCES/linux-6.1.104.tar.xz 7c2613fba3edce616696fe878420cba313825bdf SOURCES/linux-stable-6.1.111-lvc4.tar.gz

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/arm64 6.1.104-1.el9.elrepo.aarch64 Kernel Configuration # Linux/arm64 6.1.111-1.el9.elrepo.aarch64 Kernel Configuration
# #
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.4.1 20231218 (Red Hat 11.4.1-3)" CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.4.1 20231218 (Red Hat 11.4.1-3)"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y
@ -387,6 +387,7 @@ CONFIG_ARM64_ERRATUM_1902691=y
CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_2457168=y
CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y
CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_2966298=y
CONFIG_ARM64_ERRATUM_3194386=y
CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_22375=y
CONFIG_CAVIUM_ERRATUM_23144=y CONFIG_CAVIUM_ERRATUM_23144=y
CONFIG_CAVIUM_ERRATUM_23154=y CONFIG_CAVIUM_ERRATUM_23154=y
@ -9288,7 +9289,7 @@ CONFIG_INIT_STACK_NONE=y
# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set # CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set # CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set # CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
# CONFIG_GCC_PLUGIN_STACKLEAK is not set CONFIG_GCC_PLUGIN_STACKLEAK=y
# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86 6.1.104-1.el9.elrepo.x86_64 Kernel Configuration # Linux/x86 6.1.111-1.el9.elrepo.x86_64 Kernel Configuration
# #
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.4.1 20231218 (Red Hat 11.4.1-3)" CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.4.1 20231218 (Red Hat 11.4.1-3)"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y
@ -9375,7 +9375,7 @@ CONFIG_INIT_STACK_NONE=y
# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set # CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set # CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set # CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
# CONFIG_GCC_PLUGIN_STACKLEAK is not set CONFIG_GCC_PLUGIN_STACKLEAK=y
# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y

@ -24,7 +24,8 @@
%global _binary_payload w3T.xzdio %global _binary_payload w3T.xzdio
# Define the version of the Linux Kernel Archive tarball. # Define the version of the Linux Kernel Archive tarball.
%global LKAver 6.1.104 %global LKAver 6.1.111
%global lvc lvc4
# Define the buildid, if required. # Define the buildid, if required.
#global buildid .local #global buildid .local
@ -38,7 +39,7 @@
%endif %endif
# Set pkg_release. # Set pkg_release.
%global pkg_release 1%{?buildid}%{?dist}.inferit %global pkg_release 4%{?buildid}.%{?lvc}%{?dist}.inferit
# Architectures upon which we can sign the kernel # Architectures upon which we can sign the kernel
# for secure boot authentication. # for secure boot authentication.
@ -119,8 +120,6 @@
%ifarch x86_64 || aarch64 %ifarch x86_64 || aarch64
%define with_doc 0 %define with_doc 0
# temporary fix to resolve build error in linux-6.1.103
%define with_bpftool 0
%endif %endif
%ifarch x86_64 %ifarch x86_64
@ -153,7 +152,7 @@
%define kernel_lt_prereq coreutils, systemd >= 203-2, /usr/bin/kernel-install %define kernel_lt_prereq coreutils, systemd >= 203-2, /usr/bin/kernel-install
%define initrd_prereq dracut >= 027 %define initrd_prereq dracut >= 027
Name: kernel-lt Name: kernel
Summary: The Linux kernel. (The core of any Linux kernel based operating system.) Summary: The Linux kernel. (The core of any Linux kernel based operating system.)
License: GPLv2 and Redistributable, no modification permitted. License: GPLv2 and Redistributable, no modification permitted.
URL: https://www.kernel.org/ URL: https://www.kernel.org/
@ -218,7 +217,7 @@ BuildConflicts: rhbuildsys(DiskFree) < 500Mb
### ###
### Sources ### Sources
### ###
Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{LKAver}.tar.xz Source0: https://git.linuxtesting.ru/pub/scm/linux/kernel/git/lvc/linux-stable.git/snapshot/linux-stable-%{LKAver}-%{lvc}.tar.gz
Source2: config-%{version}-x86_64 Source2: config-%{version}-x86_64
Source4: config-%{version}-aarch64 Source4: config-%{version}-aarch64
@ -390,7 +389,6 @@ Provides: kernel-devel-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\
Provides: kernel-devel-uname-r = %{KVERREL}%{?1:+%{1}}\ Provides: kernel-devel-uname-r = %{KVERREL}%{?1:+%{1}}\
Provides: kernel-devel = %{version}-%{release}%{?1:+%{1}}\ Provides: kernel-devel = %{version}-%{release}%{?1:+%{1}}\
Provides: installonlypkg(kernel)\ Provides: installonlypkg(kernel)\
Provides: installonlypkg(kernel-lt)\
AutoReqProv: no\ AutoReqProv: no\
Requires(pre): findutils\ Requires(pre): findutils\
Requires: findutils\ Requires: findutils\
@ -434,7 +432,6 @@ Provides: %{name}%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{version}-%{release
Provides: %{name}%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\ Provides: %{name}%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\
Provides: %{name}%{?1:-%{1}}-modules-extra = %{version}-%{release}%{?1:+%{1}}\ Provides: %{name}%{?1:-%{1}}-modules-extra = %{version}-%{release}%{?1:+%{1}}\
Provides: installonlypkg(kernel-module)\ Provides: installonlypkg(kernel-module)\
Provides: installonlypkg(kernel-lt-module)\
Provides: %{name}%{?1:-%{1}}-modules-extra-uname-r = %{KVERREL}%{?1:+%{1}}\ Provides: %{name}%{?1:-%{1}}-modules-extra-uname-r = %{KVERREL}%{?1:+%{1}}\
Requires: %{name}-uname-r = %{KVERREL}%{?1:+%{1}}\ Requires: %{name}-uname-r = %{KVERREL}%{?1:+%{1}}\
Requires: %{name}%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\ Requires: %{name}%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\
@ -458,7 +455,6 @@ Provides: %{name}%{?1:-%{1}}-modules-%{_target_cpu} = %{version}-%{release}\
Provides: %{name}-modules-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\ Provides: %{name}-modules-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\
Provides: %{name}-modules = %{version}-%{release}%{?1:+%{1}}\ Provides: %{name}-modules = %{version}-%{release}%{?1:+%{1}}\
Provides: installonlypkg(kernel-module)\ Provides: installonlypkg(kernel-module)\
Provides: installonlypkg(kernel-lt-module)\
Provides: %{name}%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\ Provides: %{name}%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\
Requires: %{name}-uname-r = %{KVERREL}%{?1:+%{1}}\ Requires: %{name}-uname-r = %{KVERREL}%{?1:+%{1}}\
%if %{-m:1}%{!-m:0}\ %if %{-m:1}%{!-m:0}\
@ -480,7 +476,6 @@ Summary: %{name} meta-package for the %{1} ${name}.\
Requires: %{name}-%{1}-core-uname-r = %{KVERREL}+%{1}\ Requires: %{name}-%{1}-core-uname-r = %{KVERREL}+%{1}\
Requires: %{name}-%{1}-modules-uname-r = %{KVERREL}+%{1}\ Requires: %{name}-%{1}-modules-uname-r = %{KVERREL}+%{1}\
Provides: installonlypkg(kernel)\ Provides: installonlypkg(kernel)\
Provides: installonlypkg(kernel-lt)\
%description %{1}\ %description %{1}\
The meta-package for the %{1} %{name}.\ The meta-package for the %{1} %{name}.\
%{nil} %{nil}
@ -495,7 +490,6 @@ The meta-package for the %{1} %{name}.\
Summary: %{variant_summary}.\ Summary: %{variant_summary}.\
Provides: %{name}-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?1:+%{1}}\ Provides: %{name}-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?1:+%{1}}\
Provides: installonlypkg(kernel)\ Provides: installonlypkg(kernel)\
Provides: installonlypkg(kernel-lt)\
%if %{-m:1}%{!-m:0}\ %if %{-m:1}%{!-m:0}\
Requires: %{name}-core-uname-r = %{KVERREL}\ Requires: %{name}-core-uname-r = %{KVERREL}\
%endif\ %endif\
@ -539,10 +533,10 @@ exit 1
%endif %endif
%setup -q -n %{name}-%{version} -c %setup -q -n %{name}-%{version} -c
mv linux-%{LKAver} linux-%{KVERREL} mv linux-stable-%{LKAver}-%{lvc} linux-%{KVERREL}
pushd linux-%{KVERREL} > /dev/null pushd linux-%{KVERREL} > /dev/null
%patch0 -p1 %patch -P0 -p1
# Purge the source tree of all unrequired dot-files. # Purge the source tree of all unrequired dot-files.
find . -name '.*' -type f -delete find . -name '.*' -type f -delete
@ -1487,6 +1481,18 @@ fi
%kernel_lt_variant_files %{_use_vdso} %{with_std} %kernel_lt_variant_files %{_use_vdso} %{with_std}
%changelog %changelog
* Wed Oct 9 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 6.1.111-4.lvc4.inferit
- Enable CONFIG_GCC_PLUGIN_STACKLEAK
* Tue Oct 8 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 6.1.111-3.lvc4.inferit
- Build with bpftool
* Tue Oct 8 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 6.1.111-2.lvc4.inferit
- Bump release
* Mon Oct 7 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 6.1.111-1.lvc4.inferit
- Build ISP SAR kernel
* Mon Aug 12 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 6.1.104-1.inferit * Mon Aug 12 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 6.1.104-1.inferit
- Update to 6.1.104 - Update to 6.1.104
Loading…
Cancel
Save