udisks2: 2.1.6 → 2.7.6 by jtojnar · Pull Request #35551 · NixOS/nixpkgs

jtojnar · 2018-02-25T15:45:48Z

Motivation for this change

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
Built on platform(s)
- NixOS
- macOS
- other Linux distributions
Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
Tested execution of all binary files (usually in ./result/bin/)
Fits CONTRIBUTING.md.

GrahamcOfBorg · 2018-02-25T15:54:03Z

Failure on x86_64-darwin (full log)

Partial log (click to expand)

Package ‘libblockdev-2.16’ in /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/pkgs/development/libraries/libblockdev/default.nix:34 is not supported on ‘x86_64-darwin’, refusing to evaluate.

a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

GrahamcOfBorg · 2018-02-25T16:00:09Z

Success on x86_64-linux (full log)

Partial log (click to expand)

checking for references to /tmp/nix-build-udisks-2.7.6.drv-0 in /nix/store/39z361hf6i97k0w8sr1x76b7flfs8hk1-udisks-2.7.6-man...
shrinking RPATHs of ELF executables and libraries in /nix/store/xyf6iy5dzflj7da4xxri51mrm5j44ars-udisks-2.7.6-dev
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/xyf6iy5dzflj7da4xxri51mrm5j44ars-udisks-2.7.6-dev/lib 
patching script interpreter paths in /nix/store/xyf6iy5dzflj7da4xxri51mrm5j44ars-udisks-2.7.6-dev
checking for references to /tmp/nix-build-udisks-2.7.6.drv-0 in /nix/store/xyf6iy5dzflj7da4xxri51mrm5j44ars-udisks-2.7.6-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/4nd4d4mq7qf2s29gn130d4y2ipj7rjxq-udisks-2.7.6-devdoc
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
patching script interpreter paths in /nix/store/4nd4d4mq7qf2s29gn130d4y2ipj7rjxq-udisks-2.7.6-devdoc
checking for references to /tmp/nix-build-udisks-2.7.6.drv-0 in /nix/store/4nd4d4mq7qf2s29gn130d4y2ipj7rjxq-udisks-2.7.6-devdoc...

GrahamcOfBorg · 2018-02-25T16:21:56Z

Success on aarch64-linux (full log)

Partial log (click to expand)

patching script interpreter paths in /nix/store/4jfjdsz1nqdm5bgb3mbffds8vi42lb83-udisks-2.7.6-dev
checking for references to /build in /nix/store/4jfjdsz1nqdm5bgb3mbffds8vi42lb83-udisks-2.7.6-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/00430bi6jmyvx23gv9i2x3y9x5aqfhhy-udisks-2.7.6-devdoc
strip is /nix/store/lvx1acn1ig1j2km8jds5x3ggh3f2wa8v-binutils-2.28.1/bin/strip
patching script interpreter paths in /nix/store/00430bi6jmyvx23gv9i2x3y9x5aqfhhy-udisks-2.7.6-devdoc
checking for references to /build in /nix/store/00430bi6jmyvx23gv9i2x3y9x5aqfhhy-udisks-2.7.6-devdoc...
/nix/store/kh0m0fdb5mv96wvwq2z8qnx1cds5qk28-libblockdev-2.16
/nix/store/m5pzqv4mj7mwajhg90kwcmvb2v22y7jn-libbytesize-1.2
/nix/store/4s35xcgr4bafj7rmmw0s4k09hzxfik8f-udisks-2.7.6
/nix/store/794sz6v3whzjvlp2wz1qbc51hi96299x-volume_key-0.3.9

GrahamcOfBorg · 2018-02-25T17:23:14Z

Failure on x86_64-darwin (full log)

Partial log (click to expand)

Package ‘libblockdev-2.16’ in /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/development/libraries/libblockdev/default.nix:34 is not supported on ‘x86_64-darwin’, refusing to evaluate.

a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

GrahamcOfBorg · 2018-02-25T17:33:45Z

Success on aarch64-linux (full log)

Partial log (click to expand)

