Update configs

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>

filter-riscv64.sh.fedora

@@ -0,0 +1,16 @@
+#! /bin/bash
+
+# This is the riscv64 override file for the core/drivers package split.  The
+# module directories listed here and in the generic list in filter-modules.sh
+# will be moved to the resulting kernel-modules package for this arch.
+# Anything not listed in those files will be in the kernel-core package.
+#
+# Please review the default list in filter-modules.sh before making
+# modifications to the overrides below.  If something should be removed across
+# all arches, remove it in the default instead of per-arch.
+
+# Differences from default (matches aarch64):
+# - Removed mfd and platform (i.e. needed in core)
+# - Added message (i.e. not needed in core)
+# - Removed mmc (i.e. need mmc in core)
+driverdirs="atm auxdisplay bcma bluetooth firewire fmc fpga infiniband isdn leds media memstick message mtd nfc ntb pcmcia power ssb soundwire staging tty uio uwb w1"

kernel-aarch64-debug-fedora.config

@@ -4140,6 +4140,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m

kernel-aarch64-fedora.config

@@ -4121,6 +4121,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m

kernel-armv7hl-debug-fedora.config

@@ -4220,6 +4220,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m

kernel-armv7hl-fedora.config

@@ -4202,6 +4202,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m

kernel-armv7hl-lpae-debug-fedora.config

@@ -4120,6 +4120,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m

kernel-armv7hl-lpae-fedora.config

@@ -4102,6 +4102,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m

kernel-i686-debug-fedora.config

@@ -273,6 +273,7 @@ CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_PTDUMP_DEBUGFS=y
 # CONFIG_ARM_SMC_WATCHDOG is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
+# CONFIG_ARM_TIMER_SP804 is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASUS_LAPTOP=m
 CONFIG_ASUS_NB_WMI=m
@@ -3813,6 +3814,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m

kernel-i686-fedora.config

@@ -272,6 +272,7 @@ CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 # CONFIG_ARM_SMC_WATCHDOG is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
+# CONFIG_ARM_TIMER_SP804 is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASUS_LAPTOP=m
 CONFIG_ASUS_NB_WMI=m
@@ -3794,6 +3795,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m

kernel-ppc64le-debug-fedora.config

@@ -216,6 +216,7 @@ CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_PTDUMP_DEBUGFS=y
 # CONFIG_ARM_SMC_WATCHDOG is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
+# CONFIG_ARM_TIMER_SP804 is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
@@ -3514,6 +3515,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m

kernel-ppc64le-fedora.config

@@ -215,6 +215,7 @@ CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 # CONFIG_ARM_SMC_WATCHDOG is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
+# CONFIG_ARM_TIMER_SP804 is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
@@ -3494,6 +3495,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m

kernel-s390x-debug-fedora.config

@@ -220,6 +220,7 @@ CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_PTDUMP_DEBUGFS=y
 # CONFIG_ARM_SMC_WATCHDOG is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
+# CONFIG_ARM_TIMER_SP804 is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
@@ -3485,6 +3486,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m

kernel-s390x-fedora.config

@@ -219,6 +219,7 @@ CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 # CONFIG_ARM_SMC_WATCHDOG is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
+# CONFIG_ARM_TIMER_SP804 is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
@@ -3465,6 +3466,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m

kernel-x86_64-debug-fedora.config

@@ -275,6 +275,7 @@ CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_PTDUMP_DEBUGFS=y
 # CONFIG_ARM_SMC_WATCHDOG is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
+# CONFIG_ARM_TIMER_SP804 is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASUS_LAPTOP=m
 CONFIG_ASUS_NB_WMI=m
@@ -3852,6 +3853,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m

kernel-x86_64-fedora.config

@@ -274,6 +274,7 @@ CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 # CONFIG_ARM_SMC_WATCHDOG is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
+# CONFIG_ARM_TIMER_SP804 is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASUS_LAPTOP=m
 CONFIG_ASUS_NB_WMI=m
@@ -3833,6 +3834,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m

kernel.spec

@@ -75,7 +75,7 @@ Summary: The Linux kernel
 %define patchlevel 8
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 1%{?buildid}%{?dist}
+%define specrelease 1%{?buildid}.0.riscv64%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -390,6 +390,15 @@ Summary: The Linux kernel
 %define kernel_image arch/arm64/boot/Image.gz
 %endif
 
+%ifarch riscv64
+%define all_arch_configs kernel-%{version}-riscv64*.config
+%define asmarch riscv
+%define hdrarch riscv
+%define make_target Image.gz
+%define kernel_image arch/riscv/boot/Image.gz
+%endif
+
+
 # Should make listnewconfig fail if there's config options
 # printed out?
 %if %{nopatches}
@@ -459,7 +468,7 @@ Release: %{pkg_release}
 # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
 # SET %%nobuildarches (ABOVE) INSTEAD
 %if 0%{?fedora}
-ExclusiveArch: x86_64 s390x %{arm} aarch64 ppc64le
+ExclusiveArch: x86_64 s390x %{arm} aarch64 ppc64le riscv64
 %else
 ExclusiveArch: noarch i386 i686 x86_64 s390x %{arm} aarch64 ppc64le
 %endif
@@ -638,6 +647,7 @@ Source82: filter-i686.sh.fedora
 Source83: filter-aarch64.sh.fedora
 Source86: filter-ppc64le.sh.fedora
 Source87: filter-s390x.sh.fedora
+Source88: filter-riscv64.sh.fedora
 Source89: filter-modules.sh.fedora
 
 Source90: filter-x86_64.sh.rhel
@@ -673,6 +683,8 @@ Source47: kernel-s390x-fedora.config
 Source48: kernel-s390x-debug-fedora.config
 Source49: kernel-x86_64-fedora.config
 Source50: kernel-x86_64-debug-fedora.config
+Source60: kernel-riscv64-fedora.config
+Source61: kernel-riscv64-debug-fedora.config
 
 
 
@@ -1608,7 +1620,7 @@ BuildKernel() {
     mkdir -p $RPM_BUILD_ROOT%{debuginfodir}/%{image_install_path}
 %endif
 
-%ifarch %{arm} aarch64
+%ifarch %{arm} aarch64 riscv64
     %{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
     cp -r $RPM_BUILD_ROOT/%{image_install_path}/dtb-$KernelVer $RPM_BUILD_ROOT/lib/modules/$KernelVer/dtb
@@ -2297,7 +2309,7 @@ find $RPM_BUILD_ROOT/usr/include \
 
 %if %{with_cross_headers}
 %if 0%{?fedora}
-HDR_ARCH_LIST='arm arm64 powerpc s390 x86'
+HDR_ARCH_LIST='arm arm64 powerpc s390 x86 riscv64'
 %else
 HDR_ARCH_LIST='arm64 powerpc s390 x86'
 %endif
@@ -2780,7 +2792,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 %{arm} aarch64\
+%ifarch %{arm} aarch64 riscv64\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/dtb \
 %ghost /%{image_install_path}/dtb-%{KVERREL}%{?3:+%{3}} \
 %endif\