]> git.ipfire.org Git - ipfire-3.x.git/blobdiff - kernel/kernel.nm
libpng: Update to 1.6.2.
[ipfire-3.x.git] / kernel / kernel.nm
index f515447e726d526410275ede5d7951593ec1dd57..5a1099bdb943929b14ee1caa3244a71781b2b5aa 100644 (file)
@@ -4,11 +4,11 @@
 ###############################################################################
 
 name       = kernel
-version    = 3.2.12
-release    = 3
+version    = 3.8.6
+release    = 2
 thisapp    = linux-%{version}
 
-maintainer = Michael Tremer <michael.tremer@ipfire.org>
+maintainer = Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
 groups     = System/Kernels
 url        = http://www.kernel.org/
 license    = GPLv2
@@ -34,79 +34,89 @@ build
        # are not available on the remote compilers, we need to disable it here.
        export ICECC=no
 
+       kernel_logo = /usr/share/pixmaps/kernel-logo.ppm
+
        requires
                asciidoc
+               audit-devel
+               binutils >= 2.23.51.0.3-3
                binutils-devel
+               bison
                elfutils-devel
+               flex
                gcc-plugin-devel
                gettext
+               libunwind-devel
                ncurses-devel
                net-tools
+               newt-devel
+               pciutils-devel
                perl
                python-devel
+               slang-devel
                xmlto
-               xz-lzma-compat
 
                /sbin/depmod
+               %{kernel_logo}
        end
 
-       tools_cpupower_requires
-               newt-devel
-               pciutils-devel
-               slang-devel
+       # i686 needs librmi for cpupower.
+       if "%{DISTRO_ARCH}" == "i686"
+               requires += liblrmi-devel
        end
 
        # A list of kernels to build.
        kernels =
 
-       # Should we build cpupower?
-       build_cpupower = 1
+       # Arguments that are passed to the kernel build command.
+       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"
                # ERROR Currently all kernel images are disabled, because they
                # won't build with the grsecurity patch.
 
-               # Build versatile kernel.
-               #build_kernel_versatile = 1
-
                # Build a kernel for Marvell Kirkwood-based devices.
-               #build_kernel_kirkwood = 1
+               build_kernel_kirkwood = 1
 
-               kernel_arch  = arm
-               kernel_image = arch/%{kernel_arch}/boot/zImage
+               kernel_arch = arm
+               kernel_target = zImage
 
-               # ARM does not support cpupower.
-               build_cpupower = 0
+               # 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 a kernel for TI OMAP SoCs.
                build_kernel_omap = 1
 
-               kernel_arch  = arm
-               kernel_image = arch/%{kernel_arch}/boot/zImage
+               kernel_arch = arm
+               kernel_target = uImage
+       end
 
-               # ARM does not support cpupower.
-               build_cpupower = 0
+       # mkimage is a requirement to build uImage images.
+       if "%{kernel_target}" == "uImage"
+               requires += u-boot-tools
        end
 
        # Build default kernel.
@@ -114,16 +124,16 @@ 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 ARM versatile kernel.
-       if "%{build_kernel_versatile}" == "1"
-               kernels += versatile
-       end
-
        # Build ARM kirkwood kernel.
        if "%{build_kernel_kirkwood}" == "1"
                kernels += kirkwood
@@ -134,17 +144,21 @@ build
                kernels += omap
        end
 
-       # Add tools' build requirements if build is requested.
-       if "%{build_cpupower}" == "1"
-               requires += %{tools_cpupower_requires}
-       end
-
        prepare_cmds
                rm -f %{DIR_APP}/localversion-grsec
 
+               # Remove -Werror flag to fix ARMv5 build.
+               sed -e "s/-Werror//g" -i grsecurity/Makefile
+
+               # Disable the colorize plugin.
+               # It's generally very nice but it clutters our
+               # logfiles.
+               sed -e "/^COLORIZE_PLUGIN_CFLAGS/d" \
+                       -i Makefile
+
                sed -e "s/^HOSTCFLAGS.*=.*/& -fPIC/g" -i Makefile
 
