kernel: Drop ld.so placeholder files

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

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 973299ede509581fc8a18d0dae19edf5f4975a66..c82223e5379e104749752b07ff4f10d4e89a9f3d 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = kernel
-version    = 4.12.9
-release    = 1
+version    = 4.20
+release    = 14
 thisapp    = linux-%{version}
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
@@ -33,7 +33,6 @@ build
 
        requires
                asciidoc
-               audit-devel
                bc
                binutils >= 2.25
                binutils-devel
@@ -63,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}
@@ -106,7 +101,7 @@ build
                sed -e "/^COLORIZE_PLUGIN_CFLAGS/d" \
                        -i Makefile
 
-               sed -e "s/^HOSTCFLAGS.*=.*/& -fPIC/g" -i Makefile
+               sed -e "s/\$(HOST_LFS_CFLAGS)/& -fPIC/g" -i Makefile
 
                cp -vf %{kernel_logo} \
                        drivers/video/logo/logo_linux_clut224.ppm
@@ -139,7 +134,6 @@ build
                for kernel in %{kernels}; do
                        configure_kernel ${kernel}
                done
-
        end
 
        build
@@ -166,9 +160,9 @@ build
                        cat .config
 
                        # Run the build.
-                       make ARCH=%{kernel_arch} oldnoconfig >/dev/null
-                       make ARCH=%{kernel_arch} CC="gcc -fno-PIE" %{kernel_target} modules \
-                               %{kernel_build_flags} %{PARALLELISMFLAGS}
+                       make ARCH=%{kernel_arch} olddefconfig >/dev/null
+                       make ARCH=%{kernel_arch} %{kernel_target} modules \
+                               KERNELRELEASE=${fullversion} %{PARALLELISMFLAGS}
 
                        # Compile Flattened Device Tree database
                        case "${DISTRO_ARCH}" in
@@ -198,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.
@@ -329,7 +318,6 @@ 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