From a69ff955255c648a63509428177ad84e00e50ac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Fri, 10 Jul 2015 01:45:02 +0200 Subject: [PATCH] Add R2 Fedora templates --- .../fedora-21-3.0.2-201506110532.conf | 76 +++++++++++++++++++ .../fedora-21-minimal-3.0.2-201506110633.conf | 76 +++++++++++++++++++ R2/templates-itl/fedora.conf | 55 ++++++++++++++ 3 files changed, 207 insertions(+) create mode 100644 R2/templates-itl/fedora-21-3.0.2-201506110532.conf create mode 100644 R2/templates-itl/fedora-21-minimal-3.0.2-201506110633.conf create mode 100644 R2/templates-itl/fedora.conf diff --git a/R2/templates-itl/fedora-21-3.0.2-201506110532.conf b/R2/templates-itl/fedora-21-3.0.2-201506110532.conf new file mode 100644 index 0000000..e13f79b --- /dev/null +++ b/R2/templates-itl/fedora-21-3.0.2-201506110532.conf @@ -0,0 +1,76 @@ +# vim: ft=make ts=4 sw=4 + +# Ready to use config for full build of the lastest Qubes OS R2. + +GIT_BASEURL ?= https://github.com +GIT_PREFIX ?= QubesOS/qubes- +NO_SIGN ?= 1 + +BACKEND_VMM=xen + +DIST_DOM0 ?= + +DISTS_VM ?= fc21 + +BRANCH = release2 + +COMPONENTS = \ + vmm-xen \ + core-vchan-xen \ + linux-utils \ + core-agent-linux \ + artwork \ + gui-common \ + gui-agent-linux \ + gui-agent-xen-hvm-stubdom \ + app-linux-split-gpg \ + app-linux-tor \ + app-thunderbird \ + app-linux-pdf-converter \ + linux-template-builder \ + builder + +BUILDER_PLUGINS = builder-fedora + +BRANCH_linux_template_builder = master +BRANCH_app_linux_split_gpg = master +BRANCH_app_linux_tor = master +BRANCH_app_thunderbird = master +BRANCH_app_linux_pdf_converter = master +BRANCH_builder = master +BRANCH_builder_fedora = master +BRANCH_builder_debian = master +BRANCH_vmm_xen = xen-4.1 + +TEMPLATE_LABEL += fc20:fedora-20 +TEMPLATE_LABEL += fc20+minimal:fedora-20-minimal +TEMPLATE_LABEL += fc21:fedora-21 +TEMPLATE_LABEL += fc21+minimal:fedora-21-minimal + +BUILDER_TURBO_MODE = 1 + +VERBOSE=2 + +################################################################################ +### The following settings copied to builder.conf will make builder use ### +### exactly the same sources ### +################################################################################ +BRANCH_app_linux_pdf_converter = v2.0.3 +BRANCH_app_linux_split_gpg = v2.0.11 +BRANCH_app_linux_tor = v0.1.10 +BRANCH_app_thunderbird = v1.2.7 +BRANCH_artwork = v1.0.5 +BRANCH_builder = 7b13aa340db19279f63b7ee6c11e1993bb0c7986 +BRANCH_builder_fedora = ddfcf8c0d73ec7bfc2c2aaf822f2aecca14fa636 +BRANCH_core_agent_linux = v2.1.64 +BRANCH_core_vchan_xen = v2.2.11 +BRANCH_gui_agent_linux = v2.1.35 +BRANCH_gui_agent_xen_hvm_stubdom = v2.1.14 +BRANCH_gui_common = v2.0.4 +BRANCH_linux_template_builder = v3.0.2 +BRANCH_linux_utils = v2.0.20 +BRANCH_vmm_xen = v4.1.6.1-22 + + +about:: + @echo "qubes-os-r2.conf" diff --git a/R2/templates-itl/fedora-21-minimal-3.0.2-201506110633.conf b/R2/templates-itl/fedora-21-minimal-3.0.2-201506110633.conf new file mode 100644 index 0000000..111bb98 --- /dev/null +++ b/R2/templates-itl/fedora-21-minimal-3.0.2-201506110633.conf @@ -0,0 +1,76 @@ +# vim: ft=make ts=4 sw=4 + +# Ready to use config for full build of the lastest Qubes OS R2. + +GIT_BASEURL ?= https://github.com +GIT_PREFIX ?= QubesOS/qubes- +NO_SIGN ?= 1 + +BACKEND_VMM=xen + +DIST_DOM0 ?= + +DISTS_VM ?= fc20 fc21 fc20+minimal fc21+minimal + +BRANCH = release2 + +COMPONENTS = \ + vmm-xen \ + core-vchan-xen \ + linux-utils \ + core-agent-linux \ + artwork \ + gui-common \ + gui-agent-linux \ + gui-agent-xen-hvm-stubdom \ + app-linux-split-gpg \ + app-linux-tor \ + app-thunderbird \ + app-linux-pdf-converter \ + linux-template-builder \ + builder + +BUILDER_PLUGINS = builder-fedora + +BRANCH_linux_template_builder = master +BRANCH_app_linux_split_gpg = master +BRANCH_app_linux_tor = master +BRANCH_app_thunderbird = master +BRANCH_app_linux_pdf_converter = master +BRANCH_builder = master +BRANCH_builder_fedora = master +BRANCH_builder_debian = master +BRANCH_vmm_xen = xen-4.1 + +TEMPLATE_LABEL += fc20:fedora-20 +TEMPLATE_LABEL += fc20+minimal:fedora-20-minimal +TEMPLATE_LABEL += fc21:fedora-21 +TEMPLATE_LABEL += fc21+minimal:fedora-21-minimal + +BUILDER_TURBO_MODE = 1 + +VERBOSE=2 + +################################################################################ +### The following settings copied to builder.conf will make builder use ### +### exactly the same sources ### +################################################################################ +BRANCH_app_linux_pdf_converter = v2.0.3 +BRANCH_app_linux_split_gpg = v2.0.11 +BRANCH_app_linux_tor = v0.1.10 +BRANCH_app_thunderbird = v1.2.7 +BRANCH_artwork = v1.0.5 +BRANCH_builder = 7b13aa340db19279f63b7ee6c11e1993bb0c7986 +BRANCH_builder_fedora = ddfcf8c0d73ec7bfc2c2aaf822f2aecca14fa636 +BRANCH_core_agent_linux = v2.1.64 +BRANCH_core_vchan_xen = v2.2.11 +BRANCH_gui_agent_linux = v2.1.35 +BRANCH_gui_agent_xen_hvm_stubdom = v2.1.14 +BRANCH_gui_common = v2.0.4 +BRANCH_linux_template_builder = v3.0.2 +BRANCH_linux_utils = v2.0.20 +BRANCH_vmm_xen = v4.1.6.1-22 + + +about:: + @echo "qubes-os-r2.conf" diff --git a/R2/templates-itl/fedora.conf b/R2/templates-itl/fedora.conf new file mode 100644 index 0000000..af721bc --- /dev/null +++ b/R2/templates-itl/fedora.conf @@ -0,0 +1,55 @@ +# vim: ft=make ts=4 sw=4 + +# Ready to use config for full build of the lastest Qubes OS R2. + +GIT_BASEURL ?= https://github.com +GIT_PREFIX ?= QubesOS/qubes- +NO_SIGN ?= 1 + +BACKEND_VMM=xen + +DIST_DOM0 ?= + +DISTS_VM ?= fc20 fc21 fc20+minimal fc21+minimal + +BRANCH = release2 + +COMPONENTS = \ + vmm-xen \ + core-vchan-xen \ + linux-utils \ + core-agent-linux \ + artwork \ + gui-common \ + gui-agent-linux \ + gui-agent-xen-hvm-stubdom \ + app-linux-split-gpg \ + app-linux-tor \ + app-thunderbird \ + app-linux-pdf-converter \ + linux-template-builder \ + builder + +BUILDER_PLUGINS = builder-fedora + +BRANCH_linux_template_builder = master +BRANCH_app_linux_split_gpg = master +BRANCH_app_linux_tor = master +BRANCH_app_thunderbird = master +BRANCH_app_linux_pdf_converter = master +BRANCH_builder = master +BRANCH_builder_fedora = master +BRANCH_builder_debian = master +BRANCH_vmm_xen = xen-4.1 + +TEMPLATE_LABEL += fc20:fedora-20 +TEMPLATE_LABEL += fc20+minimal:fedora-20-minimal +TEMPLATE_LABEL += fc21:fedora-21 +TEMPLATE_LABEL += fc21+minimal:fedora-21-minimal + +BUILDER_TURBO_MODE = 1 + +VERBOSE=2 + +about:: + @echo "qubes-os-r2.conf"