!82 release 5.10.0-rc4.0.0.5

From: @xiexiuqi
Reviewed-by: @yangyingliang
Signed-off-by: @yangyingliang

SOURCE

@@ -1 +1 @@
-v5.10-rc3
+v5.10-rc4

kernel.spec

@@ -11,15 +11,18 @@
 
 %global upstream_version    5.10
 %global upstream_sublevel   0
-%global devel_release       rc3
+%global devel_release       rc4
 %global maintenance_release .0.0
-%global pkg_release         .4
+%global pkg_release         .5
 
 %define with_debuginfo 1
 %define with_source 1
 
 %define with_python2 0
 
+# failed if there is new config options
+%define listnewconfig_fail 0
+
 Name:	 kernel
 Version: %{upstream_version}.%{upstream_sublevel}
 Release: %{devel_release}%{?maintenance_release}%{?pkg_release}%{?extra_release}
@@ -41,6 +44,9 @@ Source200: mkgrub-menu-aarch64.sh
 Source2000: cpupower.service
 Source2001: cpupower.config
 
+Source3000: kernel-5.10.0-aarch64.config
+Source3001: kernel-5.10.0-x86_64.config
+
 %if 0%{?with_patch}
 Source9000: apply-patches
 Source9001: guards
@@ -48,9 +54,6 @@ Source9002: series.conf
 Source9998: patches.tar.bz2
 %endif
 
-Patch0001: 0001-config-add-openeuler_defconfig.patch
-Patch0002: 0001-x86-config-add-openeuler_defconfig.patch
-
 #BuildRequires:
 BuildRequires: module-init-tools, patch >= 2.5.4, bash >= 2.03, tar
 BuildRequires: bzip2, xz, findutils, gzip, m4, perl, make >= 3.78, diffutils, gawk
@@ -231,9 +234,6 @@ fi
 
 cd linux-%{KernelVer}
 
-%patch0001 -p1
-%patch0002 -p1
-
 %if 0%{?with_patch}
 cp %{SOURCE9000} .
 cp %{SOURCE9001} .
@@ -289,7 +289,21 @@ perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}.%{_target_cpu}/" Mak
 ## make linux
 make mrproper %{_smp_mflags}
 
-make ARCH=%{Arch} openeuler_defconfig
+# prepare configs
+mkdir -p configs
+cp %{SOURCE3000} configs
+cp %{SOURCE3001} configs
+cp configs/kernel-%{version}-%{_target_cpu}.config .config
+
+make ARCH=%{Arch} listnewconfig |grep -E '^CONFIG_' > newconfig || true
+%if %{listnewconfig_fail}
+  if [ -s newconfig ]; then
+    echo "**** NOTE: new config options. ****"
+    cat newconfig
+    exit 1
+  fi
+%endif
+rm -f newconfig
 make ARCH=%{Arch} olddefconfig
 
 TargetImage=$(basename $(make -s image_name))
@@ -830,6 +844,10 @@ fi
 %endif
 
 %changelog
+* Tue Nov 17 2020 Xie XiuQi <xiexiuqi@huawei.com> - 5.10.0-rc4.0.0.5
+- rebase on top of v5.10-rc4
+- kernel.spec: privode config files in src package
+
 * Mon Nov 09 2020 Xie XiuQi <xiexiuqi@huawei.com> - 5.10.0-rc3.0.0.4
 - use rcX for v5.10-rcX source release
 - rebase on top of v5.10-rc3