patching script interpreter paths in /nix/store/82k0p8f4002wb6l33pqzcnvs20icg2qk-udisks-2.7.6-dev
checking for references to /build in /nix/store/82k0p8f4002wb6l33pqzcnvs20icg2qk-udisks-2.7.6-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/354h8rxis6iblda2n7v99z16vlmhdaqp-udisks-2.7.6-devdoc
strip is /nix/store/lvx1acn1ig1j2km8jds5x3ggh3f2wa8v-binutils-2.28.1/bin/strip
patching script interpreter paths in /nix/store/354h8rxis6iblda2n7v99z16vlmhdaqp-udisks-2.7.6-devdoc
checking for references to /build in /nix/store/354h8rxis6iblda2n7v99z16vlmhdaqp-udisks-2.7.6-devdoc...
/nix/store/kh0m0fdb5mv96wvwq2z8qnx1cds5qk28-libblockdev-2.16
/nix/store/m5pzqv4mj7mwajhg90kwcmvb2v22y7jn-libbytesize-1.2
/nix/store/4gkrags8w32bv1ki09sl418z6m4sl2wf-udisks-2.7.6
/nix/store/794sz6v3whzjvlp2wz1qbc51hi96299x-volume_key-0.3.9

GrahamcOfBorg · 2018-02-25T18:23:19Z

Success on x86_64-linux (full log)

Partial log (click to expand)

checking for references to /tmp/nix-build-udisks-2.7.6.drv-0 in /nix/store/7yjvxxmy1m5bpd9m7mxv3ka8qmqjhavv-udisks-2.7.6-man...
shrinking RPATHs of ELF executables and libraries in /nix/store/wk8azxfxi1k7xln0qfjzf8lnjz9d2ls7-udisks-2.7.6-dev
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/wk8azxfxi1k7xln0qfjzf8lnjz9d2ls7-udisks-2.7.6-dev/lib 
patching script interpreter paths in /nix/store/wk8azxfxi1k7xln0qfjzf8lnjz9d2ls7-udisks-2.7.6-dev
checking for references to /tmp/nix-build-udisks-2.7.6.drv-0 in /nix/store/wk8azxfxi1k7xln0qfjzf8lnjz9d2ls7-udisks-2.7.6-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/917ln25vv6z0jyq2cbnn154cdli7nr2g-udisks-2.7.6-devdoc
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
patching script interpreter paths in /nix/store/917ln25vv6z0jyq2cbnn154cdli7nr2g-udisks-2.7.6-devdoc
checking for references to /tmp/nix-build-udisks-2.7.6.drv-0 in /nix/store/917ln25vv6z0jyq2cbnn154cdli7nr2g-udisks-2.7.6-devdoc...

jtojnar · 2018-02-26T05:46:14Z

@flokli Your commit worked great, except that you forgot to add dosfstools to the PATH. I added it and changed it back to force-path.patch, and was able to successfully format a flash drive. You should be able to cherry-pick jtojnar/udisks2-2.7.6 onto flokli/udisks^.

We will need to carefully inspect if we caught all the offenders, including libblockdev ones.

GrahamcOfBorg · 2018-02-26T07:09:23Z

Failure on x86_64-darwin (full log)

Partial log (click to expand)

Package ‘libblockdev-2.16’ in /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/development/libraries/libblockdev/default.nix:34 is not supported on ‘x86_64-darwin’, refusing to evaluate.

a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

GrahamcOfBorg · 2018-02-26T08:33:29Z

Success on aarch64-linux (full log)

Partial log (click to expand)

