diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-11-05 17:30:05 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-11-05 17:31:24 +0100 |
| commit | faa2f06f5eaf8578873495f44603ee74d7a1abf4 (patch) | |
| tree | 5470b8f8f88ba13e43d5fb9a49eff5164b68bf7e /contrib/guix | |
| parent | 9bb078351b09862a263e936bb612dca82305a6fe (diff) | |
| download | bitcoin-faa2f06f5eaf8578873495f44603ee74d7a1abf4.tar.xz | |
scripted-diff: [build] Ensure source tarball has leading directory name
-BEGIN VERIFY SCRIPT-
sed -i 's|git archive --|git archive --prefix="${DISTNAME}/" --|g' $(git grep -l 'git archive' ./contrib)
sed -i 's|tar -xf "\?${\?GIT_ARCHIVE}\?"\?|tar --strip-components=1 -xf "${GIT_ARCHIVE}"|g' $(git grep -l 'tar -xf' ./contrib)
-END VERIFY SCRIPT-
Diffstat (limited to 'contrib/guix')
| -rw-r--r-- | contrib/guix/libexec/build.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index 5be3baeefa..d658c4f6a6 100644 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -158,7 +158,7 @@ GIT_ARCHIVE="${OUTDIR}/src/${DISTNAME}.tar.gz" # Create the source tarball if not already there if [ ! -e "$GIT_ARCHIVE" ]; then mkdir -p "$(dirname "$GIT_ARCHIVE")" - git archive --output="$GIT_ARCHIVE" HEAD + git archive --prefix="${DISTNAME}/" --output="$GIT_ARCHIVE" HEAD fi ########################### @@ -193,7 +193,7 @@ export PATH="${BASEPREFIX}/${HOST}/native/bin:${PATH}" cd "$DISTSRC" # Extract the source tarball - tar -xf "${GIT_ARCHIVE}" + tar --strip-components=1 -xf "${GIT_ARCHIVE}" ./autogen.sh |