]> git.pld-linux.org Git - packages/kernel.git/blobdiff - kernel.spec
projects / packages / kernel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- 5.10.48
[packages/kernel.git] / kernel.spec
diff --git a/kernel.spec b/kernel.spec
index d20e4ca1676c853f71e5527bdd503c84ce4f2623..696811f776e74c3ba4822781e698076e5a8abb02 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -73,10 +73,10 @@
 
 %define                rel             1
 %define                basever         5.10
-%define                postver         .0
+%define                postver         .48
 
 # 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)
@@ -127,7 +127,7 @@ Source0:    https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
 # Source0-md5: 753adc474bf799d569dec4f165ed92c3
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:  d7f9892b339f14f5d2afa6bfb842b1f4
+# Patch0-md5:  08c72ea21b9ced650622874ee15bb8e3
 %endif
 Source1:       kernel.sysconfig
 
@@ -201,7 +201,7 @@ Patch101:   kernel-vserver-fixes.patch
 # Patch creation:
 # git clone git://github.com/sfjro/aufs5-standalone.git
 # cd aufs5-standalone
-# git checkout -b aufs5.8 origin/aufs5.8
+# git checkout -b aufs5.10 origin/aufs5.10
 # cat aufs5-kbuild.patch aufs5-base.patch aufs5-mmap.patch aufs5-standalone.patch > ~/rpm/packages/kernel/kernel-aufs5.patch
 # rm -rf linux && mkdir linux; cp -a Documentation fs include linux
 # diff -urN /usr/share/empty linux | filterdiff -x linux/include/uapi/linux/Kbuild >> ~/rpm/packages/kernel/kernel-aufs5.patch
@@ -227,6 +227,8 @@ Patch7000:  kernel-inittmpfs.patch
 
 # ARM only
 Patch8000:     rpi-wm8804.patch
+Patch8001:     kernel-pinebook-pro.patch
+Patch8002:     kernel-rk3399-afbc-ytr.patch
 
 # Do not remove this line, please. It is easier for me to uncomment two lines, then patch
 # kernel.spec every time.
@@ -253,7 +255,8 @@ BuildRequires:      openssl-devel
 BuildRequires: openssl-tools
 BuildRequires: perl-base
 BuildRequires: rpm-build >= 4.5-24
-BuildRequires: rpmbuild(macros) >= 1.743
+BuildRequires: rpmbuild(macros) >= 1.752
+BuildRequires: tar >= 1:1.22
 %ifarch ppc
 BuildRequires: uboot-mkimage
 %endif
@@ -276,23 +279,23 @@ Suggests: keyutils
 Requires:      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
@@ -440,7 +443,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.
@@ -459,7 +462,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
@@ -496,7 +499,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
@@ -517,7 +520,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
@@ -581,9 +584,7 @@ Summary(pl.UTF-8):  Kod źródłowy jądra Linuksa
 Group:         Development/Building
 Requires:      %{name}-module-build = %{epoch}:%{version}-%{release}
 AutoReqProv:   no
-%if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
-%endif
 
 %description source
 This is the source code for the Linux kernel. You can build a custom
@@ -614,9 +615,7 @@ Summary(de.UTF-8):  Kernel Dokumentation
 Summary(pl.UTF-8):     Dokumentacja do jądra Linuksa
 Group:         Documentation
 AutoReqProv:   no
-%if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
-%endif
 
 %description doc
 This is the documentation for the Linux kernel, as found in
@@ -697,6 +696,8 @@ cd linux-%{basever}
 
 %ifarch %{arm} aarch64
 %patch8000 -p1
+%patch8001 -p1
+%patch8002 -p1
 %endif
 
 %if %{with rt}
@@ -751,8 +752,12 @@ find -name '*.pl' -print0 | \
        scripts/documentation-file-ref-check \
        scripts/get_dvb_firmware \
        scripts/kernel-doc \
+       scripts/sphinx-pre-install \
        scripts/stackdelta
 
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+bash(\s|$),#!/bin/bash\\1,' \
+       scripts/config
+
 %build
 install -d %{objdir}
 cat > %{targetobj}.mk <<'EOF'
@@ -911,6 +916,10 @@ BuildConfig() {
                CONFIG_NFS_FS=y
                CONFIG_ROOT_NFS=y
 %endif
+
+%ifarch x32
+               CONFIG_BPF_PRELOAD=n
+%endif
 EOCONFIG
 
 %if %{with rescuecd}
@@ -1518,7 +1527,6 @@ fi
 %{_kernelsrcdir}/arch/s390/kvm
 %{_kernelsrcdir}/arch/x86/kvm
 %exclude %{_kernelsrcdir}/arch/*/kernel/asm-offsets*
-%exclude %{_kernelsrcdir}/arch/*/kernel/module.lds
 %exclude %{_kernelsrcdir}/arch/*/kernel/sigframe*.h
 %exclude %{_kernelsrcdir}/drivers/media/pci/bt8xx/bttv.h
 %{_kernelsrcdir}/block
@@ -1543,7 +1551,6 @@ fi
 %exclude %{_kernelsrcdir}/scripts/mkcompile_h
 %exclude %{_kernelsrcdir}/scripts/mkmakefile
 %exclude %{_kernelsrcdir}/scripts/mod
-%exclude %{_kernelsrcdir}/scripts/module-common.lds
 %exclude %{_kernelsrcdir}/scripts/setlocalversion
 %exclude %{_kernelsrcdir}/scripts/subarch.include
 %exclude %{_kernelsrcdir}/scripts/*.c
The Linux kernel (the core of the Linux operating system)
This page took 0.039512 seconds and 4 git commands to generate.