From 699d546a99b586f8b69b851bfaece7f7e9556790 Mon Sep 17 00:00:00 2001 From: tezeb Date: Fri, 18 Nov 2016 11:45:18 +0100 Subject: [PATCH 1/2] Update archlinux template building instructions --- managing-os/templates/archlinux.md | 46 ++++++++++++++---------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/managing-os/templates/archlinux.md b/managing-os/templates/archlinux.md index a0cde5fe..5afb2afb 100644 --- a/managing-os/templates/archlinux.md +++ b/managing-os/templates/archlinux.md @@ -23,7 +23,7 @@ Main maintainer of this template is [Olivier Médoc](mailto:o_medoc@yahoo.fr). ## Instructions ##
-**These are the instructions for Qubes 3.1. They will take you step by step through the entire process start to finish** +**These are the instructions for Qubes 3.2. They will take you step by step through the entire process start to finish** *Note: Currently there are no binary packages and it must be compiled from source using the instructions below.* @@ -107,10 +107,10 @@ Main maintainer of this template is [Olivier Médoc](mailto:o_medoc@yahoo.fr).

-* You will now have the Qubes Builder System environment installed in the directory below: - * **/home/user/qubes-builder** -
+* You will now have the Qubes Builder System environment installed in the directory below: + + * **/home/user/qubes-builder/**

@@ -120,11 +120,11 @@ Main maintainer of this template is [Olivier Médoc](mailto:o_medoc@yahoo.fr). *In the future this should not be needed once a change is made to the 'setup' script.* - * Edit the '**qubes-os-r3.1.conf**' which is found in **/home/user/qubes-builder/example-configs** Use the text editor of your choice. + * Edit the '**qubes-os-r3.2.conf**' which is found in **/home/user/qubes-builder/example-configs** Use the text editor of your choice. * **$ cd /home/user/qubes-builder/example-config/** - * **$ nano -W qubes-os-r3.1.conf** or **$ gedit qubes-os-r3.1.conf** or etc…. + * **$ nano -W qubes-os-r3.2.conf** or **$ gedit qubes-os-r3.2.conf** or etc….

![arch-template-06](/attachment/wiki/ArchlinuxTemplate/arch-template-06.png) @@ -172,7 +172,7 @@ Main maintainer of this template is [Olivier Médoc](mailto:o_medoc@yahoo.fr). * This screen will give you the choice of which Qubes Release to build the template for. - * Select '**Qubes Release 3.1**' + * Select '**Qubes Release 3.2**' * Select '**OK**' Press '**Enter**'

@@ -185,6 +185,9 @@ Main maintainer of this template is [Olivier Médoc](mailto:o_medoc@yahoo.fr). * Select 'QubesOS/qubes- Stable - Default Repo' * Select '**OK**' Press '**Enter**'
+
+![arch-template-12](/attachment/wiki/ArchlinuxTemplate/arch-template-12.png) +

* Screen "**Build Template Only?**" @@ -192,7 +195,7 @@ Main maintainer of this template is [Olivier Médoc](mailto:o_medoc@yahoo.fr). * Select '**Yes**' Press '**Enter**'

-![arch-template-12](/attachment/wiki/ArchlinuxTemplate/arch-template-12.png) +![arch-template-12](/attachment/wiki/ArchlinuxTemplate/arch-template-12a.png)

@@ -200,9 +203,9 @@ Main maintainer of this template is [Olivier Médoc](mailto:o_medoc@yahoo.fr). * Deselect '**Fedora**' - * Deselect '**mgnt_salt**' + * Deselect '**mgmt_salt**' - * Select '**archlinux**' + * Select '**builder-archlinux**' * Select '**OK**' Press **Enter**
@@ -213,10 +216,18 @@ Main maintainer of this template is [Olivier Médoc](mailto:o_medoc@yahoo.fr). * Screen '**Get sources**' wants to download additional packages needed for the choosen plugin/s. - * Select '**No**' Press '**Enter**' + * Select '**Yes**' Press '**Enter**'

![arch-template-14](/attachment/wiki/ArchlinuxTemplate/arch-template-14.png) +
+
+ + * Then wait for download to finish and press '**OK**' +
+
+![arch-template-14](/attachment/wiki/ArchlinuxTemplate/arch-template-15.png) +

* Screen '**Template Distribution Selection**' allows you to choose the actual template/s you wish to build. @@ -237,19 +248,6 @@ Main maintainer of this template is [Olivier Médoc](mailto:o_medoc@yahoo.fr).
![arch-template-17](/attachment/wiki/ArchlinuxTemplate/arch-template-17.png)
-
- * Archlinux builder is not(yet?) in official Qubes release branch, so it has to be downloaded from different repository. - - * Open file builder.conf with your favourite text editor and find section **"O V E R R I D E B R A N C H"** (single space -between letters) and add: - - * **GIT_URL_builder_archlinux = $(GIT_BASEURL)/marmarek/qubes-builder-archlinux.git** - -
-
-![arch-template-17](/attachment/wiki/ArchlinuxTemplate/arch-template-17a.png) -
-

##### **7: Install all the dependencies:** ##### From 4ac3ffe669136f4fe70af9891d183e64021f8b09 Mon Sep 17 00:00:00 2001 From: tezeb Date: Sat, 26 Nov 2016 09:36:49 +0100 Subject: [PATCH 2/2] Change qubes-builder repo link to official one --- managing-os/templates/archlinux.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/managing-os/templates/archlinux.md b/managing-os/templates/archlinux.md index 5afb2afb..78a6ae49 100644 --- a/managing-os/templates/archlinux.md +++ b/managing-os/templates/archlinux.md @@ -98,9 +98,9 @@ Main maintainer of this template is [Olivier Médoc](mailto:o_medoc@yahoo.fr). ##### **4: Installing the "Qubes Automated Build System":** ##### -* To get the most current build system its best to use marmarek's git repository. +* Download the latest stable qubes-builder repository: - * $ **git clone https://github.com/marmarek/qubes-builder.git** + * $ **git clone https://github.com/QubesOS/qubes-builder.git**

![arch-template-05](/attachment/wiki/ArchlinuxTemplate/arch-template-05.png)