Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

openshift: fix mkdir command #41274

Merged
merged 1 commit into from May 31, 2018
Merged

openshift: fix mkdir command #41274

merged 1 commit into from May 31, 2018

Conversation

jensbin
Copy link
Contributor

@jensbin jensbin commented May 30, 2018

Motivation for this change

Wrong command replacement (mount -> mkdir)

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.

@xeji
Copy link
Contributor

xeji commented May 30, 2018

@GrahamcOfBorg build openshift

@@ -48,7 +48,7 @@ in stdenv.mkDerivation rec {

substituteInPlace pkg/oc/bootstrap/docker/host/host.go \
--replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \
'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount'
'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mkdir'
Copy link
Contributor

Choose a reason for hiding this comment

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

Did you test this? mkdir is part of coreutils, not utillinux.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: openshift

Partial log (click to expand)

installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/cfy5791igrz91wbc9035xvmdrc9yqbqh-openshift-origin-3.9.0
shrinking /nix/store/cfy5791igrz91wbc9035xvmdrc9yqbqh-openshift-origin-3.9.0/bin/oc
shrinking /nix/store/cfy5791igrz91wbc9035xvmdrc9yqbqh-openshift-origin-3.9.0/bin/openshift
strip is /nix/store/92d2ifxcni4n3zx9s8wnkcjlvnx5ajlc-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/cfy5791igrz91wbc9035xvmdrc9yqbqh-openshift-origin-3.9.0/bin
patching script interpreter paths in /nix/store/cfy5791igrz91wbc9035xvmdrc9yqbqh-openshift-origin-3.9.0
checking for references to /build in /nix/store/cfy5791igrz91wbc9035xvmdrc9yqbqh-openshift-origin-3.9.0...
/nix/store/cfy5791igrz91wbc9035xvmdrc9yqbqh-openshift-origin-3.9.0

@xeji
Copy link
Contributor

xeji commented May 30, 2018

@GrahamcOfBorg eval

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: openshift

Partial log (click to expand)

installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/n9419nyamml18vnqsc8qy90n9k95ip2g-openshift-origin-3.9.0
shrinking /nix/store/n9419nyamml18vnqsc8qy90n9k95ip2g-openshift-origin-3.9.0/bin/oc
shrinking /nix/store/n9419nyamml18vnqsc8qy90n9k95ip2g-openshift-origin-3.9.0/bin/openshift
strip is /nix/store/8yfik687kfccisxnad42j19lfb7ij9b4-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/n9419nyamml18vnqsc8qy90n9k95ip2g-openshift-origin-3.9.0/bin
patching script interpreter paths in /nix/store/n9419nyamml18vnqsc8qy90n9k95ip2g-openshift-origin-3.9.0
checking for references to /build in /nix/store/n9419nyamml18vnqsc8qy90n9k95ip2g-openshift-origin-3.9.0...
/nix/store/n9419nyamml18vnqsc8qy90n9k95ip2g-openshift-origin-3.9.0

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: openshift

Partial log (click to expand)


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

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


@xeji
Copy link
Contributor

xeji commented May 31, 2018

@GrahamcOfBorg build openshift

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: openshift

Partial log (click to expand)


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

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


@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: openshift

Partial log (click to expand)

installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/sznbw8px6zcb0nya2l4nnrw01661jdg3-openshift-origin-3.9.0
shrinking /nix/store/sznbw8px6zcb0nya2l4nnrw01661jdg3-openshift-origin-3.9.0/bin/openshift
shrinking /nix/store/sznbw8px6zcb0nya2l4nnrw01661jdg3-openshift-origin-3.9.0/bin/oc
strip is /nix/store/92d2ifxcni4n3zx9s8wnkcjlvnx5ajlc-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/sznbw8px6zcb0nya2l4nnrw01661jdg3-openshift-origin-3.9.0/bin
patching script interpreter paths in /nix/store/sznbw8px6zcb0nya2l4nnrw01661jdg3-openshift-origin-3.9.0
checking for references to /build in /nix/store/sznbw8px6zcb0nya2l4nnrw01661jdg3-openshift-origin-3.9.0...
/nix/store/sznbw8px6zcb0nya2l4nnrw01661jdg3-openshift-origin-3.9.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: openshift

Partial log (click to expand)

installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/kqgvra114dhgj4h9sdbwla9rxk6k4g7q-openshift-origin-3.9.0
shrinking /nix/store/kqgvra114dhgj4h9sdbwla9rxk6k4g7q-openshift-origin-3.9.0/bin/oc
shrinking /nix/store/kqgvra114dhgj4h9sdbwla9rxk6k4g7q-openshift-origin-3.9.0/bin/openshift
strip is /nix/store/8yfik687kfccisxnad42j19lfb7ij9b4-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/kqgvra114dhgj4h9sdbwla9rxk6k4g7q-openshift-origin-3.9.0/bin
patching script interpreter paths in /nix/store/kqgvra114dhgj4h9sdbwla9rxk6k4g7q-openshift-origin-3.9.0
checking for references to /build in /nix/store/kqgvra114dhgj4h9sdbwla9rxk6k4g7q-openshift-origin-3.9.0...
/nix/store/kqgvra114dhgj4h9sdbwla9rxk6k4g7q-openshift-origin-3.9.0

@xeji xeji merged commit 78ae380 into NixOS:master May 31, 2018
@jensbin jensbin deleted the openshift_mkdir branch May 31, 2018 08:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants