Skip to content

Conversation

maflcko
Copy link
Member

@maflcko maflcko commented Nov 5, 2020

This has been fixed in 0.20, so it needs to be fixed on master as well to avoid a regression

#18945

-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-
Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK faa2f06, tested gitian builds only.

@DrahtBot
Copy link
Contributor

DrahtBot commented Nov 5, 2020

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

@DrahtBot
Copy link
Contributor

DrahtBot commented Nov 7, 2020

Guix builds

File commit f5cdc29
(master)
commit 40cf81c
(master and this pull)
*-aarch64-linux-gnu-debug.tar.gz f0f7e524c8c5cb8f... 4711c13d2cb1494f...
*-aarch64-linux-gnu.tar.gz df6f5e9f91918d30... 98ebec79a4f31b59...
*-arm-linux-gnueabihf-debug.tar.gz 235bfb8b575800e9... 16a688299c5a9366...
*-arm-linux-gnueabihf.tar.gz 03414ac3a88ed833... 7ecfdadc471cca7f...
*-riscv64-linux-gnu-debug.tar.gz 35fec542f7f9a4ac... 8af8808a641ecc81...
*-riscv64-linux-gnu.tar.gz 674e61f483e6ca37... ae60d392d736594f...
*-win-unsigned.tar.gz 439d1f497f80efd0... 9f5f0f31bb429dff...
*-win64-debug.zip 50cd6015a535fcbf... 9c49f4f7395e9663...
*-win64-setup-unsigned.exe 9683a59409d9a314... 450c2167616783da...
*-win64.zip 39753fbdfe0f10f6... 7876f5a95a967b15...
*-x86_64-linux-gnu-debug.tar.gz 2dc2e8987c90d006... 4b801d90d65aafc1...
*-x86_64-linux-gnu.tar.gz f663191e51f2ef2c... d84a4f0838e7c431...
*.tar.gz f0bfcabe664ea5c9... d1f8778629246b85...
guix_build.log 1af6ab4b3e0f1e62... 25d298e3c1cff7a5...
guix_build.log.diff ee1edfe5fec60eb6...

Copy link
Contributor

@promag promag left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK faa2f06.

Referencing b9054bc from #18818.

@laanwj
Copy link
Member

laanwj commented Nov 9, 2020

ACK faa2f06

@laanwj laanwj merged commit f70eb51 into bitcoin:master Nov 9, 2020
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Nov 9, 2020
…ry name

faa2f06 scripted-diff: [build] Ensure source tarball has leading directory name (MarcoFalke)

Pull request description:

  This has been fixed in 0.20, so it needs to be fixed on master as well to avoid a regression

  bitcoin#18945

ACKs for top commit:
  laanwj:
    ACK faa2f06
  hebasto:
    ACK faa2f06, tested gitian builds only.
  promag:
    ACK faa2f06.

Tree-SHA512: e3b025c29c45b025002abc35262bb5d771f6cbd807f1c256c477c243685e93cd43ad9f642b38e3cf218590912abe6ea0ddfec3bfbef36f99080aad74ed6cc0af
@DrahtBot
Copy link
Contributor

Gitian builds

