Merge branch 'awokd-patch-4'

This commit is contained in:
Andrew David Wong 2019-04-08 01:19:06 -05:00
commit db4191a751
No known key found for this signature in database
GPG Key ID: 8CE137352A019A17
3 changed files with 13 additions and 4 deletions

View File

@ -26,7 +26,7 @@ cd ~/qubes-builder
# Select Yes to add Qubes OS Signing Key
# Select 4.0 for version
# Stable
# Select Current (if you want to use pre-built packages instead of compiling for hours)
# Select Current (if you want the option to use pre-built packages)
# Yes (we want to build only templates)
# Select fc29 and stretch (for the currently shipping templates)
# Select builder-rpm, builder-debian, template-whonix, mgmt-salt

View File

@ -145,7 +145,13 @@ Before creating the `chroot`, add this to your `builder.conf`:
USE_QUBES_REPO_VERSION = $(RELEASE)
It will add the 'current' Qubes repository to your `chroot` environment.
This way, you can build only the packages you are interested in.
Next, specify which components (`gcc`, for example) you want to download instead of compiling:
COMPONENTS := $(filter-out gcc,$(COMPONENTS))
Alternatively, edit the actual COMPONENTS list which is defined in the included version-dependent config from example-configs (see series of include directives near the beginning of `builder.conf`).
This way, you can build only the packages in which you are interested.
If you also want to use the 'current-testing' repository, add this to your configuration:
USE_QUBES_REPO_TESTING = 1

View File

@ -81,7 +81,7 @@ cd ~/qubes-builder
# Select Yes to add Qubes OS Signing Key
# Select 4.0 for version
# Stable
# Select Current (if you want to use pre-built packages instead of compiling for hours)
# Select Current (if you want the option to use pre-built packages)
# No (we want a full build)
# Select fc29 and stretch (for the currently shipping templates)
# Select builder-rpm, builder-debian, template-whonix, mgmt-salt
@ -104,9 +104,12 @@ make install-deps
make get-sources
~~~
When building the Whonix templates, you will often need to add/update the `WHONIX_TBB_VERSION` variable at this stage to specify the currently shipping Tor Browser version.
When building the Whonix templates, you will often need to add/update the `WHONIX_TBB_VERSION` variable in `builder.conf` at this stage to specify the currently shipping Tor Browser version.
See the related note under [Extra Whonix Build Options](/doc/building-whonix-template/).
You may also want to add `COMPONENTS := $(filter-out gcc,$(COMPONENTS))` to bypass a multiple hour compile step.
See [QubesBuilder](/doc/qubes-builder/#use-pre-built-qubes-packages) for more detail.
Finally, if you are making a test build, use:
~~~