kernel: Disable support for 6RD

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

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 2ac3fa2d5a70f7abbc1e941d3f33ba40ef1df0f9..9f2ab359fe80a02411e58fdd0c02c53e89819112 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = kernel
-version    = 4.5.7
-release    = 1
+version    = 4.20
+release    = 6
 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}
@@ -99,10 +94,6 @@ build
                kernels += default
        end
 
-       perf_make = make %{MAKETUNING} -C tools/perf V=1 WERROR=0 \
-               NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_LIBNUMA=1 \
-               NO_STRLCPY=1 NO_BIONIC=1 prefix=%{prefix} perfexecdir=lib/perf-core
-
        prepare_cmds
                # Disable the colorize plugin.
                # It's generally very nice but it clutters our
@@ -110,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
@@ -143,10 +134,6 @@ build
                for kernel in %{kernels}; do
                        configure_kernel ${kernel}
                done
-
-               # Tools
-               # Prevent perf from installing any files in /usr/libexec
-               sed -i %{DIR_APP}/tools/perf/config/Makefile -e "s/libexec/lib/g"
        end
 
        build
@@ -173,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 \
+                               %{PARALLELISMFLAGS}
 
                        # Compile Flattened Device Tree database
                        case "${DISTRO_ARCH}" in
@@ -258,34 +245,19 @@ build
                                -exec chmod 644 {} \;
 
                        find %{BUILDROOT}/usr/src/kernels -name ".*.cmd" -exec rm -f {} \;
+
+                       # remove device tree compiler because there are dead links
+                       rm -rf %{BUILDROOT}/usr/src/kernels/*/scripts/dtc
                }
 
                for kernel in %{kernels}; do
                        build_kernel ${kernel}
                done
 
-               # Build tools.
-               # perf
-               %{perf_make} DESTDIR=%{BUILDROOT} all
-
                # cpupower
                chmod +x tools/power/cpupower/utils/version-gen.sh
                make -C tools/power/cpupower CPUFREQ_BENCH=false %{PARALLELISMFLAGS}
 
-               if [ "%{DISTRO_ARCH}" = "x86_64" ]; then
-                       pushd tools/power/cpupower/debug/x86_64
-                       make %{MAKETUNING} centrino-decode powernow-k8-decode
-                       popd
-
-                       pushd tools/power/x86/x86_energy_perf_policy
-                       make
-                       popd
-
-                       pushd tools/power/x86/turbostat
-                       make
-                       popd
-               fi
-
                pushd tools/thermal/tmon
                make
                popd
@@ -312,36 +284,12 @@ build
                rm -rfv %{BUILDROOT}/lib/firmware
 
                # Install tools.
-               %{perf_make} DESTDIR=%{BUILDROOT} install-bin install-python_ext
-
                # cpupower
                make -C tools/power/cpupower DESTDIR=%{BUILDROOT} libdir=%{libdir} \
                        mandir=%{mandir} CPUFREQ_BENCH=false install
 
-               if [ "%{DISTRO_ARCH}" = "x86_64" ]; then
-                       pushd tools/power/cpupower/debug/x86_64
-                       install -m 755 centrino-decode \
-                               %{BUILDROOT}/usr/bin/centrino-decode
-                       install -m 755 powernow-k8-decode \
-                               %{BUILDROOT}/usr/bin/powernow-k8-decode
-                       popd
-               fi
-
                chmod 0755 %{BUILDROOT}%{libdir}/libcpupower.so*
 
-               # This should be built for all x86 architectures
-               if [ "%{DISTRO_ARCH}" = "x86_64" ]; then
-                       mkdir -pv %{BUILDROOT}%{mandir}/man8
-
-                       pushd tools/power/x86/x86_energy_perf_policy
-                       make DESTDIR=%{BUILDROOT} install
-                       popd
-
-                       pushd tools/power/x86/turbostat
-                       make DESTDIR=%{BUILDROOT} install
-                       popd
-               fi
-
                # tmon
                pushd tools/thermal/tmon
                make INSTALL_ROOT=%{BUILDROOT} install