Skip to content

Conversation

laanwj
Copy link
Member

@laanwj laanwj commented May 11, 2020

In the interest of moving 0.20.0 forward and being able to do rc2, extract and backport the non-controversial part from #18818.: ensure that the source tarball has leading directory name.

@laanwj laanwj added this to the 0.20.0 milestone May 11, 2020
@laanwj laanwj changed the title build: Ensure source tarball has leading directory name build: Ensure source tarball has leading directory name (0.20) May 11, 2020
@maflcko
Copy link
Member

maflcko commented May 11, 2020

I think DrahtBot can't build non-master branches, sorry 😅

Maybe @jonasschnelli's build farm can do?

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 59d57f6.

FWIW, #18909 is also in progress.

@laanwj
Copy link
Member Author

laanwj commented May 11, 2020

I think DrahtBot can't build non-master branches, sorry sweat_smile

I'll try to run my own gitian build.

FWIW, #18909 is also in progress.

Yes, thank you.
The reason to open this is that it's a) trivial b) everyone wants this c) I don't particularly want to hold up 0.20.0 on people agreeing whether to include the automake cruft or not.

@laanwj
Copy link
Member Author

laanwj commented May 11, 2020

Gitian output:

68a0a4f4728f23985ef937e38622e847fa9f1cae9e25ca8cf75a57cb7d908ffe  src/bitcoin-0.20.0rc1.tar.gz
$ tar -tvf build/out/src/bitcoin-0.20.0rc1.tar.gz |less
drwxrwxr-x root/root         0 2020-05-11 15:09 bitcoin-0.20.0rc1/
-rw-rw-r-- root/root      4692 2020-05-11 15:09 bitcoin-0.20.0rc1/.appveyor.yml
…

@Sjors
Copy link
Member

Sjors commented May 11, 2020

tACK 59d57f6

68a0a4f4728f23985ef937e38622e847fa9f1cae9e25ca8cf75a57cb7d908ffe  src/bitcoin-0.20.0rc1.tar.gz

This extracts to bitcoin-0.20.0rc1 dir, presumably because it's based on the 0.20 branch?

@laanwj
Copy link
Member Author

laanwj commented May 12, 2020

Yes, this is a fix for 0.20.0, it's supposed to do that.

We should do a similar thing on master, but the gitian descriptors have been reorganized there (so the solution needs to be slightly different) and there's not as much hurry.

@laanwj laanwj merged commit 5747c4c into bitcoin:0.20 May 12, 2020
laanwj added a commit that referenced this pull request Nov 9, 2020
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

  #18945

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

Tree-SHA512: e3b025c29c45b025002abc35262bb5d771f6cbd807f1c256c477c243685e93cd43ad9f642b38e3cf218590912abe6ea0ddfec3bfbef36f99080aad74ed6cc0af
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
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