-               cp -vf %{DIR_SOURCE}/%{DISTRO_SNAME}_logo.ppm \
+               cp -vf %{kernel_logo} \
                        drivers/video/logo/logo_linux_clut224.ppm
 
                # Get rid of unwanted files resulting from patch fuzz.
@@ -198,13 +212,30 @@ build
 
                        # Install configuration file.
                        cp configs/config.${flavour} .config
+                       cat .config
 
                        # Run the build.
                        make ARCH=%{kernel_arch} oldnoconfig >/dev/null
-                       make ARCH=%{kernel_arch} CC="gcc -fno-PIE" %{kernel_target} modules %{PARALLELISMFLAGS}
+                       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}/lib/modules/${fullversion}
+                       mkdir -pv %{BUILDROOT}/boot %{BUILDROOT}/usr/lib/modules/${fullversion}
                        install -m 755 %{kernel_image} %{BUILDROOT}/boot/vmlinuz-${fullversion}
                        install -m 644 .config %{BUILDROOT}/boot/config-${fullversion}
                        install -m 644 System.map %{BUILDROOT}/boot/System.map-${fullversion}
@@ -213,7 +244,7 @@ build
                        dd if=/dev/zero of=%{BUILDROOT}/boot/initramfs-${fullversion}.img bs=1M count=20
 
                        # Install modules.
-                       make ARCH=%{kernel_arch} INSTALL_MOD_PATH=%{BUILDROOT} mod-fw= \
+                       make ARCH=%{kernel_arch} INSTALL_MOD_PATH=%{BUILDROOT}/usr mod-fw= V=1 \
                                KERNELRELEASE=${fullversion} modules_install
 
                        # Install vdso.
@@ -225,52 +256,56 @@ build
                        esac
 
                        # Create an empty settings file for dracut
-                       mkdir -pv %{BUILDROOT}/etc/ld.so.conf.d
+                       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.
-                       rm -vf %{BUILDROOT}/lib/modules/${fullversion}/{build,source}
-                       mkdir -pv %{BUILDROOT}/lib/modules/${fullversion}/build
-                       ln -svf build %{BUILDROOT}/lib/modules/${fullversion}/source
+                       rm -f %{BUILDROOT}/usr/lib/modules/${fullversion}/{build,source}
+                       mkdir -p %{BUILDROOT}/usr/lib/modules/${fullversion}/build
+                       ln -sf build %{BUILDROOT}/usr/lib/modules/${fullversion}/source
 
                        # Create dirs for extra modules.
-                       mkdir -pv %{BUILDROOT}/lib/modules/${fullversion}/extra
+                       mkdir -p %{BUILDROOT}/usr/lib/modules/${fullversion}/extra
 
-                       cp -v --parents $(find -type f -name "Makefile*" -o -name "Kconfig*") \
-                               %{BUILDROOT}/lib/modules/${fullversion}/build
-                       cp -v Module.symvers System.map \
-                               %{BUILDROOT}/lib/modules/${fullversion}/build
-                       rm -vrf %{BUILDROOT}/lib/modules/${fullversion}/build/{Documentation,scripts,include}
+                       cp --parents $(find -type f -name "Makefile*" -o -name "Kconfig*") \
+                               %{BUILDROOT}/usr/lib/modules/${fullversion}/build
+                       cp Module.symvers System.map \
+                               %{BUILDROOT}/usr/lib/modules/${fullversion}/build
+                       rm -rf %{BUILDROOT}/usr/lib/modules/${fullversion}/build/{Documentation,scripts,include}
 
-                       cp -v .config %{BUILDROOT}/lib/modules/${fullversion}/build
-                       cp -va scripts %{BUILDROOT}/lib/modules/${fullversion}/build
-                       find %{BUILDROOT}/lib/modules/${fullversion}/build/scripts -name "*.o" \
+                       cp .config %{BUILDROOT}/usr/lib/modules/${fullversion}/build
+                       cp -a scripts %{BUILDROOT}/usr/lib/modules/${fullversion}/build
+                       find %{BUILDROOT}/usr/lib/modules/${fullversion}/build/scripts -name "*.o" \
                                -exec rm -vf {} \;
 
-                       cp -va --parents arch/%{kernel_arch}/include \
-                               %{BUILDROOT}/lib/modules/${fullversion}/build
-                       cp -va include %{BUILDROOT}/lib/modules/${fullversion}/build/include
+                       cp -a --parents arch/%{kernel_arch}/include \
+                               %{BUILDROOT}/usr/lib/modules/${fullversion}/build
+                       cp -a include %{BUILDROOT}/usr/lib/modules/${fullversion}/build/include
 
                        # Make sure we can build external modules.
-                       touch -r %{BUILDROOT}/lib/modules/${fullversion}/build/Makefile \
-                               %{BUILDROOT}/lib/modules/${fullversion}/build/include/linux/version.h
-                       touch -r %{BUILDROOT}/lib/modules/${fullversion}/build/.config \
-                               %{BUILDROOT}/lib/modules/${fullversion}/build/autoconf.h
-                       cp -v %{BUILDROOT}/lib/modules/${fullversion}/build/.config \
-                               %{BUILDROOT}/lib/modules/${fullversion}/build/include/config/auto.conf
-
-                       find %{BUILDROOT}/lib/modules/${fullversion} -name "*.ko" -type f | \
+                       touch -r %{BUILDROOT}/usr/lib/modules/${fullversion}/build/Makefile \
+                               %{BUILDROOT}/usr/lib/modules/${fullversion}/build/include/linux/version.h
+                       touch -r %{BUILDROOT}/usr/lib/modules/${fullversion}/build/.config \
+                               %{BUILDROOT}/usr/lib/modules/${fullversion}/build/autoconf.h
+                       cp %{BUILDROOT}/usr/lib/modules/${fullversion}/build/.config \
+                               %{BUILDROOT}/usr/lib/modules/${fullversion}/build/include/config/auto.conf
+
+                       find %{BUILDROOT}/usr/lib/modules/${fullversion} -name "*.ko" -type f | \
                                xargs chmod u+x
 
                        # Move all development files to /usr/src.
-                       mkdir -pv %{BUILDROOT}/usr/src/kernels
-                       mv -v %{BUILDROOT}/lib/modules/${fullversion}/build \
+                       mkdir -p %{BUILDROOT}/usr/src/kernels
+                       mv %{BUILDROOT}/usr/lib/modules/${fullversion}/build \
                                %{BUILDROOT}/usr/src/kernels/${fullversion}
-                       ln -svf ../../../usr/src/kernels/${fullversion} \
-                               %{BUILDROOT}/lib/modules/${fullversion}/build
+                       ln -sf ../../../src/kernels/${fullversion} \
+                               %{BUILDROOT}/usr/lib/modules/${fullversion}/build
+
+                       # Fix permissions.
+                       find %{BUILDROOT}/usr/src/kernels -name "modules.order" \
+                               -exec chmod 644 {} \;
 
                        find %{BUILDROOT}/usr/src/kernels -name ".*.cmd" -exec rm -f {} \;
                }
@@ -281,13 +316,17 @@ build
 
                # Build tools.
                # cpupower
-               if [ "%{build_cpupower}" = "1" ]; then
-                       chmod +x tools/power/cpupower/utils/version-gen.sh
-                       make -C tools/power/cpupower CPUFREQ_BENCH=false %{PARALLELISMFLAGS}
-
-                       cd tools/power/cpupower/debug/i386
-                       make %{PARALLELISMFLAGS} centrino-decode powernow-k8-decode
-                       cd -
+               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}
+                       popd
+               elif [ "%{DISTRO_ARCH}" = "i686" ]; then
+                       pushd tools/power/cpupower/debug/i386
+                       make %{MAKETUNING}
+                       popd
                fi
        end
 
