6.9 to 6.10 baseline (riscv64)
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
parent
380254b9db
commit
6fde178472
GPG Key ID:
7A5F42FAF91FACC3
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
8433
kernel-riscv64-debug-fedora.config
Normal file
8433
kernel-riscv64-debug-fedora.config
Normal file
File diff suppressed because it is too large
Load Diff
8402
kernel-riscv64-fedora.config
Normal file
8402
kernel-riscv64-fedora.config
Normal file
File diff suppressed because it is too large
Load Diff
31
kernel.spec
31
kernel.spec
@ -169,7 +169,7 @@ Summary: The Linux kernel
|
||||
# This is needed to do merge window version magic
|
||||
%define patchlevel 10
|
||||
# This allows pkg_release to have configurable %%{?dist} tag
|
||||
%define specrelease 0.rc3.20240612git2ef5971ff345.33%{?buildid}%{?dist}
|
||||
%define specrelease 0.rc3.20240612git2ef5971ff345.33%{?buildid}.0.riscv64%{?dist}
|
||||
# This defines the kabi tarball version
|
||||
%define kabiversion 6.10.0
|
||||
|
||||
@ -287,7 +287,7 @@ Summary: The Linux kernel
|
||||
# Want to build a vanilla kernel build without any non-upstream patches?
|
||||
%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}
|
||||
%else
|
||||
%define with_efiuki 0
|
||||
@ -541,6 +541,13 @@ Summary: The Linux kernel
|
||||
%define kernel_image arch/arm64/boot/vmlinuz.efi
|
||||
%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
|
||||
# printed out?
|
||||
%if %{nopatches}
|
||||
@ -643,7 +650,7 @@ Release: %{pkg_release}
|
||||
# DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
|
||||
# SET %%nobuildarches (ABOVE) INSTEAD
|
||||
%if 0%{?fedora}
|
||||
ExclusiveArch: noarch x86_64 s390x aarch64 ppc64le
|
||||
ExclusiveArch: noarch x86_64 s390x aarch64 ppc64le riscv64
|
||||
%else
|
||||
ExclusiveArch: noarch i386 i686 x86_64 s390x aarch64 ppc64le
|
||||
%endif
|
||||
@ -719,7 +726,7 @@ BuildRequires: zlib-devel binutils-devel
|
||||
%endif
|
||||
%if %{with_selftests}
|
||||
BuildRequires: clang llvm-devel fuse-devel
|
||||
%ifarch x86_64
|
||||
%ifarch x86_64 riscv64
|
||||
BuildRequires: lld
|
||||
%endif
|
||||
BuildRequires: libcap-devel libcap-ng-devel rsync libmnl-devel
|
||||
@ -904,6 +911,8 @@ Source58: %{name}-s390x-fedora.config
|
||||
Source59: %{name}-s390x-debug-fedora.config
|
||||
Source60: %{name}-x86_64-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
|
||||
%endif
|
||||
@ -954,11 +963,13 @@ Source201: Module.kabi_aarch64
|
||||
Source202: Module.kabi_ppc64le
|
||||
Source203: Module.kabi_s390x
|
||||
Source204: Module.kabi_x86_64
|
||||
Source205: Module.kabi_riscv64
|
||||
|
||||
Source210: Module.kabi_dup_aarch64
|
||||
Source211: Module.kabi_dup_ppc64le
|
||||
Source212: Module.kabi_dup_s390x
|
||||
Source213: Module.kabi_dup_x86_64
|
||||
Source214: Module.kabi_dup_riscv64
|
||||
|
||||
Source300: kernel-abi-stablelists-%{kabiversion}.tar.xz
|
||||
Source301: kernel-kabi-dw-%{kabiversion}.tar.xz
|
||||
@ -1885,6 +1896,7 @@ GetArch()
|
||||
*aarch64*) echo "aarch64" ;;
|
||||
*ppc64le*) echo "ppc64le" ;;
|
||||
*s390x*) echo "s390x" ;;
|
||||
*riscv64*) echo "riscv64" ;;
|
||||
*x86_64*) echo "x86_64" ;;
|
||||
# no arch, apply everywhere
|
||||
*) echo "" ;;
|
||||
@ -2133,7 +2145,7 @@ BuildKernel() {
|
||||
mkdir -p $RPM_BUILD_ROOT%{debuginfodir}/%{image_install_path}
|
||||
%endif
|
||||
|
||||
%ifarch aarch64
|
||||
%ifarch aarch64 riscv64
|
||||
%{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 INSTALL_DTBS_PATH=$RPM_BUILD_ROOT/%{image_install_path}/dtb-$KernelVer
|
||||
@ -3155,7 +3167,7 @@ find $RPM_BUILD_ROOT/usr/include \
|
||||
%endif
|
||||
|
||||
%if %{with_cross_headers}
|
||||
HDR_ARCH_LIST='arm64 powerpc s390 x86'
|
||||
HDR_ARCH_LIST='arm64 powerpc s390 x86 riscv64'
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/tmp-headers
|
||||
|
||||
for arch in $HDR_ARCH_LIST; do
|
||||
@ -3671,7 +3683,7 @@ fi\
|
||||
%endif
|
||||
|
||||
%if %{with_kabidw_base}
|
||||
%ifarch x86_64 s390x ppc64 ppc64le aarch64
|
||||
%ifarch x86_64 s390x ppc64 ppc64le aarch64 riscv64
|
||||
%files kernel-kabidw-base-internal
|
||||
%defattr(-,root,root)
|
||||
/kabidw-base/%{_target_cpu}/*
|
||||
@ -3878,7 +3890,7 @@ fi\
|
||||
%ghost /%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?3:+%{3}}\
|
||||
/lib/modules/%{KVERREL}%{?3:+%{3}}/.vmlinuz.hmac \
|
||||
%ghost /%{image_install_path}/.vmlinuz-%{KVERREL}%{?3:+%{3}}.hmac \
|
||||
%ifarch aarch64\
|
||||
%ifarch aarch64 riscv64\
|
||||
/lib/modules/%{KVERREL}%{?3:+%{3}}/dtb \
|
||||
%ghost /%{image_install_path}/dtb-%{KVERREL}%{?3:+%{3}} \
|
||||
%endif\
|
||||
@ -4018,6 +4030,9 @@ fi\
|
||||
#
|
||||
#
|
||||
%changelog
|
||||
* Thu Jun 13 2024 David Abdurachmanov <davidlt@rivosinc.com> [6.10.0-0.rc3.2ef5971ff345.33.0.riscv64]
|
||||
- Add riscv64
|
||||
|
||||
* Wed Jun 12 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc3.2ef5971ff345.33]
|
||||
- gitlab-ci: merge ark-latest before tagging cki-gating (Michael Hofmann)
|
||||
- Linux v6.10.0-0.rc3.2ef5971ff345
|
||||
|
||||
Loading…
Reference in New Issue
Block a user