Merge pull request 'fix(autopatch): Removed four obsolete actions from config-portable-riscv64.yaml whose %%{nil} fix was already absorbed upstream.' (#1) from agent-fix/a8-20260723-010949 into a8
Reviewed-on: #1
This commit is contained in:
commit
bc1e02508e
@ -20,18 +20,6 @@ actions:
|
|||||||
# Enable fastdebug builds by default on relevant arches.
|
# Enable fastdebug builds by default on relevant arches.
|
||||||
%bcond_without fastdebug
|
%bcond_without fastdebug
|
||||||
count: 1
|
count: 1
|
||||||
- target: "spec"
|
|
||||||
find: |
|
|
||||||
%define miscportablearchive() %{miscportablename}.tar.xz
|
|
||||||
replace: |
|
|
||||||
%define miscportablearchive() %{miscportablename}.tar.xz
|
|
||||||
|
|
||||||
# RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1}
|
|
||||||
# so we have to pass in "" but evaluate it, otherwise files record will include it
|
|
||||||
%define jreportablearchiveForFiles() %(echo %{jreportablearchive -- ""})
|
|
||||||
%define jdkportablearchiveForFiles() %(echo %{jdkportablearchive -- ""})
|
|
||||||
%define staticlibsportablearchiveForFiles() %(echo %{staticlibsportablearchive -- ""})
|
|
||||||
count: 1
|
|
||||||
- target: "spec"
|
- target: "spec"
|
||||||
find: |
|
find: |
|
||||||
%ifarch s390x sparc64 alpha %{power64} %{aarch64}
|
%ifarch s390x sparc64 alpha %{power64} %{aarch64}
|
||||||
@ -42,18 +30,6 @@ actions:
|
|||||||
export ARCH_DATA_MODEL=64
|
export ARCH_DATA_MODEL=64
|
||||||
%endif
|
%endif
|
||||||
count: 1
|
count: 1
|
||||||
- target: "spec"
|
|
||||||
find: "jreportablearchive -- %%{nil}"
|
|
||||||
replace: "jreportablearchiveForFiles"
|
|
||||||
count: -1
|
|
||||||
- target: "spec"
|
|
||||||
find: "jdkportablearchive -- %%{nil}"
|
|
||||||
replace: "jdkportablearchiveForFiles"
|
|
||||||
count: -1
|
|
||||||
- target: "spec"
|
|
||||||
find: "staticlibsportablearchive -- %%{nil}"
|
|
||||||
replace: "staticlibsportablearchiveForFiles"
|
|
||||||
count: -1
|
|
||||||
|
|
||||||
|
|
||||||
- changelog_entry:
|
- changelog_entry:
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user