build: remove native_biplist dependency #20333

fanquake commented at 1:11 PM on November 7, 2020: member

ds_store now takes advantage of Pythons ability to decode binary plists (since 3.4), so we can drop its biplist dependency.

The call to biplist.Data() in custom_dsstore.py doesn't seem to do anything, and from what I can tell can just be removed. i.e:

diff --git a/contrib/macdeploy/custom_dsstore.py b/contrib/macdeploy/custom_dsstore.py
index dc1c1882d..e475bc6c3 100755
--- a/contrib/macdeploy/custom_dsstore.py
+++ b/contrib/macdeploy/custom_dsstore.py
@@ -47,6 +47,7 @@ alias.volume.disk_image_alias.target.filename = package_name_ns + '.temp.dmg'
 alias.volume.disk_image_alias.target.carbon_path = 'Macintosh HD:Users:\x00bitcoinuser:\x00Documents:\x00bitcoin:\x00bitcoin:\x00' + package_name_ns + '.temp.dmg'
 alias.volume.disk_image_alias.target.posix_path = 'Users/bitcoinuser/Documents/bitcoin/bitcoin/' + package_name_ns + '.temp.dmg'
 alias.target.carbon_path = package_name_ns + ':.background:\x00background.tiff'
+assert(biplist.Data(alias.to_bytes()) == alias.to_bytes())
 icvp['backgroundImageAlias'] = biplist.Data(alias.to_bytes())
 ds['.']['icvp'] = icvp

fanquake added the label macOS on Nov 7, 2020

fanquake added the label Build system on Nov 7, 2020

fanquake added the label Needs gitian build on Nov 7, 2020

hebasto commented at 1:14 PM on November 7, 2020: member

Concept ACK.

DrahtBot commented at 2:01 PM on November 10, 2020: member

Gitian builds

File	commit 7e373294a5ae819099c39d9d03d1f5a311d63cfc<br>(master)	commit 1c078d87b2b3d4ff129d141e4e607ac279242214<br>(master and this pull)
*-aarch64-linux-gnu-debug.tar.gz	`83c77088c64ce35f...`	`6aa52e16d013a70a...`
*-aarch64-linux-gnu.tar.gz	`36ed972b65709cc9...`	`91da9996ccd12b7a...`
*-arm-linux-gnueabihf-debug.tar.gz	`116e04dba520d05a...`	`f372426e5e576945...`
*-arm-linux-gnueabihf.tar.gz	`ac7ef6850d92f55c...`	`08f3d023194c8782...`
*-osx-unsigned.dmg	`8881d819b5a03e1d...`	`4605e06d1fcdf05d...`
*-osx64.tar.gz	`bcf7429bd9891ff3...`	`940a479d5988f5c4...`
*-riscv64-linux-gnu-debug.tar.gz	`9ead8bb9823b686d...`	`adefa9073249443d...`
*-riscv64-linux-gnu.tar.gz	`98bcd32e7c3bd042...`	`7acaf57850bc0699...`
*-win64-debug.zip	`7f60cd29a7864522...`	`7b1232b4a17d9a68...`
*-win64-setup-unsigned.exe	`c081d7eedbe5b1a7...`	`88003f6e8d4babd4...`
*-win64.zip	`ac8172f935e15a54...`	`fdbdc9569845dd1b...`
*-x86_64-linux-gnu-debug.tar.gz	`7523c4786d05da01...`	`c3b2f4b4aef0b98a...`
*-x86_64-linux-gnu.tar.gz	`1c8142e21d050a46...`	`ecac3745364469e5...`
*.tar.gz	`807305e2b5af4d43...`	`885db47034cc6b69...`
bitcoin-core-linux-0.21-res.yml	`cdcebbbe4862da12...`	`886f80a9a3b6443c...`
bitcoin-core-osx-0.21-res.yml	`9391742ea84e255a...`	`3ad6aa4600accae4...`
bitcoin-core-win-0.21-res.yml	`a323be37316096c5...`	`3d59db1bcfeace80...`
linux-build.log	`a02c01eaf94d10bd...`	`8f90adedb8515f95...`
osx-build.log	`906bb37b69cf3ef3...`	`e3c583bed4e989c8...`
win-build.log	`a643a56926f8f128...`	`242ada20ea07c29f...`
bitcoin-core-linux-0.21-res.yml.diff		`22c6fff8b003ce76...`
bitcoin-core-osx-0.21-res.yml.diff		`e32a30d62a2bb411...`
bitcoin-core-win-0.21-res.yml.diff		`b0dc5dc2eed4dafb...`
linux-build.log.diff		`f09336da32c4ea24...`
osx-build.log.diff		`fe794df875b239b3...`
win-build.log.diff		`9984d4ca920b7e76...`

DrahtBot removed the label Needs gitian build on Nov 10, 2020

