!573 add noarch support for srpm build and solve openjdk-headless install error due to arg isn't nil
From: @sworn Reviewed-by: @kuenking111 Signed-off-by: @kuenking111
This commit is contained in:
commit
61775330ea
@ -132,6 +132,12 @@
|
|||||||
%global stapinstall powerpc64le
|
%global stapinstall powerpc64le
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
# Need to support noarch for srpm build
|
||||||
|
%ifarch noarch
|
||||||
|
%global archinstall %{nil}
|
||||||
|
%global stapinstall %{nil}
|
||||||
|
%endif
|
||||||
|
|
||||||
%ifarch %{jit_arches}
|
%ifarch %{jit_arches}
|
||||||
%global with_systemtap 1
|
%global with_systemtap 1
|
||||||
%else
|
%else
|
||||||
@ -936,7 +942,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r
|
|||||||
|
|
||||||
Name: java-%{javaver}-%{origin}
|
Name: java-%{javaver}-%{origin}
|
||||||
Version: %{javaver}.%{updatever}.%{buildver}
|
Version: %{javaver}.%{updatever}.%{buildver}
|
||||||
Release: 7
|
Release: 8
|
||||||
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
|
# 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
|
# 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
|
# also included the epoch in their virtual provides. This created a
|
||||||
@ -2485,9 +2491,10 @@ end
|
|||||||
|
|
||||||
-- run content of included file with fake args
|
-- 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"
|
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}"}
|
args = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"}
|
||||||
cjc.mainProgram(arg)
|
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
|
||||||
%{post_script %{nil}}
|
%{post_script %{nil}}
|
||||||
@ -2624,6 +2631,10 @@ cjc.mainProgram(arg)
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%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
|
* Thu Jun 20 2024 aoqi <aoqi@loongson.cn> -1:1.8.0.412-b08.7
|
||||||
- update LoongArch64 port to 8u412
|
- update LoongArch64 port to 8u412
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user