summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorKyle McMartin <kmcmarti@redhat.com>2015-01-07 14:39:48 -0500
committerKyle McMartin <kmcmarti@redhat.com>2015-01-07 14:42:26 -0500
commit1c0b002c1ea134bd21be1b6a320cd3a35929eefa (patch)
treeb795fe033a1dac36eb307a81fe7366cc2461d65d /kernel.spec
parent0de826085655c7e247a14c2da375f099813b0516 (diff)
downloadkernel-1c0b002c1ea134bd21be1b6a320cd3a35929eefa.tar.gz
kernel-1c0b002c1ea134bd21be1b6a320cd3a35929eefa.tar.xz
kernel-1c0b002c1ea134bd21be1b6a320cd3a35929eefa.zip
kernel-arm64.patch: fix up build... no idea if it works
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec13
1 files changed, 7 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec
index cc8cadb70..5a5f92e42 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -8,7 +8,7 @@ Summary: The Linux kernel
# be 0.
%global released_kernel 0
-%global aarch64patches 0
+%global aarch64patches 1
# Sign modules on x86. Make sure the config files match this setting if more
# architectures are added.
@@ -42,7 +42,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -1481,10 +1481,8 @@ BuildKernel() {
%{make} -s ARCH=$Arch V=1 %{?_smp_mflags} modules %{?sparse_mflags} || exit 1
%ifarch %{arm} aarch64
- %{make} -s ARCH=$Arch V=1 dtbs
- mkdir -p $RPM_BUILD_ROOT/%{image_install_path}/dtb-$KernelVer
- install -m 644 arch/$Arch/boot/dts/*.dtb $RPM_BUILD_ROOT/%{image_install_path}/dtb-$KernelVer/
- rm -f arch/$Arch/boot/dts/*.dtb
+ %{make} -s ARCH=$Arch V=1 dtbs dtbs_install INSTALL_DTBS_PATH=$RPM_BUILD_ROOT/%{image_install_path}/dtb-$KernelVer
+ find arch/$Arch/boot/dts -name '*.dtb' -type f | xargs rm -f
%endif
# Start installing the results
@@ -2210,6 +2208,9 @@ fi
# ||----w |
# || ||
%changelog
+* Wed Jan 07 2015 Kyle McMartin <kyle@fedoraproject.org> - 3.19.0-0.rc3.git1.2
+- kernel-arm64.patch: fix up build... no idea if it works.
+
* Wed Jan 07 2015 Josh Boyer <jwboyer@fedoraproject.org>
- CVE-2014-9529 memory corruption or panic during key gc (rhbz 1179813 1179853)