From a838306d2892aa1d29b55f9eb54b68bf4bfdb358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?= Date: Sun, 10 Feb 2019 22:48:07 +0100 Subject: [PATCH 1/3] builder: explain how to use Qubes pre-built packages QubesOS/qubes-issues#4788 --- building/qubes-builder.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/building/qubes-builder.md b/building/qubes-builder.md index 7cabbc29..62415811 100644 --- a/building/qubes-builder.md +++ b/building/qubes-builder.md @@ -135,6 +135,20 @@ If you want to somehow modify sources, you can also do it, here are some basic s make iso +### Use pre-build Qubes packages + +For building just few selected packages, it's very useful to download pre-built qubes-specific dependencies from `{yum,deb}.qubes-os.org`. This is especially true for gcc, which takes several hours to build. + +Before creating the chroot, add to your builder.conf + + USE_QUBES_REPO_VERSION = $(RELEASE) + +It will add the 'current' Qubes repository to your chroot environment. In that case, you can build only the packages you are interested in. If you want to use also the 'current-testing' repository, add also to your configuration + + USE_QUBES_REPO_TESTING = 0 + +Please note that if you have an existing chroot, this will not add the necessary configuration into the build environement. In that case, you will have to clean first your chroot. + Code verification keys management --------------------------------- From 3daf19985f995bf758088a1ca019fecf7dc8f80b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?= Date: Sun, 10 Feb 2019 23:31:53 +0100 Subject: [PATCH 2/3] Adjust explaination with respect to Marek's comment https://github.com/fepitre/qubes-doc/commit/a838306d2892aa1d29b55f9eb54b68bf4bfdb358 --- building/qubes-builder.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/building/qubes-builder.md b/building/qubes-builder.md index 62415811..82634d68 100644 --- a/building/qubes-builder.md +++ b/building/qubes-builder.md @@ -145,9 +145,11 @@ Before creating the chroot, add to your builder.conf It will add the 'current' Qubes repository to your chroot environment. In that case, you can build only the packages you are interested in. If you want to use also the 'current-testing' repository, add also to your configuration - USE_QUBES_REPO_TESTING = 0 + USE_QUBES_REPO_TESTING = 1 -Please note that if you have an existing chroot, this will not add the necessary configuration into the build environement. In that case, you will have to clean first your chroot. +In case of an existing chroot, for mock-enabled builds, it works immediately because chroot is constructed each time separately. For legacy builds, it will not add the necessary configuration into the build environement unless specific builder change or configuration would force rebuilding chroot. + +Also, once enabled, disabling this setting will not disable repositories in relevant chroots. And even if it would, there may be left packages installed from those repos (which may or may not be desirable). Code verification keys management --------------------------------- From 3a8624ed20dccffd0b78db875a2ea90e69707429 Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Mon, 11 Feb 2019 23:36:39 -0600 Subject: [PATCH 3/3] Clean up text --- building/qubes-builder.md | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/building/qubes-builder.md b/building/qubes-builder.md index 82634d68..0aefb037 100644 --- a/building/qubes-builder.md +++ b/building/qubes-builder.md @@ -135,21 +135,26 @@ If you want to somehow modify sources, you can also do it, here are some basic s make iso -### Use pre-build Qubes packages +### Use pre-built Qubes packages -For building just few selected packages, it's very useful to download pre-built qubes-specific dependencies from `{yum,deb}.qubes-os.org`. This is especially true for gcc, which takes several hours to build. +For building just few selected packages, it's very useful to download pre-built qubes-specific dependencies from `{yum,deb}.qubes-os.org`. +This is especially true for `gcc`, which takes several hours to build. -Before creating the chroot, add to your builder.conf +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. In that case, you can build only the packages you are interested in. If you want to use also the 'current-testing' repository, add also to your configuration +It will add the 'current' Qubes repository to your `chroot` environment. +This way, you can build only the packages you are interested in. +If you also want to use the 'current-testing' repository, add this to your configuration: USE_QUBES_REPO_TESTING = 1 -In case of an existing chroot, for mock-enabled builds, it works immediately because chroot is constructed each time separately. For legacy builds, it will not add the necessary configuration into the build environement unless specific builder change or configuration would force rebuilding chroot. +In the case of an existing `chroot`, for mock-enabled builds, it works immediately because `chroot` is constructed each time separately. +For legacy builds, it will not add the necessary configuration into the build environment unless a specific builder change or configuration would force rebuilding chroot. -Also, once enabled, disabling this setting will not disable repositories in relevant chroots. And even if it would, there may be left packages installed from those repos (which may or may not be desirable). +Also, once enabled, disabling this setting will not disable repositories in relevant chroots. +And even if it did, there could be leftover packages installed from those repos (which may or may not be desirable). Code verification keys management ---------------------------------