kernel: Enable IBT on x86

[ipfire-3.x.git] / kernel / kernel.nm

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index f2516e6a99932474e236f96355cebef1060f4267..642fb22eec09581d81720e7e7c20820bbb033d9a 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -4,13 +4,13 @@
 ###############################################################################
 
 name       = kernel
-version    = 6.0.6
-release    = 0.6
+version    = 6.4.3
+release    = 3
 thisapp    = linux-%{version}
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
 groups     = System/Kernels
-url        = http://www.kernel.org/
+url        = https://www.kernel.org/
 license    = GPLv2
 summary    = The Linux kernel.
 
@@ -29,8 +29,6 @@ source_dl    = https://www.kernel.org/pub/linux/kernel/v6.x/
 sources      = %{thisapp}.tar.xz
 
 build
-       kernel_logo = /usr/share/pixmaps/kernel-logo.ppm
-
        requires
                asciidoc
                bc
@@ -45,21 +43,20 @@ build
                hostname
                libunwind-devel
                ncurses-devel
-               net-tools
                newt-devel
                openssl
+               /usr/bin/openssl
                pciutils-devel
                perl
-               python3
-               python-devel
+               python3-devel
                rsync
                openssl-devel
                slang-devel
                xmlto
                xz
+               zstd
 
                /sbin/depmod
-               %{kernel_logo}
        end
 
        kernel_arch = %{DISTRO_PLATFORM}
@@ -78,10 +75,14 @@ build
                sed -e "/^COLORIZE_PLUGIN_CFLAGS/d" \
                        -i Makefile
 
-               sed -e "s/\$(HOST_LFS_CFLAGS)/& -fPIC/g" -i Makefile
+               # Use our linker flags while building the compiler plugins.
+               sed -i '/^plugin_ldflags\s\+=/ s/$/ %{LDFLAGS}/' \
+                       scripts/gcc-plugins/Makefile
 
-               cp -vf %{kernel_logo} \
-                       drivers/video/logo/logo_linux_clut224.ppm
+               # Remove Python 2 interpreter from a few scripts
+               sed -e "s@^#!.*python@#!%{python3}@" \
+                       -i scripts/show_delta \
+                       -i scripts/tracing/draw_functrace.py
 
                # Get rid of unwanted files resulting from patch fuzz.
                find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null
@@ -135,9 +136,12 @@ build
                        cat .config
 
                        # Run the build.
-                       make ARCH=%{kernel_arch} olddefconfig >/dev/null
+                       make ARCH=%{kernel_arch} HOSTCFLAGS="%{CFLAGS}" \
+                               HOSTLDFLAGS="%{LDFLAGS}" olddefconfig >/dev/null
+
                        make ARCH=%{kernel_arch} %{kernel_target} modules \
-                               KERNELRELEASE=${fullversion} %{PARALLELISMFLAGS}
+                               KERNELRELEASE=${fullversion} HOSTCFLAGS="%{CFLAGS}" \
+                               HOSTLDFLAGS="%{LDFLAGS}" %{PARALLELISMFLAGS}
 
                        # Compile Flattened Device Tree database
                        case "${DISTRO_ARCH}" in
@@ -276,6 +280,10 @@ packages
                end
        end
 
+       package kernel-tools-debuginfo
+               template DEBUGINFO
+       end
+
        package kernel
                summary = The Linux kernel %{fullver}
 
@@ -291,7 +299,10 @@ packages
                        dracut
                        kernel-updater
                        linux-firmware
-                       intel-microcode
+                       wireless-regdb
+
+                       # Install intel-microcode only on x86_64
+                       (intel-microcode if arch(x86_64))
                end
 
                files