X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel.spec;h=16123fd60a6ae15cc89076d7d5fe24fedd3c8409;hb=ecfb01fb9899ec9dc82a19355c0c02aa2994c9f9;hp=5398960fc0b7ab55e95def138b38fadd9d276f63;hpb=900330d09423f0bbe8527a4a346818b563a3b284;p=packages%2Fkernel.git

diff --git a/kernel.spec b/kernel.spec
index 5398960f..16123fd6 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -41,11 +41,6 @@
 %{?debug:%define with_verbose 1}
 
 %define		have_drm	1
-%ifarch %{ix86} %{x8664} x32 alpha %{arm} ia64 ppc ppc64 sparc sparc64
-%define		have_ide	1
-%else
-%define		have_ide	0
-%endif
 %define		have_sound	1
 %define		have_pcmcia	1
 
@@ -57,7 +52,6 @@
 
 %if %{with myown}
 %define		have_drm	0
-%define		have_ide	0
 %define		have_sound	0
 %define		have_pcmcia	0
 %endif
@@ -72,11 +66,11 @@
 %endif
 
 %define		rel		1
-%define		basever		5.11
-%define		postver		.8
+%define		basever		5.15
+%define		postver		.89
 
 # define this to '-%{basever}' for longterm branch
-%define		versuffix	%{nil}
+%define		versuffix	-%{basever}
 
 # __alt_kernel is list of features, empty string if none set
 # _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in rpm.macros)
@@ -124,10 +118,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:	d2985a3f16ef1ea3405c04c406e29dcc
+# Source0-md5:	071d49ff4e020d58c04f9f3f76d3b594
 %if "%{postver}" != ".0"
 Patch0:		https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:	b7a8f78992a38c966a8ea00ad8cbd451
+# Patch0-md5:	357072a1d58d5e370b0fa8e6b3581daa
 %endif
 Source1:	kernel.sysconfig
 
@@ -217,9 +211,9 @@ Patch2003:	kernel-regressions.patch
 Patch7000:	kernel-inittmpfs.patch
 
 # ARM only
-Patch8000:	rpi-wm8804.patch
+Patch8000:	rpi-sound.patch
 Patch8001:	kernel-pinebook-pro.patch
-Patch8002:	kernel-rk3399-afbc-ytr.patch
+Patch8002:	atheros-disallow-retrain-nongen1-pcie.patch
 
 # Do not remove this line, please. It is easier for me to uncomment two lines, then patch
 # kernel.spec every time.
@@ -246,7 +240,7 @@ BuildRequires:	openssl-devel
 BuildRequires:	openssl-tools
 BuildRequires:	perl-base
 BuildRequires:	rpm-build >= 4.5-24
-BuildRequires:	rpmbuild(macros) >= 1.752
+BuildRequires:	rpmbuild(macros) >= 2.019
 BuildRequires:	tar >= 1:1.22
 %ifarch ppc
 BuildRequires:	uboot-mkimage
@@ -267,26 +261,26 @@ Requires:	cpuinfo(pae)
 Suggests:	crda
 Suggests:	dracut
 Suggests:	keyutils
-Requires:	linux-firmware
+Suggests:	linux-firmware
 Provides:	%{name}(netfilter) = 20070806
 Provides:	%{name}(vermagic) = %{kernel_release}
-Obsoletes:	kernel%{_alt_kernel}-char-lirc-ene0100
-Obsoletes:	kernel%{_alt_kernel}-char-lirc-it87
-Obsoletes:	kernel%{_alt_kernel}-char-lirc-ite8709
-Obsoletes:	kernel%{_alt_kernel}-char-lirc-mceusb
-Obsoletes:	kernel%{_alt_kernel}-char-lirc-streamzap
-Obsoletes:	kernel%{_alt_kernel}-isdn-mISDN
-Obsoletes:	kernel-firmware
-Obsoletes:	kernel-misc-acer_acpi
-Obsoletes:	kernel-misc-fuse
-Obsoletes:	kernel-misc-uvc
-Obsoletes:	kernel-modules
-Obsoletes:	kernel-net-ar81
-Obsoletes:	kernel-net-hostap
-Obsoletes:	kernel-net-ieee80211
-Obsoletes:	kernel-net-ipp2p
-Obsoletes:	kernel-net-rt61
-Obsoletes:	kernel-smp
+Obsoletes:	kernel%{_alt_kernel}-char-lirc-ene0100 < 0.9.0
+Obsoletes:	kernel%{_alt_kernel}-char-lirc-it87 < 0.9.0
+Obsoletes:	kernel%{_alt_kernel}-char-lirc-ite8709 < 0.9.0
+Obsoletes:	kernel%{_alt_kernel}-char-lirc-mceusb < 0.9.0
+Obsoletes:	kernel%{_alt_kernel}-char-lirc-streamzap < 0.9.0
+Obsoletes:	kernel%{_alt_kernel}-isdn-mISDN < 2.0.35
+Obsoletes:	kernel-firmware < 3:2.6.33
+Obsoletes:	kernel-misc-acer_acpi < 0.3-2
+Obsoletes:	kernel-misc-fuse < 2.8.5-2
+Obsoletes:	kernel-misc-uvc < 0.215.1-10
+Obsoletes:	kernel-modules < 2.2.2-2
+Obsoletes:	kernel-net-ar81 < 1.0.1.0-3
+Obsoletes:	kernel-net-hostap < 0.4.7-2
+Obsoletes:	kernel-net-ieee80211 < 1.2.18-7
+Obsoletes:	kernel-net-ipp2p < 0.8.2.-17
+Obsoletes:	kernel-net-rt61 < 1.1.0-2.2007122707.13
+Obsoletes:	kernel-smp < 3:2.6.21
 Conflicts:	e2fsprogs < 1.29
 Conflicts:	isdn4k-utils < 3.1pre1
 Conflicts:	jfsutils < 1.1.3
