开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 6

_service:tar_scm:kernel.spec Changed

@@ -1,25 +1,28 @@
 %global KernelVer %{version}-%{release}.%{_target_cpu}
-%global Arch $(echo %{_host_cpu} | sed -e s/riscv.*/riscv/)
-%global with_perf 1
+# The obs worker of RISC-V runs in cross-arch qemu virt, which support 
+# multi-thread maxmium of 8.
+%global _smp_mflags -j8
 
 %define with_source 1
-
+%define with_release 1
 
 %global debug_package %{nil}
 
-Name:	 kernel
-Version: 5.10.0
-Release: 11
-Summary: Linux Kernel for RISC-V 
+%global hw_flag -hw
+
+Name:	 kernel%{hw_flag}
+Version: 6.1.8
+Release: 1
+Summary: Linux Kernel for RISC-V
 URL:	 http://www.kernel.org/
 License: GPLv2
 
+%global commit 937381741d02cc6594477c593b2f3a087b3a0bc1
+# The source tarball is compressed by OBS automactically, if you wanted to do a local rpmbuilding, the tarball can be obtained via : https://gitee.com/openeuler/kernel/repository/archive/OLK-%{version}.zip
+# The 
 Source0: risc-v-kernel-%{version}.tar.bz2
 Source1: openEuler_riscv64_defconfig
-Source2: cpupower.service
-Source3: cpupower.config
-Patch1:  0001-fix-task-size-min-macro.patch
-Patch2:  0002-backport-Make-mmap-with-PROT_WRITE-imply-PROT_READ.patch
+Source2: extend_defconfig
 
 BuildRequires: module-init-tools, patch >= 2.5.4, bash >= 2.03, tar
 BuildRequires: bzip2, xz, findutils, gzip, m4, perl, make >= 3.78, diffutils, gawk
@@ -37,8 +40,6 @@
 BuildRequires: numactl-devel python3-devel glibc-static python3-docutils
 BuildRequires: perl-generators perl(Carp) gtk2-devel libbabeltrace-devel 
 BuildRequires: rsync
-BuildRequires: flex xz-devel libzstd-devel
-BuildRequires: java-devel
 
 AutoReq: no
 AutoProv: yes
@@ -59,34 +60,14 @@
 %package devel
 Summary: Development package for building kernel modules to match the %{KernelVer} kernel
 AutoReqProv: no
+Provides: %{name}-headers = %{version}
+Obsoletes: %{name}-headers < %{version}
+Provides: glibc-kernheaders
 Provides: kernel-devel-uname-r = %{KernelVer}
 
 %description devel
 This package provides kernel headers and makefiles sufficient to build modules.
 
-%package tools
-Summary: Assortment of tools for the Linux kernel
-Provides: %{name}-tools-libs
-Obsoletes: %{name}-tools-libs
-Provides:  cpufreq-utils = 1:009-0.6.p1
-Provides:  cpufrequtils = 1:009-0.6.p1
-Obsoletes: cpufreq-utils < 1:009-0.6.p1
-Obsoletes: cpufrequtils < 1:009-0.6.p1
-Obsoletes: cpuspeed < 1:1.5-16
-%description tools
-This package contains the tools/ directory from the kernel source
-and the supporting documentation.
-
-%package tools-devel
-Summary: Assortment of tools for the Linux kernel
-Requires: kernel-tools = %{version}-%{release}
-Requires: kernel-tools-libs = %{version}-%{release}
-Provides: kernel-tools-libs-devel = %{version}-%{release}
-Obsoletes: kernel-tools-libs-devel
-%description tools-devel
-This package contains the development files for the tools/ directory from
-the kernel source.
-
 %if 0%{?with_perf}
 %package -n perf
 Summary: Performance monitoring for the Linux kernel
@@ -142,11 +123,9 @@
 mv ./risc-v-kernel-%{version}  linux-%{KernelVer}
 
 cd linux-%{KernelVer}
-%patch1 -p1
-%patch2 -p1
-
 touch .scmversion
 
+
 find . $ -name "*.orig" -o -name "*~" -o -name "\.*" $ -exec rm -f {} \; >/dev/null
 find . -name .gitignore -exec rm -f {} \; >/dev/null
 
@@ -155,67 +134,24 @@
 cp -a ../linux-%{KernelVer} ../linux-%{KernelVer}-source
 %endif
 