in depends/packages/native_ds_store.mk:2 in 355f574bce outdated

   0 | @@ -1,10 +1,9 @@
   1 |  package=native_ds_store
   2 | -$(package)_version=1.1.2
   3 | +$(package)_version=67e238d3dc8427891d2c1c7f1d1fa6194c44a5a6

dongcarl commented at 4:23 PM on November 10, 2020:

Any reason why we should use a specific commit rather than v1.3.0?

fanquake commented at 12:36 AM on November 11, 2020:

Good call. When I went looking in the repo, I assumed that 1.2.0 was the latest release. I'd missed https://github.com/al45tair/ds_store/commit/aa82c93a272c27a528c903f2525c24b69ac54cff as it's not actually in the master branch.

depends: native_ds_store 1.3.0

native_ds_store now takes advantage of Pythons ability to decode binary
plists (since 3.4), so we can drop its biplist dependency.

The call to biplist.Data() in custom_dsstore doesn't seem to do anything,
and from what I can tell can just be removed.

7087440894

fanquake force-pushed on Nov 11, 2020

dongcarl added the label Needs gitian build on Nov 11, 2020

DrahtBot commented at 2:22 AM on November 14, 2020: member

Gitian builds

File	commit 9bd1316697292251ed5690390794fc64517fc86b<br>(master)	commit 8cfc99ec85de2068e704eb8044ba4a5e61d6b372<br>(master and this pull)
*-aarch64-linux-gnu-debug.tar.gz	`3db97c8d57eafd40...`	`0397a60439b8852d...`
*-aarch64-linux-gnu.tar.gz	`7177e87fa21510c4...`	`db6958dc0457642e...`
*-arm-linux-gnueabihf-debug.tar.gz	`de949360e89ca7e2...`	`a386b86cd98a2ec0...`
*-arm-linux-gnueabihf.tar.gz	`db92b060ef5f368d...`	`a9f6842546abb71b...`
*-osx-unsigned.dmg	`b9873d776a740dfa...`	`d90f03bd846d9a1b...`
*-osx64.tar.gz	`76843fd4454474d0...`	`692e7a4a14da9b91...`
*-riscv64-linux-gnu-debug.tar.gz	`7800e259dfae5375...`	`a3b7a9956b2facef...`
*-riscv64-linux-gnu.tar.gz	`fa1e5a6e6038d9b9...`	`70dbf780ad219d20...`
*-win64-debug.zip	`134801c89b67e956...`	`3283d189264b1767...`
*-win64-setup-unsigned.exe	`b4ddfe0ad9081707...`	`8a6b969d508af8c5...`
*-win64.zip	`163278774d745486...`	`89bb2f5941a2cf30...`
*-x86_64-linux-gnu-debug.tar.gz	`888b6f88584393a1...`	`bb704870655e6c2f...`
*-x86_64-linux-gnu.tar.gz	`8779618b53513b4e...`	`d941c1fc069abc1f...`
*.tar.gz	`0069354516661e24...`	`a75b7748d14fd266...`
bitcoin-core-linux-0.21-res.yml	`003deb12731f3ac3...`	`dcf88cda1423743f...`
bitcoin-core-osx-0.21-res.yml	`d3c14565c88c1b9f...`	`fcad4b2f2cc35d8c...`
bitcoin-core-win-0.21-res.yml	`3e726a36d3e22fe4...`	`988cbcfcc656b32a...`
linux-build.log	`3c1b0e7b94595c46...`	`e5182a9d360e5b75...`
osx-build.log	`e9caa22e1dc57761...`	`851ec6d1c65bb180...`
win-build.log	`3ff1cd4fa1e23bb3...`	`9b4d08f0996f2fd3...`
bitcoin-core-linux-0.21-res.yml.diff		`9b1217bb79c68916...`
bitcoin-core-osx-0.21-res.yml.diff		`76f5fdf3c1eba775...`
bitcoin-core-win-0.21-res.yml.diff		`0f36df0d2df2b7cc...`
linux-build.log.diff		`e299aa848c8d232d...`
osx-build.log.diff		`c0d2e1f69197f47b...`
win-build.log.diff		`ddcf61bf10574e55...`

DrahtBot removed the label Needs gitian build on Nov 14, 2020

laanwj commented at 10:38 AM on November 19, 2020: member

ACK 7087440894a9daa7de806c5aa42d83ad60759c65 Although this is Mac-black-magic to me, it's always good to drop an unnecessary dependency.

laanwj merged this on Nov 19, 2020

laanwj closed this on Nov 19, 2020

sidhujag referenced this in commit 67e462b373 on Nov 19, 2020

fanquake deleted the branch on Feb 9, 2021

furszy referenced this in commit 816f42d7ac on May 25, 2021

kittywhiskers referenced this in commit e6a47a873b on Aug 24, 2021

PastaPastaPasta referenced this in commit 3820031eef on Mar 5, 2022

PastaPastaPasta referenced this in commit baac07e822 on Mar 5, 2022

PastaPastaPasta referenced this in commit 3d6cc69131 on Mar 5, 2022

DrahtBot locked this on Aug 16, 2022