From f841a7b9e508f6cc16ef08f189159a76645e9a6c Mon Sep 17 00:00:00 2001 From: Gottale <70042024+Gottale@users.noreply.github.com> Date: Mon, 31 Oct 2022 19:57:18 +0000 Subject: [PATCH] Minor update to qubes-iso-building.md Change reference from 4.0 > 4.1, adjust template examples to match current releases, updated expired GPG key reference. --- developer/building/qubes-iso-building.md | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/developer/building/qubes-iso-building.md b/developer/building/qubes-iso-building.md index 1aad3a2a..2fdcb427 100644 --- a/developer/building/qubes-iso-building.md +++ b/developer/building/qubes-iso-building.md @@ -15,7 +15,7 @@ title: Qubes ISO building Build Environment ----------------- -Fedora 32 has been successfully used to build Qubes R4.0 with the below steps. +Fedora 32 has been successfully used to build Qubes R4.1 with the below steps. Other rpm-based operating systems may also work. Travis-CI uses Ubuntu 18.04 to perform test builds, except it can not test the `./setup` script. @@ -46,7 +46,7 @@ gpg --edit-key 36879494 fpr # Verify fingerprint! See Note below! # Once verified, set trust to *ultimate* -# (Typical sequence is trust, 5, q) +# (Typical sequence is trust, 5, Y, q) wget https://keys.qubes-os.org/keys/qubes-developers-keys.asc gpg --import qubes-developers-keys.asc ~~~ @@ -77,12 +77,12 @@ cd ~/qubes-builder ./setup # Select Yes to add Qubes Master Signing Key # Select Yes to add Qubes OS Signing Key -# Select 4.0 for version +# Select 4.1 for version # Stable # Select Yes for fast Git cloning # Select Current (if you want the option to use pre-built packages) # Select No (we want a full build) -# Select fc30 and buster (for the currently shipping templates) +# Select fc36 and bullseye (for the currently shipping templates) # Select builder-rpm, builder-debian, template-whonix, mgmt-salt # Select Yes to add adrelanos's third party key # Select Yes (to download) @@ -93,7 +93,7 @@ Once it completes downloading, re-run `setup` to add the Whonix templates: ~~~ ./setup # Choose the same options as above, except at templates select: -# fc30, buster, whonix-gateway-15, whonix-workstation-15 +# fc36, bullseye, whonix-gateway-16, whonix-workstation-16 ~~~ Continue the build process with: @@ -144,12 +144,15 @@ gpg --fingerprint 916B8D99C38EAF5E8ADC7A2A8D66066A2EEACCDA It should look something like this: ~~~ -pub 4096R/2EEACCDA 2014-01-16 [expires: 2021-04-17] +pub rsa4096 2014-01-16 [SC] [expires: 2026-01-23] Key fingerprint = 916B 8D99 C38E AF5E 8ADC 7A2A 8D66 066A 2EEA CCDA -uid Patrick Schleizer -sub 4096R/CE998547 2014-01-16 [expires: 2021-04-17] -sub 4096R/119B3FD6 2014-01-16 [expires: 2021-04-17] -sub 4096R/77BB3C48 2014-01-16 [expires: 2021-04-17] +uid [ unknown] Patrick Schleizer +uid [ unknown] Patrick Schleizer +uid [ unknown] Patrick Schleizer +sub rsa4096 2014-01-16 [E] [expires: 2026-01-23] +sub rsa4096 2014-01-16 [A] [expires: 2026-01-23] +sub rsa4096 2014-01-16 [S] [expires: 2026-01-23] + ~~~ Next, prepare the Git keyring directory and copy them in: