]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
kernel: Fix build on ARM.
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 11 Dec 2011 20:35:37 +0000 (21:35 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 11 Dec 2011 20:35:37 +0000 (21:35 +0100)
Header files were exported for x86 and it was tried
to install vdso files.

kernel/kernel.nm

index 67a98bd149dc00c6d6d3bea206aec1bfd1030cd1..c64ffa535d3f6ba309495ff50c6e46c26fe8b8e9 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = kernel
 version    = 3.1.4
-release    = 2
+release    = 3
 thisapp    = linux-%{version}
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
@@ -172,8 +172,14 @@ build
                        # Install modules.
                        make ARCH=%{kernel_arch} INSTALL_MOD_PATH=%{BUILDROOT} mod-fw= \
                                KERNELRELEASE=${fullversion} modules_install
-                       make ARCH=%{kernel_arch} INSTALL_MOD_PATH=%{BUILDROOT} \
-                               KERNELRELEASE=${fullversion} vdso_install
+
+                       # Install vdso.
+                       case "%{DISTRO_ARCH}" in
+                               i686)
+                                       make ARCH=%{kernel_arch} INSTALL_MOD_PATH=%{BUILDROOT} \
+                                               KERNELRELEASE=${fullversion} vdso_install
+                                       ;;
+                       esac
 
                        # Create an empty settings file for dracut
                        mkdir -pv %{BUILDROOT}/etc/ld.so.conf.d
@@ -244,7 +250,7 @@ build
 
        install
                # Install the header files
-               make ARCH=x86 INSTALL_HDR_PATH=dest headers_install
+               make ARCH=%{kernel_arch} INSTALL_HDR_PATH=dest headers_install
                mkdir -pv %{BUILDROOT}/usr/include
                find dest/include \( -name .install -o -name ..install.cmd \) -delete
                cp -rv dest/include/* %{BUILDROOT}/usr/include