[kernel/f20] [arm64] install dtbs
Kyle McMartin
kyle at fedoraproject.org
Tue Sep 3 15:49:54 UTC 2013
commit 50f399ba97cc917c8bc2a64db7b683ff16bb8e38
Author: Kyle McMartin <kmcmarti at redhat.com>
Date: Tue Sep 3 11:49:09 2013 -0400
[arm64] install dtbs
config-arm64 | 2 ++
kernel.spec | 12 ++++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/config-arm64 b/config-arm64
index 018246b..78dd575 100644
--- a/config-arm64
+++ b/config-arm64
@@ -82,3 +82,5 @@ CONFIG_VM_EVENT_COUNTERS=y
# weird include chain resulting in missing u64 type
# CONFIG_USB_SPEEDTOUCH is not set
# dma issues in headers
+# CONFIG_PARPORT_PC is not set
+# CONFIG_VGA_CONSOLE is not set
diff --git a/kernel.spec b/kernel.spec
index 91c5a4e..1272ec1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1595,11 +1595,11 @@ BuildKernel() {
%{make} -s ARCH=$Arch V=1 %{?_smp_mflags} $MakeTarget %{?sparse_mflags} %{?kernel_mflags}
%{make} -s ARCH=$Arch V=1 %{?_smp_mflags} modules %{?sparse_mflags} || exit 1
-%ifarch %{arm}
+%ifarch %{arm} aarch64
%{make} -s ARCH=$Arch V=1 dtbs
mkdir -p $RPM_BUILD_ROOT/%{image_install_path}/dtb-$KernelVer
- install -m 644 arch/arm/boot/dts/*.dtb $RPM_BUILD_ROOT/boot/dtb-$KernelVer/
- rm -f arch/arm/boot/dts/*.dtb
+ install -m 644 arch/$Arch/boot/dts/*.dtb $RPM_BUILD_ROOT/boot/dtb-$KernelVer/
+ rm -f arch/$Arch/boot/dts/*.dtb
%endif
# Start installing the results
@@ -2206,7 +2206,7 @@ fi
%defattr(-,root,root)\
/%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?2:+%{2}}\
/%{image_install_path}/.vmlinuz-%{KVERREL}%{?2:+%{2}}.hmac \
-%ifarch %{arm}\
+%ifarch %{arm} aarch64\
/%{image_install_path}/dtb-%{KVERREL}%{?2:+%{2}} \
%endif\
%attr(600,root,root) /boot/System.map-%{KVERREL}%{?2:+%{2}}\
@@ -2257,6 +2257,10 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Sep 03 2013 Kyle McMartin <kyle at redhat.com>
+- [arm64] disable VGA_CONSOLE and PARPORT_PC
+- [arm64] install dtb as on %{arm}
+
* Tue Sep 03 2013 Josh Boyer <jwboyer at fedoraproject.org> - 3.11.0-1
- Linux v3.11
- Disable debugging options.
More information about the scm-commits
mailing list