@@ -434,7 +428,7 @@ Summary:	vmlinux - uncompressed kernel image
 Summary(de.UTF-8):	vmlinux - dekompressiertes Kernel Bild
 Summary(pl.UTF-8):	vmlinux - rozpakowany obraz jądra
 Group:		Base/Kernel
-Obsoletes:	kernel-smp-vmlinux
+Obsoletes:	kernel-smp-vmlinux < 3:2.6.21
 
 %description vmlinux
 vmlinux - uncompressed kernel image.
@@ -453,7 +447,7 @@ Group:		Base/Kernel
 Requires(postun):	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Provides:	kernel(vboxvideo) = %{kernel_release}
-Obsoletes:	kernel-smp-drm
+Obsoletes:	kernel-smp-drm < 3:2.6.21
 AutoReqProv:	no
 
 %description drm
@@ -465,24 +459,6 @@ DRM Kernel Treiber.
 %description drm -l pl.UTF-8
 Sterowniki DRM.
 
-%package ide
-Summary:	IDE kernel modules
-Summary(de.UTF-8):	IDE Kernel Treiber
-Summary(pl.UTF-8):	Sterowniki IDE
-Group:		Base/Kernel
-Requires(postun):	%{name} = %{epoch}:%{version}-%{release}
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-AutoReqProv:	no
-
-%description ide
-IDE kernel modules.
-
-%description ide -l de.UTF-8
-IDE Kernel Treiber.
-
-%description ide -l pl.UTF-8
-Sterowniki IDE.
-
 %package pcmcia
 Summary:	PCMCIA modules
 Summary(de.UTF-8):	PCMCIA Module
@@ -490,7 +466,7 @@ Summary(pl.UTF-8):	Moduły PCMCIA
 Group:		Base/Kernel
 Requires(postun):	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Obsoletes:	kernel-smp-pcmcia
+Obsoletes:	kernel-smp-pcmcia < 3:2.6.21
 Conflicts:	pcmcia-cs < 3.1.21
 Conflicts:	pcmciautils < 004
 AutoReqProv:	no
@@ -511,7 +487,7 @@ Summary(pl.UTF-8):	Sterowniki dźwięku ALSA
 Group:		Base/Kernel
 Requires(postun):	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Obsoletes:	kernel-smp-sound-alsa
+Obsoletes:	kernel-smp-sound-alsa < 3:2.6.21
 AutoReqProv:	no
 
 %description sound-alsa
@@ -553,7 +529,7 @@ Group:		Development/Building
 Requires:	%{name}-headers = %{epoch}:%{version}-%{release}
 Requires:	elfutils-devel
 Requires:	make
-Conflicts:	rpmbuild(macros) < 1.704
+Conflicts:	rpmbuild(macros) < 2.019
 AutoReqProv:	no
 
 %description module-build
@@ -747,6 +723,7 @@ find -name '*.pl' -print0 | \
 	scripts/stackdelta
 
 %{__sed} -i -e '1s,/usr/bin/env bash,%{__bash},' \
+	tools/testing/selftests/powerpc/security/mitigation-patching.sh \
 	scripts/config
 
 %build
@@ -956,7 +933,14 @@ cd -
 
 %{__awk} %{?debug:-v dieOnError=1} -v infile=%{objdir}/%{defconfig} -f %{SOURCE8} %{objdir}/.config
 
+%{__make} \
+	TARGETOBJ=%{targetobj} \
+	%{?with_verbose:V=1} \
+	scripts
+
 # build kernel
+export DTC_FLAGS=-@
+ICECC_EXTRAFILES="${ICECC_EXTRAFILES:+$ICECC_EXTRAFILES:}$(test -d %{objdir}/scripts/gcc-plugins && find %{objdir}/scripts/gcc-plugins -name '*.so' | paste -s -d :)"
 %{__make} \
 	TARGETOBJ=%{targetobj} \
 	%{?with_verbose:V=1} \
