]> git.ipfire.org Git - people/ms/ipfire-3.x.git/blobdiff - kernel/kernel.nm
kernel: Update to 3.13.2.
[people/ms/ipfire-3.x.git] / kernel / kernel.nm
index 8165f2a26f13b89d2a2cc242d6e8f6a59f33f4a3..1650e89107a0902dc94fea83aca4240b09f20608 100644 (file)
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = kernel
-version    = 3.8.2
-release    = 0.1
+version    = 3.13.2
+release    = 1
 thisapp    = linux-%{version}
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
@@ -39,6 +39,7 @@ build
        requires
                asciidoc
                audit-devel
+               bc
                binutils >= 2.23.51.0.3-3
                binutils-devel
                bison
@@ -72,22 +73,21 @@ build
        kernel_build_flags =
 
        kernel_target = bzImage
+       kernel_image = arch/%{kernel_arch}/boot/%{kernel_target}
+
        if "%{DISTRO_ARCH}" == "i686"
                # Build a default and legacy kernel for the
                # i686 architecture.
                build_kernel_default = 1
                build_kernel_legacy = 1
 
-               kernel_arch  = x86
-               kernel_image = arch/%{kernel_arch}/boot/bzImage
-
+               kernel_arch = x86
        end
 
        if "%{DISTRO_ARCH}" == "x86_64"
                build_kernel_default = 1
 
-               kernel_arch  = x86
-               kernel_image = arch/%{kernel_arch}/boot/bzImage
+               kernel_arch = x86
        end
 
        if "%{DISTRO_ARCH}" == "armv5tel"
@@ -97,22 +97,25 @@ build
                # Build a kernel for Marvell Kirkwood-based devices.
                build_kernel_kirkwood = 1
 
-               kernel_arch  = arm
-               kernel_image = arch/%{kernel_arch}/boot/zImage
+               kernel_arch = arm
+               kernel_target = zImage
 
                # http://lists.infradead.org/pipermail/linux-arm-kernel/2012-March/091404.html
                kernel_build_flags = KALLSYMS_EXTRA_PASS=1
        end
 
        if "%{DISTRO_ARCH}" == "armv7hl"
-               # Build a kernel for Samsung's Exynos SoCs.
-               build_kernel_exynos = 1
+               # Build the default unified kernel.
+               build_kernel_default = 1
+               build_kernel_lpae = 1
 
-               # Build a kernel for TI OMAP SoCs.
-               build_kernel_omap = 1
+               kernel_arch = arm
+               kernel_target = zImage
+       end
 
-               kernel_arch  = arm
-               kernel_image = arch/%{kernel_arch}/boot/zImage
+       # mkimage is a requirement to build uImage images.
+       if "%{kernel_target}" == "uImage"
+               requires += u-boot-tools
        end
 
        # Build default kernel.
@@ -120,31 +123,30 @@ build
                kernels += default
        end
 
-       # Build exynos kernel.
-       if "%{build_kernel_exynos}" == "1"
-               kernels += exynos
-       end
-
        # Build legacy kernel.
        if "%{build_kernel_legacy}" == "1"
                kernels += legacy
        end
 
+       # Build lpae kernel
+       if "%{build_kernel_lpae}" == "1"
+               kernels += lpae
+       end
+
        # Build ARM kirkwood kernel.
        if "%{build_kernel_kirkwood}" == "1"
                kernels += kirkwood
        end
 
-       # Build ARM omap kernel.
-       if "%{build_kernel_omap}" == "1"
-               kernels += omap
-       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
                rm -f %{DIR_APP}/localversion-grsec
 
                # Remove -Werror flag to fix ARMv5 build.
-               sed -e "s/-Werror//g" -i grsecurity/Makefile
+               sed -e "s/-Werror//g" -i grsecurity/Makefile || :
 
                # Disable the colorize plugin.
                # It's generally very nice but it clutters our
@@ -185,6 +187,10 @@ 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
@@ -215,6 +221,21 @@ build
                        make ARCH=%{kernel_arch} CC="gcc -fno-PIE" %{kernel_target} modules \
                                %{kernel_build_flags} %{PARALLELISMFLAGS}
 
