From 5f6d31175155c70c3a27c3b84898bf55a119e2bd Mon Sep 17 00:00:00 2001 From: pqg Date: Tue, 24 Nov 2015 14:51:38 +0000 Subject: [PATCH 1/3] building-archlinux-template: Update instructions for R3 By adding core-qubesdb-vm to the list of make targets. Also update the list of builder.conf tweaks and add a little bit more info to help a green user build their own Arch template. --- .../building/building-archlinux-template.md | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/developers/building/building-archlinux-template.md b/developers/building/building-archlinux-template.md index 0e30ee0e..ab4f3040 100644 --- a/developers/building/building-archlinux-template.md +++ b/developers/building/building-archlinux-template.md @@ -16,12 +16,27 @@ The archlinux VM is now almost working as a NetVM. Based on qubes-builder code, Download qubes-builder git code ------------------------------- -Prefer the [marmarek git repository](https://github.com/marmarek/qubes-builder-archlinux) as it is the most recent one. +Prefer the [marmarek git repository](https://github.com/marmarek/qubes-builder) as it is the most recent one. + +~~~ +git clone https://github.com/marmarek/qubes-builder.git +~~~ Change your builder.conf ------------------------ -Change the following variables GIT\_SUBDIR=marmarek DISTS\_VM=archlinux +Change the following variables / add the following lines (as appropriate): + +~~~ +BUILDER_PLUGINS += builder-archlinux +GIT_PREFIX := marmarek/qubes- +DISTS_VM += archlinux +~~~ + +If you don't already have a `builder.conf` in the root of your qubes-builder +directory, a basic Archlinux template build may be achieved by copying +`example-configs/debian.conf` and making the above changes (don't forget to +also comment out any Debian-related `DISTS_VM += ` lines). Get all required sources ------------------------ @@ -48,6 +63,7 @@ The first use of the builder can take several hours depending on your bandwidth ~~~ make vmm-xen-vm make core-vchan-xen-vm +make core-qubesdb-vm make linux-utils-vm make core-agent-linux-vm make gui-common-vm From 39f26b128b4eafd58134e9d20a42d0b255c8544b Mon Sep 17 00:00:00 2001 From: pqg Date: Tue, 15 Dec 2015 15:04:47 +0000 Subject: [PATCH 2/3] building-archlinux-template: Simplify component build command --- developers/building/building-archlinux-template.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/developers/building/building-archlinux-template.md b/developers/building/building-archlinux-template.md index ab4f3040..81366ada 100644 --- a/developers/building/building-archlinux-template.md +++ b/developers/building/building-archlinux-template.md @@ -61,13 +61,7 @@ Make all required qubes components The first use of the builder can take several hours depending on your bandwidth as it will install an archlinux chroot: ~~~ -make vmm-xen-vm -make core-vchan-xen-vm -make core-qubesdb-vm -make linux-utils-vm -make core-agent-linux-vm -make gui-common-vm -make gui-agent-linux-vm +make qubes-vm ~~~ Now build the template itself From a8f80648cfa5459cdeb3dfb1ae557cd1ee12b099 Mon Sep 17 00:00:00 2001 From: pqg Date: Tue, 15 Dec 2015 15:05:46 +0000 Subject: [PATCH 3/3] building-archlinux-template: Add workaround for fetching mgmt-salt --- .../building/building-archlinux-template.md | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/developers/building/building-archlinux-template.md b/developers/building/building-archlinux-template.md index 81366ada..b15743d4 100644 --- a/developers/building/building-archlinux-template.md +++ b/developers/building/building-archlinux-template.md @@ -83,19 +83,17 @@ You can now find your template in qubes-src/linux-template-builder/rpm/noarch. I Known problems during building or when running the VM ===================================================== -Can't open file archlinux-2013.02.01-dual.iso ---------------------------------------------- +Build fails when fetching qubes-mgmt-salt +----------------------------------------- -Archlinux ISO files are sometimes removed from mirrors. Check the last version available on the archlinux mirror (eg: [http://mir.archlinux.fr/iso/](http://mir.archlinux.fr/iso/)), and update qubes-src/linux-template-builder/scripts\_archlinux/00\_prepare.sh accordingly: +The `qubes-mgmt-salt` repo is not currently forked under the marmarek user on +GitHub, to whom the above instructions set the `GIT_PREFIX`. As Archlinux is +not yet supported by mgmt-salt, simply leave it out of the build (when building +the Archlinux template on it's own) by appending the following to your +`builder.conf`: ~~~ -ISO_VERSION=2013.06.01 -~~~ - -You will also need to download the signature matching this ISO version inside qubes-src/linux-template-builder/scripts\_archlinux/: - -~~~ -wget http://mir.archlinux.fr/iso/2013.06.01/archlinux-2013.06.01-dual.iso.sig +BUILDER_PLUGINS := $(filter-out mgmt-salt,$(BUILDER_PLUGINS)) ~~~ The nm-applet (network manager icon) fails to start when archlinux is defined as a template-vm: