testing/rpm
SHA256
3
0
Fork 0
forked from pool/rpm
Code Pull Requests Activity

- split riscv64 part from auto-config-update-aarch64-ppc64le.diff

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=446
This commit is contained in:
Michael Schröder 2018-02-22 10:17:19 +00:00 committed by Git OBS Bridge
parent 81a8eb752e
commit e94a89bda1
4 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
auto-config-update-aarch64-ppc64le.diff
View File

@ -2,7 +2,7 @@ Index: build/parseBuildInstallClean.c
=================================================================== ===================================================================
--- build/parseBuildInstallClean.c.orig --- build/parseBuildInstallClean.c.orig
+++ build/parseBuildInstallClean.c +++ build/parseBuildInstallClean.c
@@ -46,7 +46,23 @@ int parseBuildInstallClean(rpmSpec spec, @@ -46,7 +46,22 @@ int parseBuildInstallClean(rpmSpec spec,
} else if (rc < 0) { } else if (rc < 0) {
goto exit; goto exit;
} }
@ -16,7 +16,6 @@ Index: build/parseBuildInstallClean.c
+ " grep -q config-patches@ $c || continue\n" + " grep -q config-patches@ $c || continue\n"
+ " grep -q aarch64 $c || install -m 755 $ref/config.$s $c\n" + " grep -q aarch64 $c || install -m 755 $ref/config.$s $c\n"
+ " grep -q ppc64le $c || install -m 755 $ref/config.$s $c\n" + " grep -q ppc64le $c || install -m 755 $ref/config.$s $c\n"
+ " grep -q 'riscv64[-:]' $c || install -m 755 $ref/config.$s $c\n"
+ " done\n" + " done\n"
+ "done\n" + "done\n"
+ ); + );

10
auto-config-update-riscv64.diff Normal file
View File

@ -0,0 +1,10 @@
--- ./build/parseBuildInstallClean.c.orig 2018-02-22 10:11:50.088160024 +0000
+++ ./build/parseBuildInstallClean.c 2018-02-22 10:11:37.592198130 +0000
@@ -55,6 +55,7 @@ int parseBuildInstallClean(rpmSpec spec,
" grep -q config-patches@ $c || continue\n"
" grep -q aarch64 $c || install -m 755 $ref/config.$s $c\n"
" grep -q ppc64le $c || install -m 755 $ref/config.$s $c\n"
+ " grep -q 'riscv64[-:]' $c || install -m 755 $ref/config.$s $c\n"
" done\n"
"done\n"
);

7
rpm.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Feb 22 11:14:38 CET 2018 - mls@suse.de
- split riscv64 part from auto-config-update-aarch64-ppc64le.diff
to make the change rust-proof.
new patch: auto-config-update-riscv64.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 15 11:11:21 UTC 2018 - schwab@suse.de Thu Feb 15 11:11:21 UTC 2018 - schwab@suse.de

4
rpm.spec
View File

@ -132,6 +132,7 @@ Patch109: pythondistdeps.diff
Patch111: debugedit-bnc1076819.diff Patch111: debugedit-bnc1076819.diff
Patch112: hardlinks.diff Patch112: hardlinks.diff
Patch6464: auto-config-update-aarch64-ppc64le.diff Patch6464: auto-config-update-aarch64-ppc64le.diff
Patch6465: auto-config-update-riscv64.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
# #
# avoid bootstrapping problem # avoid bootstrapping problem
@ -232,6 +233,9 @@ rm -f rpmdb/db.h
%ifarch aarch64 ppc64le riscv64 %ifarch aarch64 ppc64le riscv64
%patch6464 %patch6464
%endif %endif
%ifarch riscv64
%patch6465
%endif
cp config.guess config.sub db/dist/ cp config.guess config.sub db/dist/
cp config.guess config.sub beecrypt/ cp config.guess config.sub beecrypt/