anaconda 25.20.9-15, lorax-templates-qubes 4.0.6, qubes-anaconda-addon 4.0.10

comps: update debian template description
It should be "Debian 10" QubesOS/qubes-issues#5108
2019-06-28 15:44:07 +02:00 · 2019-06-26 17:13:59 +02:00 · 2019-06-25 20:02:22 +02:00 · 2019-06-25 19:52:55 +02:00 · 2019-06-24 21:17:01 +02:00 · 2019-06-24 18:10:04 +02:00
14 changed files with 73 additions and 30 deletions
--- a/3
+++ b/3
@ -59,7 +59,8 @@ iso-installer: iso-prepare
 	pushd work && pungi --name=Qubes  $(PUNGI_OPTS) -c $(INSTALLER_KICKSTART) && popd
 	# Move result files to known-named directories
 	mkdir -p build/ISO/qubes-x86_64/iso
-	mv work/$(ISO_VERSION)/x86_64/iso/*-DVD*.iso build/ISO/qubes-x86_64/iso/
+	mv work/$(ISO_VERSION)/x86_64/iso/*-DVD*.iso build/ISO/qubes-x86_64/iso/Qubes-$(ISO_VERSION)-x86_64.iso
+	echo $(ISO_VERSION) > build/ISO/qubes-x86_64/iso/build_latest
 	rm -rf build/work
 	mv work build/work
 	chown --reference=Makefile -R build yum
--- a/anaconda/0057-Add-plymouth.ignore-serial-consoles-boot-option-by-d.patch
+++ b/anaconda/0057-Add-plymouth.ignore-serial-consoles-boot-option-by-d.patch
@ -0,0 +1,29 @@
+From 83136384582280bde3379ee87898891d88463930 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
+ <marmarek@invisiblethingslab.com>
+Date: Tue, 25 Jun 2019 19:59:17 +0200
+Subject: [PATCH] Add "plymouth.ignore-serial-consoles" boot option by default
+
+This preserve graphical boot even if plymouth detects /dev/hvc0 as a
+serial console.
+
+QubesOS/qubes-issues#3849
+---
+ pyanaconda/installclasses/qubes.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pyanaconda/installclasses/qubes.py b/pyanaconda/installclasses/qubes.py
+index b5caff037..0ab8ce553 100644
+--- a/pyanaconda/installclasses/qubes.py
+++ b/pyanaconda/installclasses/qubes.py
+@@ -45,6 +45,7 @@ class InstallClass(BaseInstallClass):
+     installUpdates = False
+ 
+     bootloaderTimeoutDefault = 5
+    bootloaderExtraArgs = ["plymouth.ignore-serial-consoles"]
+ 
+     tasks = [(N_("Minimal"), ["base", "base-x", "kde-desktop-qubes", "qubes" ]) ]
+ 
+-- 
+2.20.1
+
--- a/anaconda/anaconda.spec
+++ b/anaconda/anaconda.spec
@ -3,7 +3,7 @@
 Summary: Graphical system installer
 Name:    anaconda
 Version: 25.20.9
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2+ and MIT
 Epoch:   1000
 Group:   Applications/System
@ -74,6 +74,7 @@ Patch53: 0053-anaconda-require-user-password-being-set.patch
 Patch54: 0054-anaconda-abort-installation-on-X-startup-fail.patch
 Patch55: 0055-anaconda-fix-encryption-passphrase-check.patch
 Patch56: 0056-anaconda-disable-os-prober.patch
+Patch57: 0057-Add-plymouth.ignore-serial-consoles-boot-option-by-d.patch

 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).
--- a/conf/iso-full-online.ks
+++ b/conf/iso-full-online.ks
@ -0,0 +1,7 @@
+# Full ISO build using packages from online repositories instead of local build
+%include qubes-kickstart.cfg
+
+repo --name=qubes-r4.0 --gpgkey=file:///tmp/qubes-installer/qubes-release/RPM-GPG-KEY-qubes-4.0-primary --baseurl=http://yum.qubes-os.org/r4.0/current-testing/dom0/fc25 --ignoregroups=true
+repo --name=qubes-r4.0-templates-itl --gpgkey=file:///tmp/qubes-installer/qubes-release/RPM-GPG-KEY-qubes-4.0-primary --mirrorlist=http://yum.qubes-os.org/r4.0/templates-itl/repodata/repomd.xml.metalink --ignoregroups=true
+repo --name=qubes-r4.0-templates-community --gpgkey=file:///tmp/qubes-installer/qubes-release/RPM-GPG-KEY-qubes-4.0-templates-community --mirrorlist=http://yum.qubes-os.org/r4.0/templates-community/repodata/repomd.xml.metalink --ignoregroups=true
+
--- a/conf/travis-iso-full.ks
+++ b/conf/travis-iso-full.ks
@ -1,8 +1,6 @@
-%include qubes-kickstart.cfg
+%include iso-full-online.ks

-repo --name=qubes-r4.0-testing --gpgkey=file:///tmp/qubes-installer/qubes-release/RPM-GPG-KEY-qubes-4.0-primary --baseurl=http://mirrors.ukfast.co.uk/sites/qubes-os.org/repo/yum/r4.0/current-testing/dom0/fc25 --ignoregroups=true
-repo --name=qubes-r4.0-templates-itl --gpgkey=file:///tmp/qubes-installer/qubes-release/RPM-GPG-KEY-qubes-4.0-primary --baseurl=http://mirrors.ukfast.co.uk/sites/qubes-os.org/repo/yum/r4.0/templates-itl --ignoregroups=true
-repo --name=qubes-r4.0-templates-itl-testing --gpgkey=file:///tmp/qubes-installer/qubes-release/RPM-GPG-KEY-qubes-4.0-primary --baseurl=http://mirrors.ukfast.co.uk/sites/qubes-os.org/repo/yum/r4.0/templates-itl-testing --ignoregroups=true
-repo --name=qubes-r4.0-templates-community --gpgkey=file:///tmp/qubes-installer/qubes-release/RPM-GPG-KEY-qubes-4.0-templates-community --baseurl=http://mirrors.ukfast.co.uk/sites/qubes-os.org/repo/yum/r4.0/templates-community --ignoregroups=true
-repo --name=qubes-r4.0-templates-community-testing --gpgkey=file:///tmp/qubes-installer/qubes-release/RPM-GPG-KEY-qubes-4.0-templates-community --baseurl=http://mirrors.ukfast.co.uk/sites/qubes-os.org/repo/yum/r4.0/templates-community-testing --ignoregroups=true
+repo --name=qubes-r4.0-testing --gpgkey=file:///tmp/qubes-installer/qubes-release/RPM-GPG-KEY-qubes-4.0-primary --baseurl=http://yum.qubes-os.org/r4.0/current-testing/dom0/fc25 --ignoregroups=true
+repo --name=qubes-r4.0-templates-itl-testing --gpgkey=file:///tmp/qubes-installer/qubes-release/RPM-GPG-KEY-qubes-4.0-primary --mirrorlist=http://yum.qubes-os.org/r4.0/templates-itl-testing/repodata/repomd.xml.metalink --ignoregroups=true
+repo --name=qubes-r4.0-templates-community-testing --gpgkey=file:///tmp/qubes-installer/qubes-release/RPM-GPG-KEY-qubes-4.0-templates-community --mirrorlist=http://yum.qubes-os.org/r4.0/templates-community-testing/repodata/repomd.xml.metalink --ignoregroups=true

--- a/lorax-templates-qubes/lorax-templates-qubes.spec
+++ b/lorax-templates-qubes/lorax-templates-qubes.spec
@ -1,5 +1,5 @@
 Name:		lorax-templates-qubes
-Version:	4.0.5
+Version:	4.0.6
 Release:	1%{?dist}
 Summary:	Lorax templates for Qubes installation ISO

--- a/lorax-templates-qubes/templates/config_files/x86/isolinux.cfg
+++ b/lorax-templates-qubes/templates/config_files/x86/isolinux.cfg
@ -61,12 +61,12 @@ menu separator # insert an empty line
 label linux
  menu label ^Install @PRODUCT@ @VERSION@
  kernel mboot.c32
-  append xen.gz console=none --- vmlinuz @ROOT@ i915.alpha_support=1 quiet rhgb --- initrd.img
+  append xen.gz console=none --- vmlinuz @ROOT@ i915.alpha_support=1 quiet rhgb plymouth.ignore-serial-consoles --- initrd.img
 label check
  menu label Test this ^media & install @PRODUCT@ @VERSION@
  menu default
  kernel mboot.c32
-  append xen.gz console=none --- vmlinuz @ROOT@ i915.alpha_support=1 quiet rhgb rd.live.check --- initrd.img
+  append xen.gz console=none --- vmlinuz @ROOT@ i915.alpha_support=1 quiet rhgb plymouth.ignore-serial-consoles rd.live.check --- initrd.img

 menu separator # insert an empty line

--- a/lorax-templates-qubes/templates/config_files/x86/xen-efi.cfg
+++ b/lorax-templates-qubes/templates/config_files/x86/xen-efi.cfg
@ -3,12 +3,12 @@ default=qubes-verbose

 [qubes-check]
 options=console=none
-kernel=vmlinuz @ROOT@ i915.alpha_support=1 quiet rhgb rd.live.check
+kernel=vmlinuz @ROOT@ i915.alpha_support=1 quiet rhgb plymouth.ignore-serial-consoles rd.live.check
 ramdisk=initrd.img

 [qubes]
 options=console=none
-kernel=vmlinuz @ROOT@ i915.alpha_support=1 quiet rhgb
+kernel=vmlinuz @ROOT@ i915.alpha_support=1 quiet rhgb plymouth.ignore-serial-consoles
 ramdisk=initrd.img

 [qubes-verbose]
--- a/qubes-anaconda-addon/org_qubes_os_initial_setup/gui/spokes/qubes_os.py
+++ b/qubes-anaconda-addon/org_qubes_os_initial_setup/gui/spokes/qubes_os.py
@ -228,7 +228,7 @@ class QubesOsSpoke(FirstbootOnlySpokeMixIn, NormalSpoke):

        self.qubes_user = None
        self.qubes_gid = None
-        self.default_template = 'fedora-29'
+        self.default_template = 'fedora-30'

        self.set_stage("Start-up")
        self.done = False
--- a/qubes-anaconda-addon/qubes-anaconda-addon.spec
+++ b/qubes-anaconda-addon/qubes-anaconda-addon.spec
@ -1,5 +1,5 @@
 Name:           qubes-anaconda-addon
-Version:        4.0.9
+Version:        4.0.10
 Release:        1%{?dist}
 Summary:        Anaconda addon useful for Qubes OS specific setup procedures

--- a/qubes-release/comps-qubes.xml
+++ b/qubes-release/comps-qubes.xml
@ -1398,24 +1398,31 @@
      <packagereq type="mandatory">qubes-gui-dom0</packagereq>
      <packagereq type="mandatory">qubes-desktop-linux-manager</packagereq>
      <packagereq type="mandatory">qubes-mgmt-salt-dom0</packagereq>
-      <packagereq type="mandatory">qubes-template-fedora-29</packagereq>
+      <packagereq type="mandatory">qubes-template-fedora-30</packagereq>
      <packagereq type="default">qubes-gpg-split-dom0</packagereq>
      <packagereq type="default">qubes-img-converter-dom0</packagereq>
      <packagereq type="default">qubes-input-proxy</packagereq>
      <packagereq type="default">qubes-pdf-converter-dom0</packagereq>
      <packagereq type="default">qubes-usb-proxy-dom0</packagereq>
      <packagereq type="default">libvirt-client</packagereq>
+      <!--
+      We add 'kernel-latest' and 'kernel-latest-qubes-vm' only as
+      optional because it is not included in stable official releases
+      but only in testing releases with latest kernels
+      -->
+      <packagereq type="optional">kernel-latest</packagereq>
+      <packagereq type="optional">kernel-latest-qubes-vm</packagereq>
    </packagelist>
  </group>

  <group>
    <id>debian</id>
-    <name>Debian 9 (stretch) template</name>
-    <description>Debian 9 (stretch) template</description>
+    <name>Debian 10 (buster) template</name>
+    <description>Debian 10 (buster) template</description>
    <default>true</default>
    <uservisible>true</uservisible>
    <packagelist>
-      <packagereq>qubes-template-debian-9</packagereq>
+      <packagereq>qubes-template-debian-10</packagereq>
    </packagelist>
  </group>

@ -1426,8 +1433,8 @@
    <description>Whonix templates (gateway and workstation)</description>
    <uservisible>true</uservisible>
    <packagelist>
-      <packagereq>qubes-template-whonix-gw-14</packagereq>
-      <packagereq>qubes-template-whonix-ws-14</packagereq>
+      <packagereq>qubes-template-whonix-gw-15</packagereq>
+      <packagereq>qubes-template-whonix-ws-15</packagereq>
    </packagelist>
  </group>

--- a/qubes-release/qubes-dom0.repo.in
+++ b/qubes-release/qubes-dom0.repo.in
@ -1,7 +1,7 @@
 [qubes-dom0-current]
 name = Qubes Dom0 Repository (updates)
 #baseurl = https://yum.qubes-os.org/r$releasever/current/dom0/%DIST%
-#baseurl = http://yum.sik5nlgfc5qylnnsr57qrbm64zbdx6t4lreyhpon3ychmxmiem7tioad.onion/r$releasever/current/dom0/%DIST%
+#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r$releasever/current/dom0/%DIST%
 metalink = https://yum.qubes-os.org/r$releasever/current/dom0/%DIST%/repodata/repomd.xml.metalink
 enabled = 1
 metadata_expire = 7d
@ -11,7 +11,7 @@ gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary
 [qubes-dom0-current-testing]
 name = Qubes Dom0 Repository (updates-testing)
 #baseurl = https://yum.qubes-os.org/r$releasever/current-testing/dom0/%DIST%
-#baseurl = http://yum.sik5nlgfc5qylnnsr57qrbm64zbdx6t4lreyhpon3ychmxmiem7tioad.onion/r$releasever/current-testing/dom0/%DIST%
+#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r$releasever/current-testing/dom0/%DIST%
 metalink = https://yum.qubes-os.org/r$releasever/current-testing/dom0/%DIST%/repodata/repomd.xml.metalink
 enabled = 0
 metadata_expire = 7d
@ -21,7 +21,7 @@ gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary
 [qubes-dom0-security-testing]
 name = Qubes Dom0 Repository (security-testing)
 #baseurl = https://yum.qubes-os.org/r$releasever/security-testing/dom0/%DIST%
-#baseurl = http://yum.sik5nlgfc5qylnnsr57qrbm64zbdx6t4lreyhpon3ychmxmiem7tioad.onion/r$releasever/security-testing/dom0/%DIST%
+#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r$releasever/security-testing/dom0/%DIST%
 metalink = https://yum.qubes-os.org/r$releasever/security-testing/dom0/%DIST%/repodata/repomd.xml.metalink
 enabled = 0
 metadata_expire = 7d
@ -31,7 +31,7 @@ gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary
 [qubes-dom0-unstable]
 name = Qubes Dom0 Repository (unstable)
 #baseurl = https://yum.qubes-os.org/r$releasever/unstable/dom0/%DIST%
-#baseurl = http://yum.sik5nlgfc5qylnnsr57qrbm64zbdx6t4lreyhpon3ychmxmiem7tioad.onion/r$releasever/unstable/dom0/%DIST%
+#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r$releasever/unstable/dom0/%DIST%
 metalink = https://yum.qubes-os.org/r$releasever/unstable/dom0/%DIST%/repodata/repomd.xml.metalink
 enabled = 0
 metadata_expire = 7d
--- a/qubes-release/qubes-release.spec
+++ b/qubes-release/qubes-release.spec
@ -5,7 +5,7 @@
 Summary:	Qubes release files
 Name:		qubes-release
 Version:	%{dist_version}
-Release:	7
+Release:	8
 License:	GPLv2
 Group:		System Environment/Base
 Source0:	%{name}-%{version}.tar.bz2
--- a/qubes-release/qubes-templates.repo
+++ b/qubes-release/qubes-templates.repo
@ -1,7 +1,7 @@
 [qubes-templates-itl]
 name = Qubes Templates repository
 #baseurl = https://yum.qubes-os.org/r$releasever/templates-itl
-#baseurl = http://yum.sik5nlgfc5qylnnsr57qrbm64zbdx6t4lreyhpon3ychmxmiem7tioad.onion/r$releasever/templates-itl
+#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r$releasever/templates-itl
 metalink = https://yum.qubes-os.org/r$releasever/templates-itl/repodata/repomd.xml.metalink
 enabled = 1
 fastestmirror = 1
@ -12,7 +12,7 @@ gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary
 [qubes-templates-itl-testing]
 name = Qubes Templates repository
 #baseurl = https://yum.qubes-os.org/r$releasever/templates-itl-testing
-#baseurl = http://yum.sik5nlgfc5qylnnsr57qrbm64zbdx6t4lreyhpon3ychmxmiem7tioad.onion/r$releasever/templates-itl-testing
+#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r$releasever/templates-itl-testing
 metalink = https://yum.qubes-os.org/r$releasever/templates-itl-testing/repodata/repomd.xml.metalink
 enabled = 0
 fastestmirror = 1
@ -22,7 +22,7 @@ gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary
 [qubes-templates-community]
 name = Qubes Community Templates repository
 #baseurl = https://yum.qubes-os.org/r$releasever/templates-community
-#baseurl = http://yum.sik5nlgfc5qylnnsr57qrbm64zbdx6t4lreyhpon3ychmxmiem7tioad.onion/r$releasever/templates-community
+#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r$releasever/templates-community
 metalink = https://yum.qubes-os.org/r$releasever/templates-community/repodata/repomd.xml.metalink
 enabled = 0
 fastestmirror = 1
@ -33,7 +33,7 @@ gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-templates-communi
 [qubes-templates-community-testing]
 name = Qubes Community Templates repository
 #baseurl = https://yum.qubes-os.org/r$releasever/templates-community-testing
-#baseurl = http://yum.sik5nlgfc5qylnnsr57qrbm64zbdx6t4lreyhpon3ychmxmiem7tioad.onion/r$releasever/templates-community-testing
+#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r$releasever/templates-community-testing
 metalink = https://yum.qubes-os.org/r$releasever/templates-community-testing/repodata/repomd.xml.metalink
 enabled = 0
 fastestmirror = 1
Author	SHA1	Message	Date
Marek Marczykowski-Górecki	a089792060	anaconda 25.20.9-15, lorax-templates-qubes 4.0.6, qubes-anaconda-addon 4.0.10	2019-06-28 15:44:07 +02:00
Marek Marczykowski-Górecki	3541eda275	comps: update debian template description It should be "Debian 10" QubesOS/qubes-issues#5108	2019-06-26 17:13:59 +02:00
Marek Marczykowski-Górecki	533e8e75bd	anaconda: add plymouth.ignore-serial-consoles boot option by default QubesOS/qubes-issues#3849	2019-06-25 20:02:22 +02:00
Marek Marczykowski-Górecki	f3f7ae7a87	lorax-templates-qubes: add plymouth.ignore-serial-consoles kernel option to non-verbose boot options. This will avoid automatic plymouth switch to "details" view - retaining nice graphical progress. And also will be copied to the target system, with the same effect - nice graphical boot. QubesOS/qubes-issues#3849	2019-06-25 19:52:55 +02:00
Marek Marczykowski-Górecki	afd1fe2d41	qubes-anaconda-addon: update default template QubesOS/qubes-issues#5108	2019-06-24 21:17:01 +02:00
Marek Marczykowski-Górecki	60af84f159	comps: update template versions for R4.0.2 - debian-10 - fedora-30 - whonix-{gw,ws}-15 QubesOS/qubes-issues#5108	2019-06-24 18:10:04 +02:00
Marek Marczykowski-Górecki	3c12390129	qubes-release 4.0-8 QubesOS/qubes-issues#	2019-04-13 05:28:29 +02:00
unman	2ce7edc6fe	Add new onion addresses to repo lists	2019-04-13 05:26:53 +02:00
Frédéric Pierret (fepitre)	beb177026c	Add 'kernel-latest' and 'kernel-latest-qubes-vm' as optional packages	2019-04-07 20:58:06 +02:00
Marek Marczykowski-Górecki	c92b713f9f	conf: create separate iso-full-online.ks for release builds ... using online repositories. (cherry picked from commit `8426e7c1b3`) Modified for R4.0	2019-04-06 22:37:57 +02:00
Frédéric Pierret (fepitre)	cfe1e28266	Create ISO with new name format instead of legacy one (cherry picked from commit `7458a1ad84`)	2019-04-06 00:30:34 +02:00
Frédéric Pierret (fepitre)	e574ea6c3c	Add stamp for latest built iso (cherry picked from commit `e0d309d0cc`)	2019-04-06 00:29:40 +02:00