Initial import from v6.10 (riscv64)
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
parent
af65a1ad40
commit
5ef3b1544c
0
Module.kabi_dup_riscv64
Normal file
0
Module.kabi_dup_riscv64
Normal file
0
Module.kabi_riscv64
Normal file
0
Module.kabi_riscv64
Normal file
8495
kernel-riscv64-debug-fedora.config
Normal file
8495
kernel-riscv64-debug-fedora.config
Normal file
File diff suppressed because it is too large
Load Diff
8464
kernel-riscv64-fedora.config
Normal file
8464
kernel-riscv64-fedora.config
Normal file
File diff suppressed because it is too large
Load Diff
35
kernel.spec
35
kernel.spec
@ -169,7 +169,7 @@ Summary: The Linux kernel
|
|||||||
# This is needed to do merge window version magic
|
# This is needed to do merge window version magic
|
||||||
%define patchlevel 11
|
%define patchlevel 11
|
||||||
# This allows pkg_release to have configurable %%{?dist} tag
|
# This allows pkg_release to have configurable %%{?dist} tag
|
||||||
%define specrelease 0.rc5.20240827git3e9bff3bbe13.44%{?buildid}%{?dist}
|
%define specrelease 0.rc5.20240827git3e9bff3bbe13.44%{?buildid}.0.riscv64%{?dist}
|
||||||
# This defines the kabi tarball version
|
# This defines the kabi tarball version
|
||||||
%define kabiversion 6.11.0
|
%define kabiversion 6.11.0
|
||||||
|
|
||||||
@ -287,7 +287,7 @@ Summary: The Linux kernel
|
|||||||
# Want to build a vanilla kernel build without any non-upstream patches?
|
# Want to build a vanilla kernel build without any non-upstream patches?
|
||||||
%define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
|
%define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
|
||||||
|
|
||||||
%ifarch x86_64 aarch64
|
%ifarch x86_64 aarch64 riscv64
|
||||||
%define with_efiuki %{?_without_efiuki: 0} %{?!_without_efiuki: 1}
|
%define with_efiuki %{?_without_efiuki: 0} %{?!_without_efiuki: 1}
|
||||||
%else
|
%else
|
||||||
%define with_efiuki 0
|
%define with_efiuki 0
|
||||||
@ -541,6 +541,13 @@ Summary: The Linux kernel
|
|||||||
%define kernel_image arch/arm64/boot/vmlinuz.efi
|
%define kernel_image arch/arm64/boot/vmlinuz.efi
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%ifarch riscv64
|
||||||
|
%define asmarch riscv
|
||||||
|
%define hdrarch riscv
|
||||||
|
%define make_target vmlinuz.efi
|
||||||
|
%define kernel_image arch/riscv/boot/vmlinuz.efi
|
||||||
|
%endif
|
||||||
|
|
||||||
# Should make listnewconfig fail if there's config options
|
# Should make listnewconfig fail if there's config options
|
||||||
# printed out?
|
# printed out?
|
||||||
%if %{nopatches}
|
%if %{nopatches}
|
||||||
@ -580,9 +587,9 @@ Summary: The Linux kernel
|
|||||||
|
|
||||||
# Architectures we build tools/cpupower on
|
# Architectures we build tools/cpupower on
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
%define cpupowerarchs %{ix86} x86_64 ppc64le aarch64
|
%define cpupowerarchs %{ix86} x86_64 ppc64le aarch64 riscv64
|
||||||
%else
|
%else
|
||||||
%define cpupowerarchs i686 x86_64 ppc64le aarch64
|
%define cpupowerarchs i686 x86_64 ppc64le aarch64 riscv64
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Architectures we build kernel livepatching selftests on
|
# Architectures we build kernel livepatching selftests on
|
||||||
@ -643,7 +650,7 @@ Release: %{pkg_release}
|
|||||||
# DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
|
# DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
|
||||||
# SET %%nobuildarches (ABOVE) INSTEAD
|
# SET %%nobuildarches (ABOVE) INSTEAD
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
ExclusiveArch: noarch x86_64 s390x aarch64 ppc64le
|
ExclusiveArch: noarch x86_64 s390x aarch64 ppc64le riscv64
|
||||||
%else
|
%else
|
||||||
ExclusiveArch: noarch i386 i686 x86_64 s390x aarch64 ppc64le
|
ExclusiveArch: noarch i386 i686 x86_64 s390x aarch64 ppc64le
|
||||||
%endif
|
%endif
|
||||||
@ -719,7 +726,7 @@ BuildRequires: zlib-devel binutils-devel llvm-devel
|
|||||||
%endif
|
%endif
|
||||||
%if %{with_selftests}
|
%if %{with_selftests}
|
||||||
BuildRequires: clang llvm-devel fuse-devel
|
BuildRequires: clang llvm-devel fuse-devel
|
||||||
%ifarch x86_64
|
%ifarch x86_64 riscv64
|
||||||
BuildRequires: lld
|
BuildRequires: lld
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: libcap-devel libcap-ng-devel rsync libmnl-devel
|
BuildRequires: libcap-devel libcap-ng-devel rsync libmnl-devel
|
||||||
@ -906,6 +913,8 @@ Source58: %{name}-s390x-fedora.config
|
|||||||
Source59: %{name}-s390x-debug-fedora.config
|
Source59: %{name}-s390x-debug-fedora.config
|
||||||
Source60: %{name}-x86_64-fedora.config
|
Source60: %{name}-x86_64-fedora.config
|
||||||
Source61: %{name}-x86_64-debug-fedora.config
|
Source61: %{name}-x86_64-debug-fedora.config
|
||||||
|
Source700: %{name}-riscv64-fedora.config
|
||||||
|
Source701: %{name}-riscv64-debug-fedora.config
|
||||||
|
|
||||||
Source62: def_variants.yaml.fedora
|
Source62: def_variants.yaml.fedora
|
||||||
%endif
|
%endif
|
||||||
@ -959,11 +968,13 @@ Source201: Module.kabi_aarch64
|
|||||||
Source202: Module.kabi_ppc64le
|
Source202: Module.kabi_ppc64le
|
||||||
Source203: Module.kabi_s390x
|
Source203: Module.kabi_s390x
|
||||||
Source204: Module.kabi_x86_64
|
Source204: Module.kabi_x86_64
|
||||||
|
Source205: Module.kabi_riscv64
|
||||||
|
|
||||||
Source210: Module.kabi_dup_aarch64
|
Source210: Module.kabi_dup_aarch64
|
||||||
Source211: Module.kabi_dup_ppc64le
|
Source211: Module.kabi_dup_ppc64le
|
||||||
Source212: Module.kabi_dup_s390x
|
Source212: Module.kabi_dup_s390x
|
||||||
Source213: Module.kabi_dup_x86_64
|
Source213: Module.kabi_dup_x86_64
|
||||||
|
Source214: Module.kabi_dup_riscv64
|
||||||
|
|
||||||
Source300: kernel-abi-stablelists-%{kabiversion}.tar.xz
|
Source300: kernel-abi-stablelists-%{kabiversion}.tar.xz
|
||||||
Source301: kernel-kabi-dw-%{kabiversion}.tar.xz
|
Source301: kernel-kabi-dw-%{kabiversion}.tar.xz
|
||||||
@ -1913,6 +1924,7 @@ GetArch()
|
|||||||
*aarch64*) echo "aarch64" ;;
|
*aarch64*) echo "aarch64" ;;
|
||||||
*ppc64le*) echo "ppc64le" ;;
|
*ppc64le*) echo "ppc64le" ;;
|
||||||
*s390x*) echo "s390x" ;;
|
*s390x*) echo "s390x" ;;
|
||||||
|
*riscv64*) echo "riscv64" ;;
|
||||||
*x86_64*) echo "x86_64" ;;
|
*x86_64*) echo "x86_64" ;;
|
||||||
# no arch, apply everywhere
|
# no arch, apply everywhere
|
||||||
*) echo "" ;;
|
*) echo "" ;;
|
||||||
@ -2161,7 +2173,7 @@ BuildKernel() {
|
|||||||
mkdir -p $RPM_BUILD_ROOT%{debuginfodir}/%{image_install_path}
|
mkdir -p $RPM_BUILD_ROOT%{debuginfodir}/%{image_install_path}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%ifarch aarch64
|
%ifarch aarch64 riscv64
|
||||||
%{log_msg "Build dtb kernel"}
|
%{log_msg "Build dtb kernel"}
|
||||||
%{make} ARCH=$Arch dtbs INSTALL_DTBS_PATH=$RPM_BUILD_ROOT/%{image_install_path}/dtb-$KernelVer
|
%{make} ARCH=$Arch dtbs INSTALL_DTBS_PATH=$RPM_BUILD_ROOT/%{image_install_path}/dtb-$KernelVer
|
||||||
%{make} ARCH=$Arch dtbs_install INSTALL_DTBS_PATH=$RPM_BUILD_ROOT/%{image_install_path}/dtb-$KernelVer
|
%{make} ARCH=$Arch dtbs_install INSTALL_DTBS_PATH=$RPM_BUILD_ROOT/%{image_install_path}/dtb-$KernelVer
|
||||||
@ -3220,7 +3232,7 @@ find $RPM_BUILD_ROOT/usr/include \
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{with_cross_headers}
|
%if %{with_cross_headers}
|
||||||
HDR_ARCH_LIST='arm64 powerpc s390 x86'
|
HDR_ARCH_LIST='arm64 powerpc s390 x86 riscv'
|
||||||
mkdir -p $RPM_BUILD_ROOT/usr/tmp-headers
|
mkdir -p $RPM_BUILD_ROOT/usr/tmp-headers
|
||||||
|
|
||||||
for arch in $HDR_ARCH_LIST; do
|
for arch in $HDR_ARCH_LIST; do
|
||||||
@ -3742,7 +3754,7 @@ fi\
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{with_kabidw_base}
|
%if %{with_kabidw_base}
|
||||||
%ifarch x86_64 s390x ppc64 ppc64le aarch64
|
%ifarch x86_64 s390x ppc64 ppc64le aarch64 riscv64
|
||||||
%files kernel-kabidw-base-internal
|
%files kernel-kabidw-base-internal
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
/kabidw-base/%{_target_cpu}/*
|
/kabidw-base/%{_target_cpu}/*
|
||||||
@ -3949,7 +3961,7 @@ fi\
|
|||||||
%ghost /%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?3:+%{3}}\
|
%ghost /%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?3:+%{3}}\
|
||||||
/lib/modules/%{KVERREL}%{?3:+%{3}}/.vmlinuz.hmac \
|
/lib/modules/%{KVERREL}%{?3:+%{3}}/.vmlinuz.hmac \
|
||||||
%ghost /%{image_install_path}/.vmlinuz-%{KVERREL}%{?3:+%{3}}.hmac \
|
%ghost /%{image_install_path}/.vmlinuz-%{KVERREL}%{?3:+%{3}}.hmac \
|
||||||
%ifarch aarch64\
|
%ifarch aarch64 riscv64\
|
||||||
/lib/modules/%{KVERREL}%{?3:+%{3}}/dtb \
|
/lib/modules/%{KVERREL}%{?3:+%{3}}/dtb \
|
||||||
%ghost /%{image_install_path}/dtb-%{KVERREL}%{?3:+%{3}} \
|
%ghost /%{image_install_path}/dtb-%{KVERREL}%{?3:+%{3}} \
|
||||||
%endif\
|
%endif\
|
||||||
@ -4098,6 +4110,9 @@ fi\
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Aug 29 2024 David Abdurachmanov <davidlt@rivosinc.com> [6.11.0-0.rc5.3e9bff3bbe13.44.0.riscv64]
|
||||||
|
- Add support for riscv64
|
||||||
|
|
||||||
* Tue Aug 27 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc5.3e9bff3bbe13.44]
|
* Tue Aug 27 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc5.3e9bff3bbe13.44]
|
||||||
- Linux v6.11.0-0.rc5.3e9bff3bbe13
|
- Linux v6.11.0-0.rc5.3e9bff3bbe13
|
||||||
|
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user