X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel.spec;h=430aec57d40640b302a0c55096822707fc4e48fd;hb=36afde5fa10a0324c9c19fb87bab790e484ff7e0;hp=d4f41d8f9c270b4d7ae9b0372cc5c9c4c7ab8de2;hpb=ecab658e3afca534082c034513b1119ef58eea5d;p=packages%2Fkernel.git

diff --git a/kernel.spec b/kernel.spec
index d4f41d8f..430aec57 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -72,7 +72,7 @@
 %endif
 
 %define		rel		1
-%define		basever		5.6
+%define		basever		5.7
 %define		postver		.11
 
 # define this to '-%{basever}' for longterm branch
@@ -124,10 +124,10 @@ Epoch:		3
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
-# Source0-md5:	7b9199ec5fa563ece9ed585ffb17798f
+# Source0-md5:	f63ed18935914e1ee3e04c2a0ce1ba3b
 %if "%{postver}" != ".0"
 Patch0:		https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:	6ec547919a5f233ab7ec018e5bc966a5
+# Patch0-md5:	a2824a09c83af1bacb337288a41c80d9
 %endif
 Source1:	kernel.sysconfig
 
@@ -963,6 +963,13 @@ rm -rf $RPM_BUILD_ROOT
 	INSTALL_MOD_PATH=$RPM_BUILD_ROOT \
 	KERNELRELEASE=%{kernel_release}
 
+%ifarch %{arm} aarch64
+%{__make} %{MakeOpts} %{!?with_verbose:-s} dtbs_install \
+	-C %{objdir} \
+	%{?with_verbose:V=1} \
+	INSTALL_DTBS_PATH=$RPM_BUILD_ROOT/boot/dtb-%{kernel_release}
+%endif
+
 install -d $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/misc
 
 # create directories which may be missing, to simplyfy %files
@@ -1019,7 +1026,6 @@ cp -aL %{objdir}/.config $RPM_BUILD_ROOT/boot/config-%{kernel_release}
 %endif
 %ifarch aarch64
 	cp -a %{objdir}/arch/%{target_arch_dir}/boot/Image.gz $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
-	cp -a %{objdir}/arch/%{target_arch_dir}/boot/dts $RPM_BUILD_ROOT/boot/
 %endif
 
 # ghosted initrd
@@ -1250,6 +1256,9 @@ fi
 %ifarch ia64
 /boot/efi/vmlinuz-%{kernel_release}
 %endif
+%ifarch %{arm} aarch64
+/boot/dtb-%{kernel_release}
+%endif
 /boot/vmlinuz-%{kernel_release}
 /boot/System.map-%{kernel_release}
 /boot/config-%{kernel_release}
@@ -1281,6 +1290,7 @@ fi
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/media/pci/cx88/cx88-alsa.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/media/usb/em28xx/em28xx-alsa.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/media/pci/saa7134/saa7134-alsa.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/gadget/legacy/g_midi.ko*
 %endif
 %endif
 %dir /lib/modules/%{kernel_release}/misc
@@ -1291,7 +1301,6 @@ fi
 %if %{without rescuecd}
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/ata/pata_pcmcia.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/bluetooth/*_cs.ko*
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/gadget/legacy/g_midi.ko*
 %endif
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/ide/ide-cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/net/arcnet/com20020_cs.ko*
@@ -1318,7 +1327,9 @@ fi
 /lib/modules/%{kernel_release}/kernel/sound
 %endif
 /lib/modules/%{kernel_release}/kernel/security
+%ifarch %{ix86} %{x8664} x32
 /lib/modules/%{kernel_release}/kernel/virt
+%endif
 
 %dir %{_sysconfdir}/depmod.d/%{kernel_release}
 %dir %{_sysconfdir}/modprobe.d/%{kernel_release}
@@ -1496,7 +1507,6 @@ fi
 %ifarch ppc ppc64
 %exclude %{_kernelsrcdir}/arch/powerpc/lib/crtsavres.*
 %endif
-%{_kernelsrcdir}/arch/arm/kvm
 %{_kernelsrcdir}/arch/arm64/kvm
 %{_kernelsrcdir}/arch/mips/kvm
 %{_kernelsrcdir}/arch/s390/kvm