@@ -968,11 +952,12 @@ rm -rf $RPM_BUILD_ROOT
 	-C %{objdir} \
 	%{?with_verbose:V=1} \
 	DEPMOD=%{DepMod} \
-	mod_compress_cmd=true \
 	INSTALL_MOD_PATH=$RPM_BUILD_ROOT \
+	INSTALL_MOD_STRIP="--strip-debug --remove-section=.comment --remove-section=.note.GNU-stack" \
 	KERNELRELEASE=%{kernel_release}
 
 %ifarch %{arm} aarch64
+export DTC_FLAGS=-@
 %{__make} %{MakeOpts} %{!?with_verbose:-s} dtbs_install \
 	-C %{objdir} \
 	%{?with_verbose:V=1} \
@@ -1137,6 +1122,10 @@ if [[ "$CREATE_SYMLINKS" != [Nn][Oo] ]]; then
 	mv -f /boot/System.map{,.old} 2> /dev/null
 	ln -sf vmlinuz-%{kernel_release} /boot/vmlinuz
 	ln -sf System.map-%{kernel_release} /boot/System.map
+%ifarch %{arm} aarch64
+	mv -f /boot/dtb{,.old} 2> /dev/null
+	ln -sf dtb-%{kernel_release} /boot/dtb
+%endif
 %if 0%{?alt_kernel:1}
 	mv -f /boot/vmlinuz%{_alt_kernel}{,.old} 2> /dev/null
 	mv -f /boot/System%{_alt_kernel}.map{,.old} 2> /dev/null
@@ -1216,12 +1205,6 @@ fi
 %postun drm
 %depmod %{kernel_release}
 
-%post ide
-%depmod %{kernel_release}
-
-%postun ide
-%depmod %{kernel_release}
-
 %post pcmcia
 %depmod %{kernel_release}
 
@@ -1282,9 +1265,6 @@ fi
 %if %{have_drm}
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/gpu
 %endif
-%if %{have_ide}
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/ide/*
-%endif
 /lib/modules/%{kernel_release}/kernel/fs
 /lib/modules/%{kernel_release}/kernel/kernel
 /lib/modules/%{kernel_release}/kernel/lib
@@ -1300,6 +1280,9 @@ fi
 %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
+%ifarch %{arm}
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/staging/vc04_services/bcm2835-audio
+%endif
 %endif
 %dir /lib/modules/%{kernel_release}/misc
 %if %{have_pcmcia}
@@ -1310,7 +1293,6 @@ fi
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/ata/pata_pcmcia.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/bluetooth/*_cs.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*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/net/can/softing/softing_cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/3com/3c574_cs.ko*
@@ -1372,15 +1354,6 @@ fi
 /lib/modules/%{kernel_release}/kernel/drivers/gpu
 %endif
 
-%if %{have_ide}
-%files ide
-%defattr(644,root,root,755)
-/lib/modules/%{kernel_release}/kernel/drivers/ide/*
-%if %{have_pcmcia}
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/ide/ide-cs.ko*
-%endif
-%endif
-
 %if %{have_pcmcia}
 %files pcmcia
 %defattr(644,root,root,755)
@@ -1391,7 +1364,6 @@ fi
 /lib/modules/%{kernel_release}/kernel/drivers/bluetooth/*_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/ata/pata_pcmcia.ko*
 %endif
-/lib/modules/%{kernel_release}/kernel/drivers/ide/ide-cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/net/arcnet/com20020_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/net/can/softing/softing_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/3com/3c574_cs.ko*
@@ -1426,6 +1398,9 @@ fi
 /lib/modules/%{kernel_release}/kernel/drivers/media/usb/em28xx/em28xx-alsa.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/media/pci/saa7134/saa7134-alsa.ko*
 %endif
+%ifarch %{arm}
+/lib/modules/%{kernel_release}/kernel/drivers/staging/vc04_services/bcm2835-audio
+%endif
 %endif
 
 %files headers -f files.headers_exclude_kbuild
@@ -1472,7 +1447,6 @@ fi
 %{_kernelsrcdir}/scripts/mod/*.c
 %{_kernelsrcdir}/scripts/mod/modpost.h
 %attr(755,root,root) %{_kernelsrcdir}/scripts/mkcompile_h
-%{_kernelsrcdir}/scripts/mkmakefile
 %attr(755,root,root) %{_kernelsrcdir}/scripts/setlocalversion
 %{_kernelsrcdir}/scripts/subarch.include
 %{_kernelsrcdir}/scripts/*.c
@@ -1540,7 +1514,6 @@ fi
 %exclude %{_kernelsrcdir}/scripts/basic
 %exclude %{_kernelsrcdir}/scripts/kconfig
 %exclude %{_kernelsrcdir}/scripts/mkcompile_h
-%exclude %{_kernelsrcdir}/scripts/mkmakefile
 %exclude %{_kernelsrcdir}/scripts/mod
 %exclude %{_kernelsrcdir}/scripts/setlocalversion
 %exclude %{_kernelsrcdir}/scripts/subarch.include