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 9b340f8b3bc9968fc913d67ed370c9db333d5ce9..04e2b245442d6e5b7d0915d9457610d5018dbce1 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = kernel
-version    = 6.2
-release    = 2
+version    = 6.6
+release    = 1
 thisapp    = linux-%{version}
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
@@ -79,6 +79,11 @@ build
                sed -i '/^plugin_ldflags\s\+=/ s/$/ %{LDFLAGS}/' \
                        scripts/gcc-plugins/Makefile
 
+               # 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
 
@@ -131,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
@@ -156,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 \
@@ -285,6 +293,9 @@ packages
 
                provides
                        kernel = %{fullver}
+
+                       # Used to lock the running kernel from being uninstalled
+                       kernel(%{fullver})
                end
 
                requires
@@ -335,6 +346,10 @@ packages
                        kernel-devel = %{thisver}
                end
 
+               requires
+                       kernel = %{thisver}
+               end
+
                filter_requires
                        perl>=[0-9]\:.*
                end