diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2014-05-05 22:50:43 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2014-05-05 22:50:43 +0100 |
| commit | b478a814eea2d11705c9060f0dd4604ef7a7c5b5 (patch) | |
| tree | 2fe0211c2671701d001c817e9721f672329d8ffa /kernel.spec | |
| parent | b597cbbbef51734e0c9f55dece782a0df19678f3 (diff) | |
| parent | ea6c81b4d83277ffb5c473190fc0fa76e6fdedbc (diff) | |
| download | kernel-b478a814eea2d11705c9060f0dd4604ef7a7c5b5.tar.gz kernel-b478a814eea2d11705c9060f0dd4604ef7a7c5b5.tar.xz kernel-b478a814eea2d11705c9060f0dd4604ef7a7c5b5.zip | |
fix arm merge
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec index c9dcdb0f4..e44a5e774 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1590,6 +1590,10 @@ BuildKernel() { if [ -d arch/%{asmarch}/include ]; then cp -a --parents arch/%{asmarch}/include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ fi +%ifarch aarch64 + # arch/arm64/include/asm/xen references arch/arm + cp -a --parents arch/arm/include/asm/xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ +%endif # include the machine specific headers for ARM variants, if available. %ifarch %{arm} if [ -d arch/%{asmarch}/mach-${Flavour}/include ]; then @@ -2228,6 +2232,10 @@ fi * Mon May 5 2014 Peter Robinson <pbrobinson@fedoraproject.org> - Fix some USB on ARM LPAE kernels +* Mon May 05 2014 Kyle McMartin <kyle@fedoraproject.org> +- Install arch/arm/include/asm/xen headers on aarch64, since the headers in + arch/arm64/include/asm/xen reference them. + * Mon May 05 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc4.git0.1 - Linux v3.15-rc4 - Disable debugging options. |