@@ -312,20 +351,31 @@ build
                rm -rfv %{BUILDROOT}/lib/firmware
 
                # Install tools.
-               make -C tools/perf DESTDIR=%{BUILDROOT} \
+               make -C tools/perf DESTDIR=%{BUILDROOT} WERROR=0 \
                        HAVE_CPLUS_DEMANGLE=1 prefix=/usr perfexecdir=lib/perf-core \
-                       install install-man
+                       install install-man install-python_ext
 
                # cpupower
-               if [ "%{build_cpupower}" = "1" ]; then
-                       make -C tools/power/cpupower DESTDIR=%{BUILDROOT} libdir=%{libdir} \
-                               mandir=%{mandir} CPUFREQ_BENCH=false install
-                       cd tools/power/cpupower/debug/i386
-                       install -m 755 centrino-decode %{BUILDROOT}/usr/bin/centrino-decode
-                       install -m 755 powernow-k8-decode %{BUILDROOT}/usr/bin/powernow-k8-decode
-                       cd -
-                       chmod 0755 %{BUILDROOT}%{libdir}/libcpupower.so*
+               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
+               elif [ "%{DISTRO_ARCH}" = "i686" ]; then
+                       pushd tools/power/cpupower/debug/i386
+                       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*
        end
 end
 
@@ -352,10 +402,11 @@ 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
-                       /lib/modules/%{kernel_release}
+                       /usr/lib/modules/%{kernel_release}
                end
 
                _posttrans
@@ -400,8 +451,8 @@ packages
                end
 
                files
-                       /lib/modules/%{kernel_release}/build
-                       /lib/modules/%{kernel_release}/source
+                       /usr/lib/modules/%{kernel_release}/build
+                       /usr/lib/modules/%{kernel_release}/source
                        /usr/src/kernels/%{kernel_release}
                end
        end
@@ -422,35 +473,35 @@ packages
                end
        end
 
-       if "%{build_kernel_legacy}" == "1"
-               package kernel-legacy
+       if "%{build_kernel_exynos}" == "1"
+               package kernel-exynos
                        template KERNEL
 
-                       kernel_name = kernel-legacy
-                       kernel_release = %{fullver}.legacy
+                       kernel_name = kernel-exynos
+                       kernel_release = %{fullver}.exynos
                end
 
-               package kernel-legacy-devel
+               package kernel-exynos-devel
                        template KERNELDEVEL
 
-                       kernel_name = kernel-legacy
-                       kernel_release = %{fullver}.legacy
+                       kernel_name = kernel-exynos
+                       kernel_release = %{fullver}.exynos
                end
        end
 
-       if "%{build_kernel_versatile}" == "1"
-               package kernel-versatile
+       if "%{build_kernel_legacy}" == "1"
+               package kernel-legacy
                        template KERNEL
 
-                       kernel_name = kernel-versatile
-                       kernel_release = %{fullver}.versatile
+                       kernel_name = kernel-legacy
+                       kernel_release = %{fullver}.legacy
                end
 
-               package kernel-versatile-devel
+               package kernel-legacy-devel
                        template KERNELDEVEL
 
-                       kernel_name = kernel-versatile
-                       kernel_release = %{fullver}.versatile
+                       kernel_name = kernel-legacy
+                       kernel_release = %{fullver}.legacy
                end
        end
 
@@ -506,8 +557,8 @@ packages
                files
                        /
                        !/boot
-                       !/lib/modules
                        !/usr/include
+                       !/usr/lib/modules
                        !/usr/src
                        !/usr/src/debug
                        !/usr/lib/debug