1
0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2026-05-22 10:15:16 +02:00

Remove RHEL package patch now that it has been merged upstream.

Also revert 731ffcfb and update ContainerTest.pm for upstream changes.
This commit is contained in:
David Steele
2020-01-21 11:57:59 -07:00
parent b89e6b7f69
commit 03d434c7e1
3 changed files with 7 additions and 22 deletions
@@ -566,12 +566,17 @@ sub containerBuild
}
else
{
# Fetching specific files is fragile but even a shallow clone of the entire pgrpms repo is very expensive. Using
# 'git archive' does not seem to work: access denied or repository not exported: /git/pgrpms.git.
$strScript .= sectionHeader() .
"# Install pgBackRest package source\n" .
" mkdir /root/package-src && \\\n" .
" wget -O /root/package-src/pgbackrest-conf.patch " .
"'https://git.postgresql.org/gitweb/?p=pgrpms.git;a=blob_plain;" .
"f=rpm/redhat/master/pgbackrest/master/pgbackrest-conf.patch;hb=refs/heads/master' && \\\n" .
" wget -O /root/package-src/pgbackrest-libxmlinclude.patch " .
"'https://git.postgresql.org/gitweb/?p=pgrpms.git;a=blob_plain;" .
"f=rpm/redhat/master/pgbackrest/master/pgbackrest-libxmlinclude.patch;hb=refs/heads/master' && \\\n" .
" wget -O /root/package-src/pgbackrest.spec " .
"'https://git.postgresql.org/gitweb/?p=pgrpms.git;a=blob_plain;" .
"f=rpm/redhat/master/pgbackrest/master/pgbackrest.spec;hb=refs/heads/master'";