kernel: update to 5.2.1

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

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 160940ab66b1609d6b7b180e971e4a17ab5d7d65..ea458a0f326633d4bcf80e43ddf301f348adc2e8 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = kernel
-version    = 4.17.19
+version    = 5.2.1
 release    = 1
 thisapp    = linux-%{version}
 
@@ -25,7 +25,7 @@ end
 localversion = %{release}.%{DISTRO_DISTTAG}.%{DISTRO_ARCH}
 fullver      = %{version}-%{localversion}
 
-source_dl    = http://www.kernel.org/pub/linux/kernel/v4.x/
+source_dl    = http://www.kernel.org/pub/linux/kernel/v5.x/
 sources      = %{thisapp}.tar.xz
 
 build
@@ -39,7 +39,7 @@ build
                bison
                elfutils-devel
                flex
-               gcc >= 4.9
+               gcc >= 8
                gcc-plugin-devel
                gettext
                hostname
@@ -62,10 +62,6 @@ build
        # A list of kernels to build.
        kernels =
 
-       # Arguments that are passed to the kernel build command
-       #  Clearning any host CFLAGS or LDFLAGS for kernel build
-       kernel_build_flags = CFLAGS= LDFLAGS=
-
        kernel_arch = %{DISTRO_PLATFORM}
        kernel_target = bzImage
        kernel_image = arch/%{kernel_arch}/boot/%{kernel_target}
@@ -138,7 +134,6 @@ build
                for kernel in %{kernels}; do
                        configure_kernel ${kernel}
                done
-
        end
 
        build
@@ -166,8 +161,8 @@ build
 
                        # Run the build.
                        make ARCH=%{kernel_arch} olddefconfig >/dev/null
-                       make ARCH=%{kernel_arch} CC="gcc -fno-PIE" %{kernel_target} modules \
-                               %{kernel_build_flags} %{PARALLELISMFLAGS}
+                       make ARCH=%{kernel_arch} %{kernel_target} modules \
+                               KERNELRELEASE=${fullversion} %{PARALLELISMFLAGS}
 
                        # Compile Flattened Device Tree database
                        case "${DISTRO_ARCH}" in
@@ -197,11 +192,6 @@ build
                        make ARCH=%{kernel_arch} INSTALL_MOD_PATH=%{BUILDROOT}/usr mod-fw= V=1 \
                                KERNELRELEASE=${fullversion} modules_install
 
-                       # Create an empty settings file for dracut
-                       mkdir -p %{BUILDROOT}/etc/ld.so.conf.d
-                       echo "# Placeholder file, no vDSO hwcap entries used in this kernel." \
-                               > %{BUILDROOT}/etc/ld.so.conf.d/kernel-${fullversion}.conf
-
                        # And now the scary looking part.
                        #
                        # Recreate source and build links.
@@ -319,8 +309,9 @@ packages
 
                requires
                        dracut
-                       grubby
+                       kernel-updater
                        linux-firmware
+                       intel-microcode
                end
 
                files
@@ -328,13 +319,11 @@ packages
                        /boot/dtb-%{kernel_release}
                        /boot/vmlinuz-%{kernel_release}
                        /boot/initramfs-%{kernel_release}.img
-                       /etc/ld.so.conf.d/kernel-%{kernel_release}.conf
                        /usr/lib/modules/%{kernel_release}
                end
 
                _posttrans
-                       /sbin/new-kernel-pkg --package %{kernel_name} --mkinitrd --dracut --depmod --update %{kernel_release}
-                       /sbin/new-kernel-pkg --package %{kernel_name} --rpmposttrans %{kernel_release}
+                       kernel-updater install %{kernel_release}
                end
 
                script posttransin
@@ -345,16 +334,8 @@ packages
                        %{_posttrans}
                end
 
-               script postin
-                       /sbin/new-kernel-pkg --package %{kernel_name} --install %{kernel_release}
-               end
-
-               script postup
-                       /sbin/new-kernel-pkg --package %{kernel_name} --install %{kernel_release}
-               end
-
-               script preun
-                       /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{kernel_release}
+               script postun
+                       kernel-updater uninstall %{kernel_release}
                end
        end