- 6.7.8

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index c526005310669f3c7d590dad7283111d5c16fb83..395810ce3f3f70665c6696f3df9210e4d51836f3 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -60,8 +60,8 @@
 %endif
 
 %define                rel             1
-%define                basever         6.6
-%define                postver         .5
+%define                basever         6.7
+%define                postver         .8
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       %{nil}
@@ -112,10 +112,10 @@ Epoch:            3
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz
-# Source0-md5: 452098d80ba925af3a4ab35998f3aef5
+# Source0-md5: 7861a2ed9d33c0694df738203532b715
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
-# Patch0-md5:  16bc0dc7e680a14817eab74a28267620
+# Patch0-md5:  2e67e18776a3fe7ecf66e70f28aab2f7
 %endif
 Source1:       kernel.sysconfig
 
@@ -133,7 +133,6 @@ Source21:   kernel-x86.config
 Source22:      kernel-sparc.config
 Source23:      kernel-alpha.config
 Source24:      kernel-powerpc.config
-Source25:      kernel-ia64.config
 Source26:      kernel-arm.config
 Source27:      kernel-arm64.config
 
@@ -170,6 +169,7 @@ Patch85:    kernel-hostap.patch
 # see update-source.sh
 Patch145:      kernel-aufs.patch
 Patch147:      kernel-aufs-make.patch
+Patch148:      kernel-aufs-fixes.patch
 
 # Show normal colors in menuconfig with ncurses ABI 6
 Patch250:      kernel-fix_256colors_menuconfig.patch
@@ -233,7 +233,6 @@ Requires:   kmod >= %{kmod_ver}
 Requires:      cpuinfo(pae)
 %endif
 %endif
-Suggests:      crda
 Suggests:      dracut
 Suggests:      keyutils
 Suggests:      linux-firmware
@@ -277,7 +276,7 @@ Conflicts:  xfsprogs < 2.6.0
 %if %{with pae}
 ExclusiveArch: i686 pentium3 pentium4 athlon
 %else
-ExclusiveArch: i486 i586 i686 pentium3 pentium4 athlon %{x8664} x32 alpha %{arm} ia64 ppc ppc64 sparc sparc64 aarch64
+ExclusiveArch: i486 i586 i686 pentium3 pentium4 athlon %{x8664} x32 alpha %{arm} ppc ppc64 sparc sparc64 aarch64
 %endif
 ExclusiveOS:   Linux
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -307,11 +306,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _noautochrpath  .*%{_kernelsrcdir}/.*
 %define                _enable_debug_packages  0
 
-%ifarch ia64
-%define                initrd_dir      /boot/efi
-%else
 %define                initrd_dir      /boot
-%endif
 
 %define                topdir          %{_builddir}/%{name}-%{version}
 %define                srcdir          %{topdir}/linux-%{basever}
@@ -607,6 +602,7 @@ cd linux-%{basever}
 # aufs
 %patch145 -p1
 %patch147 -p1
+%patch148 -p1
 %endif
 
 %if %{with rescuecd}
@@ -948,11 +944,6 @@ cp -aL %{objdir}/.config $RPM_BUILD_ROOT/boot/config-%{kernel_release}
        install -p %{objdir}/vmlinux $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
        install -p %{objdir}/vmlinux $RPM_BUILD_ROOT/boot/vmlinux-%{kernel_release}
 %endif
-%ifarch ia64
-       %{__gzip} -cfv %{objdir}/vmlinux > %{objdir}/vmlinuz
-       cp -a %{objdir}/vmlinuz $RPM_BUILD_ROOT/boot/efi/vmlinuz-%{kernel_release}
-       ln -sf efi/vmlinuz-%{kernel_release} $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
-%endif
 %ifarch alpha sparc sparc64
        %{__gzip} -cfv %{objdir}/vmlinux > %{objdir}/vmlinuz
        cp -a %{objdir}/vmlinuz $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
@@ -1061,14 +1052,6 @@ fi
 %post
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
 if [[ "$CREATE_SYMLINKS" != [Nn][Oo] ]]; then
-%ifarch ia64
-       mv -f /boot/efi/vmlinuz{,.old} 2> /dev/null
-       ln -sf vmlinuz-%{kernel_release} /boot/efi/vmlinuz
-%if 0%{?alt_kernel:1}
-       mv -f /boot/efi/vmlinuz%{_alt_kernel}{,.old} 2> /dev/null
-       ln -sf vmlinuz-%{kernel_release} /boot/efi/vmlinuz%{_alt_kernel}
-%endif
-%endif
        mv -f /boot/vmlinuz{,.old} 2> /dev/null
        mv -f /boot/System.map{,.old} 2> /dev/null
        ln -sf vmlinuz-%{kernel_release} /boot/vmlinuz
@@ -1193,9 +1176,6 @@ fi
 %ifarch sparc sparc64
 /boot/vmlinux.aout-%{kernel_release}
 %endif
-%ifarch ia64
-/boot/efi/vmlinuz-%{kernel_release}
-%endif
 %ifarch %{arm} aarch64
 /boot/dtb-%{kernel_release}
 %endif
@@ -1374,7 +1354,6 @@ fi
 %endif
 %exclude %dir %{_kernelsrcdir}/arch/um
 %{_kernelsrcdir}/arch/*/kernel/asm-offsets*
-%{_kernelsrcdir}/arch/*/kernel/sigframe*.h
 %{_kernelsrcdir}/drivers/media/pci/bt8xx/bttv.h
 %{_kernelsrcdir}/kernel/bounds.c
 %{_kernelsrcdir}/scripts/basic/*.c
@@ -1425,7 +1404,6 @@ fi
 %defattr(644,root,root,755)
 %{_kernelsrcdir}/arch/*/[!Mik]*
 %{_kernelsrcdir}/arch/*/kernel/[!M]*
-%{_kernelsrcdir}/arch/ia64/install.sh
 %{_kernelsrcdir}/arch/m68k/ifpsp060/[!M]*
 %{_kernelsrcdir}/arch/m68k/ifpsp060/MISC
 %{_kernelsrcdir}/arch/m68k/install.sh
@@ -1438,11 +1416,11 @@ fi
 %exclude %{_kernelsrcdir}/arch/powerpc/lib/crtsavres.*
 %endif
 %{_kernelsrcdir}/arch/arm64/kvm
+%{_kernelsrcdir}/arch/loongarch/kvm
 %{_kernelsrcdir}/arch/mips/kvm
 %{_kernelsrcdir}/arch/s390/kvm
 %{_kernelsrcdir}/arch/x86/kvm
 %exclude %{_kernelsrcdir}/arch/*/kernel/asm-offsets*
-%exclude %{_kernelsrcdir}/arch/*/kernel/sigframe*.h
 %exclude %{_kernelsrcdir}/drivers/media/pci/bt8xx/bttv.h
 %{_kernelsrcdir}/block
 %{_kernelsrcdir}/certs
@@ -1464,7 +1442,6 @@ fi
 %exclude %{_kernelsrcdir}/scripts/Kbuild.include
 %exclude %{_kernelsrcdir}/scripts/Makefile*
 %exclude %{_kernelsrcdir}/scripts/basic
-%exclude %{_kernelsrcdir}/scripts/check-local-export
 %exclude %{_kernelsrcdir}/scripts/kconfig
 %exclude %{_kernelsrcdir}/scripts/mkcompile_h
 %exclude %{_kernelsrcdir}/scripts/mod