Update to version 31.22

.gitignore

@@ -1 +1,2 @@
 pkgs/
+*.tar.bz2

.travis.yml

@@ -4,7 +4,7 @@ language: generic
 install: git clone https://github.com/QubesOS/qubes-builder ~/qubes-builder
 script: ~/qubes-builder/scripts/travis-build
 env:
- - DIST_DOM0=fc29 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1
+ - DIST_DOM0=fc31 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1
 
 # don't build tags which are meant for code signing only
 branches:

0001-add-Qubes-post-scripts.patch

@@ -1,4 +1,4 @@
-From 72a8a9c79279cb057f4500c01c8d41cbefcf7adf Mon Sep 17 00:00:00 2001
+From 8b5005d6fa938eb9b7aad0d9e6fab9ba0767635a Mon Sep 17 00:00:00 2001
 From: Tomasz Sterna <tomek@xiaoka.com>
 Date: Fri, 19 Oct 2018 08:02:11 +0200
 Subject: [PATCH] add Qubes post-scripts
@@ -81,5 +81,5 @@ index 7d78d4bc3..ad2f6497d 100644
 +dist_postscripts_DATA = 40-qubes-alt-kernels.ks 50-qubes.ks 60-systemd-preset.ks 80-setfilecons.ks 90-copy-screenshots.ks 99-copy-logs.ks
  MAINTAINERCLEANFILES = Makefile.in
 -- 
-2.20.1
+2.21.0
 

0002-Define-QUBESOS-partitionning.patch

@@ -0,0 +1,74 @@
+From 3a50b65a3ef639fef02aa708a6b5bca32d3aa3ec Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
+ <frederic.pierret@qubes-os.org>
+Date: Sat, 30 Nov 2019 17:30:35 +0100
+Subject: [PATCH] Define QUBESOS partitionning
+
+---
+ pyanaconda/core/configuration/storage.py      |  2 ++
+ .../partitioning/automatic_partitioning.py    | 22 +++++++++++++++++++
+ 2 files changed, 24 insertions(+)
+
+diff --git a/pyanaconda/core/configuration/storage.py b/pyanaconda/core/configuration/storage.py
+index d01bd8a89..140c6153c 100644
+--- a/pyanaconda/core/configuration/storage.py
++++ b/pyanaconda/core/configuration/storage.py
+@@ -26,6 +26,7 @@ class PartitioningType(Enum):
+     """Type of the default partitioning."""
+     SERVER = "SERVER"
+     WORKSTATION = "WORKSTATION"
++    QUBESOS = "QUBESOS"
+
+
+ class StorageSection(Section):
+@@ -82,6 +83,7 @@ class StorageSection(Section):
+
+           SERVER       Choose partitioning for servers.
+           WORKSTATION  Choose partitioning for workstations.
++          QUBESOS  Choose partitioning for QubesOS.
+
+         :return: an instance of PartitioningType
+         """
+diff --git a/pyanaconda/modules/storage/partitioning/automatic_partitioning.py b/pyanaconda/modules/storage/partitioning/automatic_partitioning.py
+index 59306585e..b057a2484 100644
+--- a/pyanaconda/modules/storage/partitioning/automatic_partitioning.py
++++ b/pyanaconda/modules/storage/partitioning/automatic_partitioning.py
+@@ -81,6 +81,25 @@ WORKSTATION_PARTITIONING = [
+     )
+ ]
+
++# Partitioning requirements for QubesOS.
++QUBESOS_PARTITIONING = [
++    PartSpec(
++        mountpoint="/",
++        size=Size("1GiB"),
++        required_space=Size("10GiB"),
++        grow=True,
++        btr=True,
++        lv=True,
++        thin=True,
++        encrypted=True),
++    PartSpec(
++        fstype="swap",
++        grow=False,
++        lv=True,
++        encrypted=True
++    )
++]
++
+
+ def get_default_partitioning(partitioning_type=None):
+     """Get the default partitioning requests.
+@@ -97,6 +116,9 @@ def get_default_partitioning(partitioning_type=None):
+     if partitioning_type is PartitioningType.WORKSTATION:
+         return platform.set_default_partitioning() + WORKSTATION_PARTITIONING
+
++    if partitioning_type is PartitioningType.QUBESOS:
++        return platform.set_default_partitioning() + QUBESOS_PARTITIONING
++
+     raise ValueError("Invalid partitioning type: {}".format(conf.storage.default_partitioning))
+
+
+-- 
+2.21.0
+