patching script interpreter paths in /nix/store/h5cb0zsphgbwj49r247n517r1x4lp2ai-udisks-2.7.6-dev
checking for references to /build in /nix/store/h5cb0zsphgbwj49r247n517r1x4lp2ai-udisks-2.7.6-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/msjs9sr75iw5fps9frgk3y9q6l9l9bg4-udisks-2.7.6-devdoc
strip is /nix/store/lvx1acn1ig1j2km8jds5x3ggh3f2wa8v-binutils-2.28.1/bin/strip
patching script interpreter paths in /nix/store/msjs9sr75iw5fps9frgk3y9q6l9l9bg4-udisks-2.7.6-devdoc
checking for references to /build in /nix/store/msjs9sr75iw5fps9frgk3y9q6l9l9bg4-udisks-2.7.6-devdoc...
/nix/store/pb31wmcspq8lm2y4w4c6zmc7031lmw5y-libblockdev-2.16
/nix/store/m5pzqv4mj7mwajhg90kwcmvb2v22y7jn-libbytesize-1.2
/nix/store/k31znya5vicp7ly3zsf3c9msy8hmyx0p-udisks-2.7.6
/nix/store/fqxldbcq6aj80bjwphwmx8dd5mw62v8f-volume_key-0.3.9

flokli · 2018-02-26T09:17:03Z

Oh wow, the missing dosfstools totally explains why I was still having problems with mkfs.vfat, thanks for finding this :-)

I quickly skimmed over libblockdev, filesystem-specific tools are configured in src/plugins/fs/ (we should have all those covered, and all g_spawn_* calls have G_SPAWN_SEARCH_PATH set, so calling udisks with the currect assembled PATH should be enough).

Whats still missing is other parts in which libblockdev related to the block devices itself:

mdadm
lvm2 (dmsetup, vgcreate and friends)
bcache-tools (make-bcache)
multipath-tools

Those could simply added to the path. I'm still not sure on whether to prefer patching via @path@ or the use of wrapProgram, but thats personal preference ;-)

