json-c: Update to version 0.17-20230812

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

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index a26b9fc05c9782750ea5b3e9d41964ca4046a876..04e2b245442d6e5b7d0915d9457610d5018dbce1 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -4,13 +4,13 @@
 ###############################################################################
 
 name       = kernel
-version    = 6.0.6
-release    = 0.9
+version    = 6.6
+release    = 1
 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,13 +43,12 @@ 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
@@ -60,7 +57,6 @@ build
                zstd
 
                /sbin/depmod
-               %{kernel_logo}
        end
 
        kernel_arch = %{DISTRO_PLATFORM}
@@ -79,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
@@ -136,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
@@ -161,8 +164,8 @@ build
                        install -m 644 .config %{BUILDROOT}/boot/config-${fullversion}
                        install -m 644 System.map %{BUILDROOT}/boot/System.map-${fullversion}
 
-                       # Create empty initramfs (20M).
-                       dd if=/dev/zero of=%{BUILDROOT}/boot/initramfs-${fullversion}.img bs=1M count=20
+                       # Create empty initramfs (70M).
+                       dd if=/dev/zero of=%{BUILDROOT}/boot/initramfs-${fullversion}.img bs=1M count=70
 
                        # Install modules.
                        make ARCH=%{kernel_arch} INSTALL_MOD_PATH=%{BUILDROOT}/usr mod-fw= V=1 \
@@ -277,6 +280,10 @@ packages
                end
        end
 
+       package kernel-tools-debuginfo
+               template DEBUGINFO
+       end
+
        package kernel
                summary = The Linux kernel %{fullver}
 
@@ -286,13 +293,19 @@ packages
 
                provides
                        kernel = %{fullver}
+
+                       # Used to lock the running kernel from being uninstalled
+                       kernel(%{fullver})
                end
 
                requires
                        dracut
                        kernel-updater
                        linux-firmware
-                       intel-microcode
+                       wireless-regdb
+
+                       # Install intel-microcode only on x86_64
+                       (intel-microcode if arch(x86_64))
                end
 
                files
@@ -333,6 +346,10 @@ packages
                        kernel-devel = %{thisver}
                end
 
+               requires
+                       kernel = %{thisver}
+               end
+
                filter_requires
                        perl>=[0-9]\:.*
                end