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

Accepting request 883259 from home:Andreas_Schwab:Factory

Browse Source 
- auto-config-update-aarch64-ppc64le.diff: Use timestamp in file instead
  of searching for arch name, which cannot handle all cases

OBS-URL: https://build.opensuse.org/request/show/883259
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=580
This commit is contained in:
Michael Schröder 2021-04-06 11:22:58 +00:00 committed by Git OBS Bridge
parent 74855f6c35
commit 7cf402eda6
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,8 @@
--- ./build/parseSpec.c.orig 2019-10-02 12:38:51.836127743 +0000 Index: build/parseSpec.c
+++ ./build/parseSpec.c 2019-10-02 12:52:33.818447657 +0000 ===================================================================
@@ -926,7 +926,22 @@ static rpmSpec parseSpec(const char *spe --- build/parseSpec.c.orig
+++ build/parseSpec.c
@@ -942,7 +942,30 @@ static rpmSpec parseSpec(const char *spe
&(spec->buildrequires)); &(spec->buildrequires));
break; break;
case PART_BUILD: case PART_BUILD:
@ -12,11 +14,19 @@
+ } + }
+ spec->build = newStringBuf(); + spec->build = newStringBuf();
+ appendLineStringBuf(spec->build, + appendLineStringBuf(spec->build,
+ "ref=/usr/lib/rpm; testarch=$(uname -m)\n" + "ref=/usr/lib/rpm\n"
+ "mints=0\n"
+ "case $(uname -m) in\n"
+ " aarch64) mints=20120610;;\n"
+ " ppc64le) mints=20130610;;\n"
+ " riscv64) mints=20160911;;\n"
+ "esac\n"
+ "for s in guess sub; do\n" + "for s in guess sub; do\n"
+ " for c in $(find -maxdepth 8 -name \"config.$s\"); do\n" + " for c in $(find -maxdepth 8 -name \"config.$s\"); do\n"
+ " grep -q config-patches@ $c || continue\n" + " grep -q config-patches@ $c || continue\n"
+ " grep -q \"$testarch[-: ]\" $c || install -m 755 $ref/config.$s $c\n" + " timestamp=$(sed -n \"/^timestamp=/{s///;s/[-'\\\"]//g;p;q;}\" $c)\n"
+ " test -n \"$timestamp\" || continue\n"
+ " test $timestamp -ge $mints || install -m 755 $ref/config.$s $c\n"
+ " done\n" + " done\n"
+ "done\n" + "done\n"
+ ); + );

6
rpm.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Apr 6 08:42:29 UTC 2021 - Andreas Schwab <schwab@suse.de>
- auto-config-update-aarch64-ppc64le.diff: Use timestamp in file instead
of searching for arch name, which cannot handle all cases
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 30 11:15:44 CEST 2021 - mls@suse.de Tue Mar 30 11:15:44 CEST 2021 - mls@suse.de