已开启
add Second-revision-sw_64-support.patch to fix the add-sw_64-support.p… #676
AtomGit-Bot创建于 2025年8月11日
add Second-revision-sw_64-support.patch to fix the add-sw_64-support.p… #676
已开启
从refs/pull/676/head合入到openEuler-22.03-LTS-SP4
共 3 个文件变更+984-969
| @@ -953,7 +953,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r | |||
| 953 | 953 | ||
| 954 | Name: java-%{javaver}-%{origin} | 954 | Name: java-%{javaver}-%{origin} |
| 955 | Version: %{javaver}.%{updatever}.%{buildver} | 955 | Version: %{javaver}.%{updatever}.%{buildver} |
| 956 | -Release: 3 | 956 | +Release: 4 |
| 957 | # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons | 957 | # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons |
| 958 | # and this change was brought into RHEL-4. java-1.5.0-ibm packages | 958 | # and this change was brought into RHEL-4. java-1.5.0-ibm packages |
| 959 | # also included the epoch in their virtual provides. This created a | 959 | # also included the epoch in their virtual provides. This created a |
| @@ -1446,6 +1446,7 @@ Patch4000: LoongArch64-support.patch | |||
| 1446 | ############################################ | 1446 | ############################################ |
| 1447 | 1447 | ||
| 1448 | Patch6000: add-sw_64-support.patch | 1448 | Patch6000: add-sw_64-support.patch |
| 1449 | +Patch6001: Second-revision-sw_64-support.patch | ||
| 1449 | 1450 | ||
| 1450 | ############################################# | 1451 | ############################################# |
| 1451 | # | 1452 | # |
| @@ -2084,6 +2085,7 @@ pushd %{top_level_dir_name} | |||
| 2084 | 2085 | ||
| 2085 | %ifarch sw_64 | 2086 | %ifarch sw_64 |
| 2086 | %patch6000 -p1 | 2087 | %patch6000 -p1 |
| 2088 | +%patch6001 -p1 | ||
| 2087 | %endif | 2089 | %endif |
| 2088 | 2090 | ||
| 2089 | %ifarch riscv64 | 2091 | %ifarch riscv64 |
| @@ -3054,6 +3056,9 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect | |||
| 3054 | %endif | 3056 | %endif |
| 3055 | 3057 | ||
| 3056 | %changelog | 3058 | %changelog |
| 3059 | +* Mon Aug 11 2025 ShuKun Qu <qushukun@cqsoftware.com.cn> - 1:1.8.0.462.b08-4 | ||
| 3060 | +- add Second-revision-sw_64-support.patch to fix the add-sw_64-support.patch error caused by openjdk upgrade | ||
| 3061 | + | ||
| 3057 | * Wed Jul 30 2025 neu-mobi <liuyulong35@huawei.com> -1:1.8.0.462.b08-3 | 3062 | * Wed Jul 30 2025 neu-mobi <liuyulong35@huawei.com> -1:1.8.0.462.b08-3 |
| 3058 | - add Add-testcase-for-jdk.Deoptimization-and-bug-fixes-fo.patch | 3063 | - add Add-testcase-for-jdk.Deoptimization-and-bug-fixes-fo.patch |
| 3059 | 3064 | ||