+                       # Compile Flattened Device Tree database
+                       case "${DISTRO_ARCH}" in
+                               arm*)
+                                       make ARCH=%{kernel_arch} dtbs
+
+                                       mkdir -pv %{BUILDROOT}/boot/dtb-${fullversion}
+                                       for file in arch/arm/boot/dts/*.dtb; do
+                                               [ -e "${file}" ] || continue
+
+                                               install -m 644 ${file} %{BUILDROOT}/boot/dtb-${fullversion} || exit 1
+                                               rm -f ${file}
+                                       done
+                                       ;;
+                       esac
+
                        # Install the results.
                        mkdir -pv %{BUILDROOT}/boot %{BUILDROOT}/usr/lib/modules/${fullversion}
                        install -m 755 %{kernel_image} %{BUILDROOT}/boot/vmlinuz-${fullversion}
@@ -296,19 +317,43 @@ build
                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}
+                       make %{MAKETUNING} centrino-decode powernow-k8-decode
                        popd
                elif [ "%{DISTRO_ARCH}" = "i686" ]; then
                        pushd tools/power/cpupower/debug/i386
-                       make %{MAKETUNING}
+                       make %{MAKETUNING} centrino-decode powernow-k8-decode
+                       popd
+               fi
+
+               # Should be built for all x86 architectures
+               if [ "%{DISTRO_ARCH}" = "x86_64" ]; then
+                       # Won't compile on i686
+                       # x86_energy_perf_policy.c: In function ‘validate_cpuid’:
+                       # x86_energy_perf_policy.c:154:2: error: PIC register clobbered by ‘ebx’ in ‘asm’
+                       #   asm("cpuid" : "=a" (fms), "=c" (ecx), "=d" (edx) : "a" (1) : "ebx");
+                       #   ^
+                       pushd tools/power/x86/x86_energy_perf_policy
+                       make
+                       popd
+
+                       # Same as above
+                       pushd tools/power/x86/turbostat
+                       make
                        popd
                fi
+
+               pushd tools/thermal/tmon
+               make
+               popd
        end
 
        install
@@ -332,9 +377,7 @@ build
                rm -rfv %{BUILDROOT}/lib/firmware
 
                # Install tools.
-               make -C tools/perf DESTDIR=%{BUILDROOT} WERROR=0 \
-                       HAVE_CPLUS_DEMANGLE=1 prefix=/usr perfexecdir=lib/perf-core \
-                       install install-man install-python_ext
+               %{perf_make} DESTDIR=%{BUILDROOT} install-bin install-python_ext
 
                # cpupower
                make -C tools/power/cpupower DESTDIR=%{BUILDROOT} libdir=%{libdir} \
@@ -357,6 +400,24 @@ build
                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
+               popd
        end
 end
 
@@ -383,6 +444,7 @@ packages
 
                files
                        /boot/System.map-%{kernel_release}
+                       /boot/dtb-%{kernel_release}
                        /boot/vmlinuz-%{kernel_release}
                        /boot/initramfs-%{kernel_release}.img
                        /etc/ld.so.conf.d/kernel-%{kernel_release}.conf
@@ -426,6 +488,10 @@ packages
                        kernel release %{kernel_release}.
                end
 
+               provides
+                       kernel-devel = %{thisver}
+               end
+
                filter_requires
                        perl>=[0-9]\:.*
                end
@@ -438,34 +504,51 @@ packages
        end
 
        if "%{build_kernel_default}" == "1"
-               package kernel
-                       template KERNEL
+               if "%{DISTRO_ARCH}" == "armv7hl"
+                       package kernel
+                               template KERNEL
 
-                       kernel_name = kernel
-                       kernel_release = %{fullver}
-               end
+                               kernel_name = kernel
+                               kernel_release = %{fullver}
 
-               package kernel-devel
-                       template KERNELDEVEL
+                               # Replace the Exynos kernel.
+                               obsoletes += kernel-exynos < %{kernel_release}
+                               conflicts += kernel-exynos < %{kernel_release}
 
-                       kernel_name = kernel
-                       kernel_release = %{fullver}
-               end
-       end
+                               # Replace the OMAP kernel.
+                               obsoletes += kernel-omap < %{kernel_release}
+                               conflicts += kernel-omap < %{kernel_release}
+                       end
 
-       if "%{build_kernel_exynos}" == "1"
-               package kernel-exynos
-                       template KERNEL
+                       package kernel-devel
+                               template KERNELDEVEL
 
-                       kernel_name = kernel-exynos
-                       kernel_release = %{fullver}.exynos
-               end
+                               kernel_name = kernel
+                               kernel_release = %{fullver}
 
-               package kernel-exynos-devel
-                       template KERNELDEVEL
+                               # Replace the Exynos kernel.
+                               obsoletes += kernel-exynos-devel < %{kernel_release}
+                               conflicts += kernel-exynos-devel < %{kernel_release}
+
+                               # Replace the OMAP kernel.
+                               obsoletes += kernel-omap-devel < %{kernel_release}
+                               conflicts += kernel-omap-devel < %{kernel_release}
+                       end
+
+               else
+                       package kernel
+                               template KERNEL
+
+                               kernel_name = kernel
+                               kernel_release = %{fullver}
+                       end
 
-                       kernel_name = kernel-exynos
-                       kernel_release = %{fullver}.exynos
+                       package kernel-devel
+                               template KERNELDEVEL
+
+                               kernel_name = kernel
+                               kernel_release = %{fullver}
+                       end
                end
        end
 
@@ -485,35 +568,35 @@ packages
                end
        end
 
-       if "%{build_kernel_kirkwood}" == "1"
-               package kernel-kirkwood
+       if "%{build_kernel_lpae}" == "1"
+               package kernel-lpae
                        template KERNEL
 
-                       kernel_name = kernel-kirkwood
-                       kernel_release = %{fullver}.kirkwood
+                       kernel_name = kernel-lpae
+                       kernel_release = %{fullver}.lpae
                end
 
-               package kernel-kirkwood-devel
+               package kernel-lpae-devel
                        template KERNELDEVEL
 
-                       kernel_name = kernel-kirkwood
-                       kernel_release = %{fullver}.kirkwood
+                       kernel_name = kernel-lpae
+                       kernel_release = %{fullver}.lpae
                end
        end
 
-       if "%{build_kernel_omap}" == "1"
-               package kernel-omap
+       if "%{build_kernel_kirkwood}" == "1"
+               package kernel-kirkwood
                        template KERNEL
 
-                       kernel_name = kernel-omap
-                       kernel_release = %{fullver}.omap
+                       kernel_name = kernel-kirkwood
+                       kernel_release = %{fullver}.kirkwood
                end
 
-               package kernel-omap-devel
+               package kernel-kirkwood-devel
                        template KERNELDEVEL
 
-                       kernel_name = kernel-omap
-                       kernel_release = %{fullver}.omap
+                       kernel_name = kernel-kirkwood
+                       kernel_release = %{fullver}.kirkwood
                end
        end