-%if 0%{?with_perf}
-cp -a tools/perf tools/python3-perf
-%endif
-
 %build
 cd linux-%{KernelVer}
 
-perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}.%{_target_cpu}/" Makefile
-
 # merge additional configure to defconfig
-cat %{arch_config} >> arch/%{Arch}/configs/defconfig
-
-make -s mrproper %{?_smp_mflags}
-make ARCH=%{Arch} defconfig
-make ARCH=%{Arch} %{?_smp_mflags}
-make ARCH=%{Arch} %{?_smp_mflags} modules
-
-## make tools
-%if 0%{?with_perf}
-# perf
-%global perf_make make EXTRA_CFLAGS="-Wl,-z,now -g -Wall -fstack-protector-strong -fPIC" EXTRA_PERFLIBS="-fpie -pie" %{?_smp_mflags} -s V=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_LIBNUMA=1 NO_STRLCPY=1 prefix=%{_prefix}
-
-%global perf_python3 -C tools/perf PYTHON=%{__python3}
-
-
-chmod +x tools/perf/check-headers.sh
-# perf
-# make sure check-headers.sh is executable
-chmod +x tools/python3-perf/check-headers.sh
-%{perf_make} %{perf_python3} all
+ARCH=$(head -1 %{arch_config} | gawk -F' '  '{print $2}')
+cp %{SOURCE2} arch/${ARCH}/configs/defconfig
+cat %{arch_config} >> arch/${ARCH}/configs/defconfig
 
-pushd tools/perf/Documentation/
-make %{?_smp_mflags} man
-popd
-%endif
+make -s mrproper
+make ARCH=${ARCH} defconfig
+make ARCH=${ARCH} %{?_smp_mflags}
+make ARCH=${ARCH} %{?_smp_mflags} modules
 
 # bpftool
 pushd tools/bpf/bpftool
 make %{?_smp_mflags}
 popd
 
-# cpupower
-chmod +x tools/power/cpupower/utils/version-gen.sh
-make %{?_smp_mflags} -C tools/power/cpupower CPUFREQ_BENCH=false
-# thermal
-pushd tools/thermal/tmon/
-make
-popd
-# iio
-pushd tools/iio/
-make
-popd
-# gpio
-pushd tools/gpio/
-make
-popd
-# kvm
-pushd tools/kvm/kvm_stat/
-make %{?_smp_mflags} man
-popd
-
 %install
 %if 0%{?with_source}
     %define _python_bytecompile_errors_terminate_build 0
@@ -225,23 +161,31 @@
 %endif
 
 cd linux-%{KernelVer}
+mkdir -p $RPM_BUILD_ROOT/boot
+install -m 644 .config $RPM_BUILD_ROOT/boot/config-%{KernelVer}
 # Currently need the flatten kernel image as opensbi payload
+%if 0%{!?with_release}
 TargetImage=$(find . -name Image)
 TargetgzImage=$(find . -name Image.gz)
-mkdir -p $RPM_BUILD_ROOT/boot
-install -m 755 ${TargetImage} $RPM_BUILD_ROOT/boot 
-install -m 755 ${TargetgzImage} $RPM_BUILD_ROOT/boot 
-install -m 644 .config  $RPM_BUILD_ROOT/boot/config-%{KernelVer}
+install -m 755 ${TargetImage} $RPM_BUILD_ROOT/boot
+install -m 755 ${TargetgzImage} $RPM_BUILD_ROOT/boot
+%else
+mkdir -p $RPM_BUILD_ROOT/boot/dtbs
+make ARCH=%{hd_arch} INSTALL_PATH=$RPM_BUILD_ROOT/boot zinstall KERNELRELEASE=%{KernelVer} 
+dd if=/dev/zero of=$RPM_BUILD_ROOT/boot/initramfs-%{KernelVer}.img bs=1M count=20
+%endif
 
+make ARCH=%{hd_arch} INSTALL_DTBS_PATH=$RPM_BUILD_ROOT/boot/dtbs dtbs_install KERNELRELEASE=%{KernelVer} 
 # kernel_headers
 make ARCH=%{hd_arch} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr KBUILD_SRC= headers_install

_service:tar_scm:0001-fix-task-size-min-macro.patch Deleted