File commit 7e37329
(master)
commit f46edf6
(master and this pull)
*-aarch64-linux-gnu-debug.tar.gz 83c77088c64ce35f... f8b52a2324a21d2b...
*-aarch64-linux-gnu.tar.gz 36ed972b65709cc9... cbb249f8dfc5daae...
*-arm-linux-gnueabihf-debug.tar.gz 116e04dba520d05a... 7c923ea20e5851be...
*-arm-linux-gnueabihf.tar.gz ac7ef6850d92f55c... 7759df3e18a8865b...
*-osx-unsigned.dmg 8881d819b5a03e1d... 6eff176db27f891c...
*-osx64.tar.gz bcf7429bd9891ff3... a3f5acc72fa15d84...
*-riscv64-linux-gnu-debug.tar.gz 9ead8bb9823b686d... 5e305285800e3e32...
*-riscv64-linux-gnu.tar.gz 98bcd32e7c3bd042... af3675556e63783f...
*-win64-debug.zip 7f60cd29a7864522... 161cae14db8d07f0...
*-win64-setup-unsigned.exe c081d7eedbe5b1a7... b809b37f4e9a0a80...
*-win64.zip ac8172f935e15a54... 57c0f9e97bfd4dac...
*-x86_64-linux-gnu-debug.tar.gz 7523c4786d05da01... 60355254fbab4bab...
*-x86_64-linux-gnu.tar.gz 1c8142e21d050a46... db10aacb06006df9...
*.tar.gz 807305e2b5af4d43... b60ff1de71cc4b12...
bitcoin-core-linux-0.21-res.yml cdcebbbe4862da12... 345898cb79e8f665...
bitcoin-core-osx-0.21-res.yml 9391742ea84e255a... 223f750f56709bb2...
bitcoin-core-win-0.21-res.yml a323be37316096c5... 67dd8c43359cb2a5...
linux-build.log a02c01eaf94d10bd... 1c56cc61b15cd761...
osx-build.log 906bb37b69cf3ef3... a8aef3bdb022b8d9...
win-build.log a643a56926f8f128... 482c40c19c7285c4...
bitcoin-core-linux-0.21-res.yml.diff a918c1734fb9f3ca...
bitcoin-core-osx-0.21-res.yml.diff a7b9a1c12b8c63e7...
bitcoin-core-win-0.21-res.yml.diff 51839d953dce2117...
linux-build.log.diff d73b4e38aa39c5ee...
osx-build.log.diff 445e35409a0c652c...
win-build.log.diff 5bcf08771857d6d6...

@maflcko maflcko deleted the 2011-buildTar branch November 12, 2020 09:46
UdjinM6 pushed a commit to UdjinM6/dash that referenced this pull request Oct 23, 2021
… directory name

faa2f06 scripted-diff: [build] Ensure source tarball has leading directory name (MarcoFalke)

Pull request description:

  This has been fixed in 0.20, so it needs to be fixed on master as well to avoid a regression

  bitcoin#18945

ACKs for top commit:
  laanwj:
    ACK faa2f06
  hebasto:
    ACK faa2f06, tested gitian builds only.
  promag:
    ACK faa2f06.

Tree-SHA512: e3b025c29c45b025002abc35262bb5d771f6cbd807f1c256c477c243685e93cd43ad9f642b38e3cf218590912abe6ea0ddfec3bfbef36f99080aad74ed6cc0af
UdjinM6 pushed a commit to UdjinM6/dash that referenced this pull request Oct 23, 2021
… directory name

faa2f06 scripted-diff: [build] Ensure source tarball has leading directory name (MarcoFalke)

Pull request description:

  This has been fixed in 0.20, so it needs to be fixed on master as well to avoid a regression

  bitcoin#18945

ACKs for top commit:
  laanwj:
    ACK faa2f06
  hebasto:
    ACK faa2f06, tested gitian builds only.
  promag:
    ACK faa2f06.

Tree-SHA512: e3b025c29c45b025002abc35262bb5d771f6cbd807f1c256c477c243685e93cd43ad9f642b38e3cf218590912abe6ea0ddfec3bfbef36f99080aad74ed6cc0af
UdjinM6 pushed a commit to UdjinM6/dash that referenced this pull request Dec 4, 2021
… directory name

faa2f06 scripted-diff: [build] Ensure source tarball has leading directory name (MarcoFalke)

Pull request description:

  This has been fixed in 0.20, so it needs to be fixed on master as well to avoid a regression

  bitcoin#18945

ACKs for top commit:
  laanwj:
    ACK faa2f06
  hebasto:
    ACK faa2f06, tested gitian builds only.
  promag:
    ACK faa2f06.

Tree-SHA512: e3b025c29c45b025002abc35262bb5d771f6cbd807f1c256c477c243685e93cd43ad9f642b38e3cf218590912abe6ea0ddfec3bfbef36f99080aad74ed6cc0af
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Feb 15, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants