diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec
index 15512dca758b04042017ff64762ade3d556198b3..1e14bad6c75359374e6060a26c8a0fc834063afe 100644
--- a/openjdk-1.8.0.spec
+++ b/openjdk-1.8.0.spec
@@ -132,6 +132,12 @@
 %global stapinstall powerpc64le
 %endif
 
+# Need to support noarch for srpm build
+%ifarch noarch
+%global archinstall %{nil}
+%global stapinstall %{nil}
+%endif
+
 %ifarch %{jit_arches}
 %global with_systemtap 1
 %else
@@ -936,7 +942,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}.%{buildver}
-Release: 7
+Release: 8
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
 # and this change was brought into RHEL-4. java-1.5.0-ibm packages
 # also included the epoch in their virtual provides. This created a
@@ -2485,9 +2491,10 @@ end
 
 -- run content of included file with fake args
 
+arg = nil; -- it is better to null the arg up, no meter if they exists or not, and use cjc as module in unified way, instead of relaying on "main" method during require "copy_jdk_configs.lua"
 cjc = require "copy_jdk_configs.lua"
-arg = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"}
-cjc.mainProgram(arg)
+args = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"}
+cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect this 'main', so it should run under all circumstances, except fatal error
 
 %post
 %{post_script %{nil}}
@@ -2624,6 +2631,10 @@ cjc.mainProgram(arg)
 %endif
 
 %changelog
+* Fri Jun 21 2024 songliyang <songliyang@kylinos.cn> -1:1.8.0.412-b08.8
+- Add noarch support for srpm build
+- null the arg to solve openjdk-headless install error
+
 * Thu Jun 20 2024 aoqi <aoqi@loongson.cn> -1:1.8.0.412-b08.7
 - update LoongArch64 port to 8u412