There's also src/plugins/s390.c with hardcoded paths (filed upstream PR at storaged-project/libblockdev#326).
We currently lack the userspace tools dasdfmt,chccwdev (https://github.com/ibm-s390-tools/s390-tools), dasd_cio_free, zfcp_cio_free (might be symlinks to device_cio_free, so I'm unsure about packaging those. Any z Systems NixOS users around? :-D

GrahamcOfBorg · 2018-02-26T10:11:40Z

Success on x86_64-linux (full log)

Partial log (click to expand)

checking for references to /tmp/nix-build-udisks-2.7.6.drv-0 in /nix/store/b00rd7yh2n439aq8wf3ddzrx409c7j45-udisks-2.7.6-man...
shrinking RPATHs of ELF executables and libraries in /nix/store/py93c8lmapk8bq5yqm6dcd6ll44a331f-udisks-2.7.6-dev
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/py93c8lmapk8bq5yqm6dcd6ll44a331f-udisks-2.7.6-dev/lib 
patching script interpreter paths in /nix/store/py93c8lmapk8bq5yqm6dcd6ll44a331f-udisks-2.7.6-dev
checking for references to /tmp/nix-build-udisks-2.7.6.drv-0 in /nix/store/py93c8lmapk8bq5yqm6dcd6ll44a331f-udisks-2.7.6-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/as8v2wd0k79cvncwbhlwj3m07lppkpz3-udisks-2.7.6-devdoc
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
patching script interpreter paths in /nix/store/as8v2wd0k79cvncwbhlwj3m07lppkpz3-udisks-2.7.6-devdoc
checking for references to /tmp/nix-build-udisks-2.7.6.drv-0 in /nix/store/as8v2wd0k79cvncwbhlwj3m07lppkpz3-udisks-2.7.6-devdoc...

jtojnar · 2018-02-26T15:02:12Z

I'm still not sure on whether to prefer patching via @path@ or the use of wrapProgram, but thats personal preference ;-)

I have had my own share of problems with wrappers so my perspective is little skewed. I agree that it is cleaner than the force-path.patch hack.

The optimal solution would be changing each individual executable in the source code to absolute path but of course that is laborious, and unless udisk calls the executables repeatedly, getting rid of PATH look-up overhead is not worth the trouble. However, for the libblockdev, which does not have a daemon, we will have to do that anyway, if we want to allow usage outside of udisks.

Maybe we could make the paths ./configureable and try to upstream it?

jfrankenau · 2018-03-12T17:27:34Z

@jtojnar, while you are at it, could you include storaged-project/udisks@f639f67 and storaged-project/udisks@293aa9b in the systemd service specification of the matching udisks2 module? Thank you.

jtojnar · 2018-03-12T19:36:11Z

I will not have time to finish this anytime soon. Anyone want to take this over?

dtzWill · 2018-03-27T20:11:43Z

This works (on top of recent staging changes) w/musl, with the following change:

dtzWill@3fd44d9

Which can probably be reduced to just building libblockdev with --without-dm (and drop dmraid dep) which upstream says is okay/reasonable if we're only using libblockdev as a dependency of udisks2.
(See commit message for links to this)

flokli · 2018-06-08T20:50:20Z

@jtojnar, while you are at it, could you include storaged-project/udisks@f639f67 and storaged-project/udisks@293aa9b in the systemd service specification of the matching udisks2 module? Thank you.

That's included in udisks-2.7.6, which is in #41723.

xeji · 2018-06-10T08:25:50Z

Continued in #41723 , closing.

supersedes NixOS#35551 closes NixOS#34999 /cc NixOS#38382

GrahamcOfBorg added 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Feb 25, 2018

jtojnar mentioned this pull request Feb 25, 2018

gnome3.gnome-disk-utility unable to find parted #34999

Closed

jtojnar added this to the 18.03 milestone Feb 25, 2018

jtojnar added 4 commits February 25, 2018 18:09

libbytesize: init at 1.12

b7487c6

volume_key: init at 0.3.9

ed660e3

libblockdev: init at 2.16

edc1825

udisks2: 2.1.6 → 2.7.6

738eabd

jtojnar force-pushed the udisks2-2.7.6 branch from a0d6329 to 738eabd Compare February 25, 2018 17:09

jtojnar added the 6.topic: freedesktop Interoperability and shared base technology for X, Wayland and others label Feb 25, 2018

udisks-2: make bin path for parted, also fix mkfs.* and *label programs

c33abb3

jtojnar added the 2.status: work-in-progress label Feb 26, 2018

jtojnar mentioned this pull request Mar 26, 2018

udisks2: 2.1.6 -> 2.1.8, extend workaround to include musl #37810

Merged

8 tasks

jtojnar mentioned this pull request Apr 3, 2018

cryptsetup: 1.7.5 -> 2.0.2 #38382

Merged

8 tasks

flokli mentioned this pull request Jun 8, 2018

udisks 2.1.6 -> 2.7.6 #41723

Merged

8 tasks

xeji closed this Jun 10, 2018

flokli added a commit to flokli/nixpkgs that referenced this pull request Jun 11, 2018

udisks2: 2.1.6 → 2.7.6

41b140c

supersedes NixOS#35551 closes NixOS#34999 /cc NixOS#38382

jtojnar deleted the udisks2-2.7.6 branch July 15, 2018 16:15

Uh oh!

Conversation

jtojnar commented Feb 25, 2018

Motivation for this change

Things done

Uh oh!

GrahamcOfBorg commented Feb 25, 2018

Uh oh!

GrahamcOfBorg commented Feb 25, 2018

Uh oh!

GrahamcOfBorg commented Feb 25, 2018

Uh oh!

GrahamcOfBorg commented Feb 25, 2018

Uh oh!

GrahamcOfBorg commented Feb 25, 2018

Uh oh!

GrahamcOfBorg commented Feb 25, 2018

Uh oh!

jtojnar commented Feb 26, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

GrahamcOfBorg commented Feb 26, 2018

Uh oh!

GrahamcOfBorg commented Feb 26, 2018

Uh oh!

flokli commented Feb 26, 2018

Uh oh!

GrahamcOfBorg commented Feb 26, 2018

Uh oh!

jtojnar commented Feb 26, 2018

Uh oh!

jfrankenau commented Mar 12, 2018

Uh oh!

jtojnar commented Mar 12, 2018

Uh oh!

dtzWill commented Mar 27, 2018

Uh oh!

flokli commented Jun 8, 2018

Uh oh!

xeji commented Jun 10, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

jtojnar commented Feb 26, 2018 •

edited

Loading