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.

Sign up for GitHub

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

Jump to bottom

Revert "Revert "iso-image: normalize volumeID"", iso-image: make $ARCH shorter #84865

Merged
merged 2 commits into from Apr 10, 2020
Merged

Revert "Revert "iso-image: normalize volumeID"", iso-image: make $ARCH shorter #84865

merged 2 commits into from Apr 10, 2020

Conversation

worldofpeace
Copy link
Contributor

@worldofpeace worldofpeace commented Apr 10, 2020 •
edited

Motivation for this change

Fixed #84864. So I can revert the revert.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@worldofpeace
Revert "Revert "iso-image: normalize volumeID""
a775961 
This reverts commit 21b50e6.
@worldofpeace
iso-image: make $ARCH shorter
df8c30f 
we use stdenv.hostPlatform.uname.processor, which I believe is just like
`uname -p`.

Example values:
```
(import <nixpkgs> { system = "x86_64-linux"; }).stdenv.hostPlatform.uname.processor
"x86_64"

(import <nixpkgs> { system = "aarch64-linux"; }).stdenv.hostPlatform.uname.processor
aarch64

(import <nixpkgs> { system = "armv7l-linux"; }).stdenv.hostPlatform.uname.processor
"armv7l"
```
@worldofpeace
Copy link
Contributor Author

@mmilata Please see the last commit. I had to tweak the $ARCH value slightly because it was too long on aarch64-linux. They should be the same as uname -p.

@worldofpeace
Copy link
Contributor Author

Going to actually build this on aarch64-linux 😄

mmilata
mmilata approved these changes Apr 10, 2020
View reviewed changes
Copy link
Member

@mmilata mmilata left a comment

Choose a reason for hiding this comment

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

Looks good! (until we start building ISOs for something else than linux 😆)

@worldofpeace
Copy link
Contributor Author

isoinfo of a new aarch64-image

isoinfo -d -i ./result/iso/nixos-minimal-20.09pre130979.gfedcba-aarch64-linux.iso 
Setting input-charset to 'UTF-8' from locale.
CD-ROM is in ISO 9660 format
System id: 
Volume id: nixos-minimal-20.09-aarch64
Volume set id: 
Publisher id: NIXOS
Data preparer id: XORRISO-1.5.2 2019.10.26.180001, LIBISOBURN-1.5.2, LIBISOFS-1.5.2, LIBBURN-1.5.2
Application id: NIXOS
Copyright File id: 
Abstract File id: 
Bibliographic File id: 
Volume set size is: 1
Volume set sequence number is: 1
Logical block size is: 2048
Volume size is: 288511
El Torito VD version 1 found, boot catalog is in sector 44

Joliet with UCS level 3 found.
SUSP signatures version 1 found
Rock Ridge signatures version 1 found
Rock Ridge id 'RRIP_1991A'
Eltorito validation header:
    Hid 1
    Arch 239 (Unknown Arch)
    ID ''
    Cksum AA 66 OK
    Key 55 AA
    Eltorito defaultboot header:
        Bootid 88 (bootable)
        Boot media 0 (No Emulation Boot)
        Load segment 0
        Sys type 0
        Nsect 0
        Bootoff 2D 45

@worldofpeace worldofpeace merged commit c7e0e9e into NixOS:master Apr 10, 2020
@worldofpeace worldofpeace deleted the fixup-iso-image-volumeid-again branch April 10, 2020 00:26
@worldofpeace worldofpeace mentioned this pull request Apr 10, 2020
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mmilata mmilata mmilata approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@worldofpeace @mmilata