@@ -1,43 +0,0 @@
-From 2970e715be56df5926481e89bad4bdbfa5ba474b Mon Sep 17 00:00:00 2001
-From: wangjunqiang <wangjunqiang@iscas.ac.cn>
-Date: Thu, 10 Nov 2022 08:40:08 +0000
-Subject: PATCH fix task size min macro
-
----
- arch/riscv/include/asm/pgtable-64.h | 4 ++++
- arch/riscv/include/asm/pgtable.h    | 2 ++
- 2 files changed, 6 insertions(+)
-
-diff --git a/arch/riscv/include/asm/pgtable-64.h b/arch/riscv/include/asm/pgtable-64.h
-index 0e863f3f7..e8305be7b 100644
---- a/arch/riscv/include/asm/pgtable-64.h
-+++ b/arch/riscv/include/asm/pgtable-64.h
-@@ -8,6 +8,10 @@
- 
- #include <linux/const.h>
- 
-+#define PGDIR_SHIFT_L3  30
-+#define PGDIR_SHIFT_L4  39
-+#define PGDIR_SIZE_L3   (_AC(1, UL) << PGDIR_SHIFT_L3)
-+
- #define PGDIR_SHIFT     30
- /* Size of region mapped by a page global directory */
- #define PGDIR_SIZE      (_AC(1, UL) << PGDIR_SHIFT)
-diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
-index 73e8b5e5b..214295b71 100644
---- a/arch/riscv/include/asm/pgtable.h
-+++ b/arch/riscv/include/asm/pgtable.h
-@@ -447,8 +447,10 @@ static inline int ptep_clear_flush_young(struct vm_area_struct *vma,
-  */
- #ifdef CONFIG_64BIT
- #define TASK_SIZE (PGDIR_SIZE * PTRS_PER_PGD / 2)
-+#define TASK_SIZE_MIN  (PGDIR_SIZE_L3 * PTRS_PER_PGD / 2)
- #else
- #define TASK_SIZE FIXADDR_START
-+#define TASK_SIZE_MIN	TASK_SIZE
- #endif
- 
- #else /* CONFIG_MMU */
--- 
-2.31.1
-

_service:tar_scm:0002-backport-Make-mmap-with-PROT_WRITE-imply-PROT_READ.patch Deleted

@@ -1,66 +0,0 @@
-From 75a0cfefa0f051fba68682d2b18c26be6cd1a06e Mon Sep 17 00:00:00 2001
-From: Mingzheng Xing <xingmingzheng@iscas.ac.cn>
-Date: Thu, 19 Jan 2023 12:31:34 +0800
-Subject: PATCH backport: Make mmap() with PROT_WRITE imply PROT_READ
-
-commit 8aeb7b17f04ef40f620c763502e2b644c5c73efd
-Merge: c45fc916c2b2 9e2e6042a7ec
-Author: Palmer Dabbelt <palmer@rivosinc.com>
-Date:   Thu Oct 13 12:49:12 2022 -0700
-
-    RISC-V: Make mmap() with PROT_WRITE imply PROT_READ
-
-    Commit 2139619bcad7 ("riscv: mmap with PROT_WRITE but no PROT_READ is
-    invalid") made mmap() reject mappings with only PROT_WRITE set in an
-    attempt to fix an observed inconsistency in behavior when attempting
-    to read from a PROT_WRITE-only mapping. The root cause of this behavior
-    was actually that while RISC-V's protection_map maps VM_WRITE to
-    readable PTE permissions (since write-only PTEs are considered reserved
-    by the privileged spec), the page fault handler considered loads from
-    VM_WRITE-only VMAs illegal accesses. Fix the underlying cause by
-    handling faults in VM_WRITE-only VMAs (patch 1) and then re-enable
-    use of mmap(PROT_WRITE) (patch 2), making RISC-V's behavior consistent
-    with all other architectures that don't support write-only PTEs.
-
-    * remotes/palmer/riscv-wonly:
-      riscv: Allow PROT_WRITE-only mmap()
-      riscv: Make VM_WRITE imply VM_READ
-
-    Link: https://lore.kernel.org/r/20220915193702.2201018-1-abrestic@rivosinc.com/
-    Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
----
- arch/riscv/kernel/sys_riscv.c | 3 ---
- arch/riscv/mm/fault.c         | 3 ++-
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/arch/riscv/kernel/sys_riscv.c b/arch/riscv/kernel/sys_riscv.c
-index 8a7880b9c433..bb402685057a 100644
---- a/arch/riscv/kernel/sys_riscv.c
-+++ b/arch/riscv/kernel/sys_riscv.c
-@@ -18,9 +18,6 @@ static long riscv_sys_mmap(unsigned long addr, unsigned long len,
- 	if (unlikely(offset & (~PAGE_MASK >> page_shift_offset)))
- 		return -EINVAL;
- 
--	if (unlikely((prot & PROT_WRITE) && !(prot & PROT_READ)))
--		return -EINVAL;
--
- 	return ksys_mmap_pgoff(addr, len, prot, flags, fd,
- 			       offset >> (PAGE_SHIFT - page_shift_offset));
- }
-diff --git a/arch/riscv/mm/fault.c b/arch/riscv/mm/fault.c
-index 3c8b9e433c67..8f84bbe0ac33 100644
---- a/arch/riscv/mm/fault.c
-+++ b/arch/riscv/mm/fault.c
-@@ -167,7 +167,8 @@ static inline bool access_error(unsigned long cause, struct vm_area_struct *vma)
- 		}
- 		break;
- 	case EXC_LOAD_PAGE_FAULT:
--		if (!(vma->vm_flags & VM_READ)) {
-+		/* Write implies read */
-+		if (!(vma->vm_flags & (VM_READ | VM_WRITE))) {
- 			return true;
- 		}
- 		break;
--- 
-2.34.1
-

_service Changed

_service:recompress:tar_scm:risc-v-kernel-5.10.0.tar.bz2 -> _service:recompress:tar_scm:risc-v-kernel-6.1.8.tar.bz2 Changed

_service:tar_scm:cpupower.config Deleted

_service:tar_scm:cpupower.service Deleted

_service:tar_scm:extend_defconfig Added

@@ -0,0 +1,345 @@
+# riscv <= ARCH
+
+###
+### For USB Tethering support
+###
+
+CONFIG_USB_NET_DRIVERS=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
+CONFIG_USB_NET_CDC_SUBSET=m
+
+###
+### from Samuel Yuen's working config
+###
+CONFIG_AUDIT=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_PAGE_COUNTER=y
+CONFIG_MEMCG_SWAP=y
+CONFIG_MEMCG_KMEM=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_WRITEBACK=y
+CONFIG_CGROUP_RDMA=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_SOCK_CGROUP_DATA=y
+CONFIG_PM_CLK=y
+CONFIG_CPU_PM=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_BLK_CGROUP_RWSTAT=y
+CONFIG_BLK_PM=y
+CONFIG_BLOCK_HOLDER_DEPRECATED=y
+CONFIG_BLK_MQ_STACKING=y
+CONFIG_PADATA=y
+CONFIG_FREEZER=y
+CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
+CONFIG_ARCH_ENABLE_THP_MIGRATION=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+CONFIG_NET_INGRESS=y
+CONFIG_NET_EGRESS=y
+CONFIG_SKB_EXTENSIONS=y
+CONFIG_XFRM=y
+CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_ESP=m
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_EGRESS=y
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_FAMILY_BRIDGE=y
+CONFIG_NF_LOG_SYSLOG=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_PROCFS=y
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_REDIRECT=y
+CONFIG_NF_NAT_MASQUERADE=y
+CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NETFILTER_XTABLES=y
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_NAT=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_IP_VS_TAB_BITS=12
+CONFIG_IP_VS_SH_TAB_BITS=8
+CONFIG_IP_VS_MH_TAB_INDEX=12
+CONFIG_IP_VS_FTP=m
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_SOCKET_IPV4=m
+CONFIG_NF_REJECT_IPV4=y
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NET_CLS=y
+CONFIG_NETLINK_DIAG=y
+CONFIG_NET_L3_MASTER_DEV=y
+CONFIG_CGROUP_NET_CLASSID=y
+CONFIG_NET_9P=y
+CONFIG_NET_9P_FD=y
+CONFIG_BLK_DEV_DM_BUILTIN=y
+CONFIG_DM_BUFIO=m
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+CONFIG_IPVLAN_L3S=y
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
+CONFIG_PROC_CHILDREN=y
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_SUNRPC_GSS=m
+CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_PATH=y
+CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9
+CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
+CONFIG_SECURITY_APPARMOR_HASH=y
+CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
+CONFIG_INTEGRITY=y
+CONFIG_INTEGRITY_AUDIT=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CTR=y
+CONFIG_CRYPTO_NHPOLY1305=y
+CONFIG_CRYPTO_GHASH=y
+CONFIG_CRYPTO_POLY1305=y
+CONFIG_CRYPTO_SM3=y
+CONFIG_CRYPTO_STREEBOG=y
+CONFIG_CRYPTO_BLOWFISH_COMMON=y
+CONFIG_CRYPTO_CAST_COMMON=y
+CONFIG_CRYPTO_CHACHA20=y
+CONFIG_CRYPTO_SM4_GENERIC=y
+CONFIG_CRYPTO_TWOFISH_COMMON=y
+CONFIG_CRYPTO_USER_API=y
+CONFIG_CRYPTO_USER_API_HASH=y
+CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
+CONFIG_CRYPTO_LIB_ARC4=y
+CONFIG_CRYPTO_LIB_DES=y
+CONFIG_AUDIT_GENERIC=y
+CONFIG_842_COMPRESS=y
+CONFIG_842_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=y
+CONFIG_LZ4HC_COMPRESS=y
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_XARRAY_MULTI=y
+CONFIG_CC_HAS_KASAN_GENERIC=y
+CONFIG_WATCH_QUEUE=y
+CONFIG_ERRATA_SIFIVE=y
+CONFIG_ERRATA_SIFIVE_CIP_453=y
+CONFIG_ERRATA_SIFIVE_CIP_1200=y
+CONFIG_RISCV_ALTERNATIVE=y
+CONFIG_RISCV_BOOT_SPINWAIT=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_BINFMT_MISC=m
+CONFIG_NF_TPROXY_IPV4=m
+CONFIG_NF_DUP_IPV4=m
+CONFIG_SPI_SIFIVE=y
+CONFIG_GPIO_GENERIC=y
+CONFIG_GPIO_CADENCE=m
+CONFIG_GPIO_SIFIVE=y
+CONFIG_GPIO_SYSCON=m
+CONFIG_ALTERA_MSGDMA=m
+CONFIG_DW_DMAC_CORE=m
+CONFIG_DW_DMAC=m
+CONFIG_SF_PDMA=y
+CONFIG_ASYNC_TX_DMA=y
+CONFIG_UDMABUF=y
+CONFIG_SOUNDWIRE=m
+
+###
+### for docker support
+###
+
+CONFIG_MEMCG=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_HUGETLB=y
+CONFIG_CPUSETS=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+CONFIG_PM=y
+CONFIG_CPU_IDLE=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_IP_MULTICAST=y
+CONFIG_USER_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_BLK_DEV_THROTTLING=y
+CONFIG_XFRM_USER=m
+CONFIG_INET_ESP=m
+CONFIG_NETFILTER=y
+CONFIG_BRIDGE_NETFILTER=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_IP_VS=m

_service:tar_scm:openEuler_riscv64_defconfig Changed

@@ -1,297 +1,5 @@
-# Add from mainline kernel 6.0 riscv64 default defconfig
-# From kernel PR https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git/commit/?h=for-next&id=ba6cfef057e1c594c456627aad81c2343fdb5d13
-
-## Original description
-## The defconfig kernel should be able to run Docker.
-## Enable the missing settings according to checklist from moby.
-## Many of the settings are also needed to run a defconfig kernel
-## on default distro installations or to run snaps.
-
-CONFIG_MEMCG=y
-
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_HUGETLB=y
-CONFIG_CPUSETS=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_CGROUP_PERF=y
-
-CONFIG_BLK_DEV_THROTTLING=y
-
-CONFIG_XFRM_USER=m
-
-CONFIG_INET_ESP=m
-CONFIG_NETFILTER=y
-CONFIG_BRIDGE_NETFILTER=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_IP_VS=m
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_NF_LOG_ARP=m
-CONFIG_NF_LOG_IPV4=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_NF_LOG_IPV6=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_VLAN_8021Q=m
-CONFIG_NET_SCHED=y
-CONFIG_NET_CLS_CGROUP=m
-
-CONFIG_CGROUP_NET_PRIO=y
-
-CONFIG_MD=y
-CONFIG_BLK_DEV_DM=m
-CONFIG_DM_THIN_PROVISIONING=m
-
-CONFIG_DUMMY=m
-CONFIG_MACVLAN=m
-CONFIG_IPVLAN=m
-CONFIG_VXLAN=m
-CONFIG_VETH=m
-
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-
-CONFIG_SECURITY=y
-CONFIG_SECURITY_SELINUX=y
-CONFIG_SECURITY_APPARMOR=y
-CONFIG_DEFAULT_SECURITY_DAC=y
-
-# END of imported kernel 6.0 riscv64 defconfig
-
 # riscv Add for openEuler RISC-V
 CONFIG_REISERFS_FS_XATTR=y
 CONFIG_REISERFS_FS_SECURITY=y
 CONFIG_EXT4_FS_SECURITY=y
-CONFIG_NR_CPUS=32
-CONFIG_INPUT_EVDEV=y
-# for iptables --comment
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-
-CONFIG_DRM_BOCHS=y
-#Choose this option for qemu.
-#   If M is selected the module will be called bochs-drm.
-
-###  Some qemu-related configurations.
-# for QXL 2D Accelerated graphics
-CONFIG_DRM_QXL=y
-
-# for Docker support
-CONFIG_OVERLAY_FS=m
-
-# for Sound support
-CONFIG_SOUND=m
-CONFIG_SND=m
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-
-# for DOS/FAT/EXFAT Filesystems Support
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
-CONFIG_FAT_DEFAULT_UTF8=y
-CONFIG_EXFAT_FS=m
-CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_UTF8=m
-### End
-
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_USER=y
-#   Userspace cryptographic algorithm configuration
-CONFIG_CRYPTO_PCRYPT=y
-#   Parallel crypto engine
-CONFIG_CRYPTO_CRYPTD=y
-#   Software async crypto daemon
-CONFIG_CRYPTO_RSA=y
-#   RSA algorithm
-CONFIG_CRYPTO_DH=y
-#   Diffie-Hellman algorithm
-CONFIG_CRYPTO_ECDH=y
-#   ECDH algorithm
-CONFIG_CRYPTO_ECDSA=y
-#   ECDSA (NIST P192, P256 etc.) algorithm
-CONFIG_CRYPTO_ECRDSA=y
-#   EC-RDSA (GOST 34.10) algorithm
-CONFIG_CRYPTO_SM2=y
-#   SM2 algorithm
-CONFIG_CRYPTO_CURVE25519=y
-#   Curve25519 algorithm
-CONFIG_CRYPTO_CCM=y
-#   CCM support
-CONFIG_CRYPTO_GCM=y
-#   GCM/GMAC support
-CONFIG_CRYPTO_CHACHA20POLY1305=y
-#   ChaCha20-Poly1305 AEAD support
-CONFIG_CRYPTO_AEGIS128=y
-#   AEGIS-128 AEAD algorithm
-CONFIG_CRYPTO_SEQIV=y
-#   Sequence Number IV Generator
-CONFIG_CRYPTO_ECHAINIV=y
-#   Encrypted Chain IV Generator
-CONFIG_CRYPTO_CFB=y
-CONFIG_CRYPTO_CTS=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_LRW=y
-CONFIG_CRYPTO_OFB=y
-CONFIG_CRYPTO_PCBC=y
-CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_KEYWRAP=y
-CONFIG_CRYPTO_ADIANTUM=y
-CONFIG_CRYPTO_CMAC=y
-CONFIG_CRYPTO_XCBC=y
-CONFIG_CRYPTO_VMAC=y
-CONFIG_CRYPTO_BLAKE2S=y
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_MD4=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
-CONFIG_CRYPTO_RMD128=y
-CONFIG_CRYPTO_RMD160=y
-CONFIG_CRYPTO_RMD256=y
-CONFIG_CRYPTO_RMD320=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_SHA3=y
-CONFIG_CRYPTO_TGR192=y
-CONFIG_CRYPTO_WP512=y
-CONFIG_CRYPTO_AES_TI=y
-CONFIG_CRYPTO_ANUBIS=y
-CONFIG_CRYPTO_ARC4=y
-CONFIG_CRYPTO_BLOWFISH=y
-CONFIG_CRYPTO_CAMELLIA=y
-CONFIG_CRYPTO_CAST5=y
-CONFIG_CRYPTO_CAST6=y
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_FCRYPT=y
-CONFIG_CRYPTO_KHAZAD=y
-CONFIG_CRYPTO_SALSA20=y