Skip to content

Conversation

@OPNA2608
Copy link
Contributor

@OPNA2608 OPNA2608 commented Sep 16, 2023

Description of changes

powerpc64-linux tracking issue: #253715
Previous attempt: #177001, CC @minijackson
bootstrap files need to be put onto tarballs.nixos.org, CC @lovesegfault for uploading


sha256sum of files to be uploaded:

$ sha256sum /nix/store/8frm8kk8gzpv31r289ai5jgkwfikmpm4-stdenv-bootstrap-tools-powerpc64-unknown-linux-gnuabielfv2/on-server/*
0af311476b54b399f3024b92e9c518363acd2b15f713e83d0bb4fb3f8f26d98b  /nix/store/8frm8kk8gzpv31r289ai5jgkwfikmpm4-stdenv-bootstrap-tools-powerpc64-unknown-linux-gnuabielfv2/on-server/bootstrap-tools.tar.xz
529a053a8022e89357aaa608e57aaddaa7c3ded93d633916ddca92bb81e22125  /nix/store/8frm8kk8gzpv31r289ai5jgkwfikmpm4-stdenv-bootstrap-tools-powerpc64-unknown-linux-gnuabielfv2/on-server/busybox

Suggested commands to upload files to 'tarballs.nixos.org':

    $ nix-store --realize /nix/store/8frm8kk8gzpv31r289ai5jgkwfikmpm4-stdenv-bootstrap-tools-powerpc64-unknown-linux-gnuabielfv2
    $ aws s3 cp --recursive --acl public-read /nix/store/8frm8kk8gzpv31r289ai5jgkwfikmpm4-stdenv-bootstrap-tools-powerpc64-unknown-linux-gnuabielfv2/on-server/ s3://nixpkgs-tarballs/stdenv/powerpc64-unknown-linux-gnuabielfv2/57cf2e0b24fb52344cc718913eaed78f389b1319
    $ aws s3 cp --recursive s3://nixpkgs-tarballs/stdenv/powerpc64-unknown-linux-gnuabielfv2/57cf2e0b24fb52344cc718913eaed78f389b1319 ./
    $ sha256sum bootstrap-tools.tar.xz busybox
    $ sha256sum /nix/store/8frm8kk8gzpv31r289ai5jgkwfikmpm4-stdenv-bootstrap-tools-powerpc64-unknown-linux-gnuabielfv2/on-server/*

Things done

  • Built on platform(s)
    • x86_64-linux
    • powerpc64-linux (stdenv and hello builds)
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added the 6.topic: stdenv Standard environment label Sep 16, 2023
@OPNA2608 OPNA2608 added the 6.topic: exotic Exotic hardware or software platform label Sep 16, 2023
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Sep 16, 2023
@Artturin
Copy link
Member

Artturin commented Oct 1, 2023

Also readd it to make-bootstrap-tools-cross.nix if #258476 is merged before this

@OPNA2608 OPNA2608 force-pushed the bootstrapFiles/powerpc64 branch from d3a1ab6 to a242ad0 Compare October 2, 2023 07:36
@OPNA2608
Copy link
Contributor Author

OPNA2608 commented Oct 2, 2023

Also readd it to make-bootstrap-tools-cross.nix if #258476 is merged before this

It was merged before this, so: Rebased on a post-#258476 commit, re-added ppc64 to make-bootstrap-tools-cross.nix.

@OPNA2608 OPNA2608 force-pushed the bootstrapFiles/powerpc64 branch 2 times, most recently from 80080e7 to e65ca97 Compare October 4, 2023 16:01
@OPNA2608
Copy link
Contributor Author

OPNA2608 commented Oct 4, 2023

Resolved merge conflict after #258540 merge.

@OPNA2608
Copy link
Contributor Author

I guess let's try to get the cross bootstrapTools for powerpc64-linux back onto Hydra first, to show that / check if they still work…

@OPNA2608 OPNA2608 marked this pull request as draft January 13, 2024 21:29
@OPNA2608
Copy link
Contributor Author

OPNA2608 commented Jan 13, 2024

# NOTE: Only add platforms for which there are files in `./bootstrap-files`.

Ah, well, or not. I guess the convention of referencing the Hydra builds that a bootstrap-files came from isn't relevant anymore…

I'll just try to generate some fresher builds then, been afew months.

@OPNA2608 OPNA2608 force-pushed the bootstrapFiles/powerpc64 branch 2 times, most recently from f650228 to e722359 Compare January 13, 2024 23:12
@OPNA2608
Copy link
Contributor Author

Regenerated, and uploaded… This time just into the tree, with a follow-up that fetches them from the previous commit. Has to be good enough until they go onto the tarballs server I guess 😶‍🌫️.

Some first few derivations in the native bootstrapping chain built fine so far: bootstrap.log

@OPNA2608
Copy link
Contributor Author

checking for references to /build/ in /nix/store/fnl8ksa55r53nr6rp6hnlf1xwkvzn15x-hello-2.12.1...
gzipping man pages under /nix/store/fnl8ksa55r53nr6rp6hnlf1xwkvzn15x-hello-2.12.1/share/man/
patching script interpreter paths in /nix/store/fnl8ksa55r53nr6rp6hnlf1xwkvzn15x-hello-2.12.1
stripping (with command strip and flags -S -p) in  /nix/store/fnl8ksa55r53nr6rp6hnlf1xwkvzn15x-hello-2.12.1/bin
/nix/store/fnl8ksa55r53nr6rp6hnlf1xwkvzn15x-hello-2.12.1
puna@HC ~/d/nixpkgs (bootstrap/powerpc64-linux_v2)> /nix/store/fnl8ksa55r53nr6rp6hnlf1xwkvzn15x-hello-2.12.1/bin/hello 
Hello, world!

Files seem to work fine, ready for review (with the caveat of the files still having to be put onto tarballs.nixos.org & fetched from there of course).

@OPNA2608 OPNA2608 marked this pull request as ready for review January 15, 2024 13:22
@OPNA2608 OPNA2608 marked this pull request as draft March 4, 2024 15:55
…-files

sha256sum of files to be uploaded:

$ sha256sum /nix/store/8frm8kk8gzpv31r289ai5jgkwfikmpm4-stdenv-bootstrap-tools-powerpc64-unknown-linux-gnuabielfv2/on-server/*
0af311476b54b399f3024b92e9c518363acd2b15f713e83d0bb4fb3f8f26d98b  /nix/store/8frm8kk8gzpv31r289ai5jgkwfikmpm4-stdenv-bootstrap-tools-powerpc64-unknown-linux-gnuabielfv2/on-server/bootstrap-tools.tar.xz
529a053a8022e89357aaa608e57aaddaa7c3ded93d633916ddca92bb81e22125  /nix/store/8frm8kk8gzpv31r289ai5jgkwfikmpm4-stdenv-bootstrap-tools-powerpc64-unknown-linux-gnuabielfv2/on-server/busybox

Suggested commands to upload files to 'tarballs.nixos.org':

    $ nix-store --realize /nix/store/8frm8kk8gzpv31r289ai5jgkwfikmpm4-stdenv-bootstrap-tools-powerpc64-unknown-linux-gnuabielfv2
    $ aws s3 cp --recursive --acl public-read /nix/store/8frm8kk8gzpv31r289ai5jgkwfikmpm4-stdenv-bootstrap-tools-powerpc64-unknown-linux-gnuabielfv2/on-server/ s3://nixpkgs-tarballs/stdenv/powerpc64-unknown-linux-gnuabielfv2/57cf2e0b24fb52344cc718913eaed78f389b1319
    $ aws s3 cp --recursive s3://nixpkgs-tarballs/stdenv/powerpc64-unknown-linux-gnuabielfv2/57cf2e0b24fb52344cc718913eaed78f389b1319 ./
    $ sha256sum bootstrap-tools.tar.xz busybox
    $ sha256sum /nix/store/8frm8kk8gzpv31r289ai5jgkwfikmpm4-stdenv-bootstrap-tools-powerpc64-unknown-linux-gnuabielfv2/on-server/*
@OPNA2608 OPNA2608 force-pushed the bootstrapFiles/powerpc64 branch from 66a2771 to 5ec7dcd Compare March 10, 2024 11:37
@OPNA2608 OPNA2608 marked this pull request as ready for review March 11, 2024 09:58
@wegank wegank merged commit 073f71c into NixOS:master Mar 11, 2024
@trofi
Copy link
Contributor

trofi commented Mar 11, 2024

We'll need to upload tarballs to s3 as well. /cc @lovesegfault

@wegank
Copy link
Member

wegank commented Mar 11, 2024

Oh no, what did I do ...

@lovesegfault
Copy link
Member

Ooph, let me try to get these uploaded quickly so we don't need to revert it

@lovesegfault
Copy link
Member

Uploaded!

$ aws s3 cp --recursive s3://nixpkgs-tarballs/stdenv/powerpc64-unknown-linux-gnuabielfv2/57cf2e0b24fb52344cc718913eaed78f389b1319 ./
download: s3://nixpkgs-tarballs/stdenv/powerpc64-unknown-linux-gnuabielfv2/57cf2e0b24fb52344cc718913eaed78f389b1319/busybox to ./busybox
download: s3://nixpkgs-tarballs/stdenv/powerpc64-unknown-linux-gnuabielfv2/57cf2e0b24fb52344cc718913eaed78f389b1319/bootstrap-tools.tar.xz to ./bootstrap-tools.tar.xz

$ sha256sum bootstrap-tools.tar.xz busybox
0af311476b54b399f3024b92e9c518363acd2b15f713e83d0bb4fb3f8f26d98b  bootstrap-tools.tar.xz
529a053a8022e89357aaa608e57aaddaa7c3ded93d633916ddca92bb81e22125  busybox

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: exotic Exotic hardware or software platform 6.topic: stdenv Standard environment 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants