The package rpms/calamares.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/calamares.git/commit/?id=aab85b8d....
Change:
+%ifarch x86_64 aarch64
Thanks.
Full change:
============
commit 42b4375ed7dddc33d699d62fd9190c3bc4583879
Author: Neal Gompa <ngompa13(a)gmail.com>
Date: Sat Mar 20 00:02:03 2021 -0400
Update to 3.2.39
- Drop patches included in this release
- Refresh customization patches
diff --git a/.gitignore b/.gitignore
index 7afd1a1..b17bc1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,4 @@
/calamares-3.2.35.1.tar.gz
/calamares-3.2.37.tar.gz
/calamares-3.2.38.tar.gz
+/calamares-3.2.39.tar.gz
diff --git a/calamares-3.2.38-default-settings.patch
b/calamares-3.2.39-default-settings.patch
similarity index 71%
rename from calamares-3.2.38-default-settings.patch
rename to calamares-3.2.39-default-settings.patch
index a1034df..3b6bcc3 100644
--- a/calamares-3.2.38-default-settings.patch
+++ b/calamares-3.2.39-default-settings.patch
@@ -1,6 +1,6 @@
-diff -rup calamares-3.2.38/CMakeLists.txt
calamares-3.2.38-default-settings/CMakeLists.txt
---- calamares-3.2.38/CMakeLists.txt 2021-03-14 16:49:15.000000000 -0400
-+++ calamares-3.2.38-default-settings/CMakeLists.txt 2021-03-14 19:14:48.844677294 -0400
+diff -rup calamares-3.2.39/CMakeLists.txt
calamares-3.2.39-default-settings/CMakeLists.txt
+--- calamares-3.2.39/CMakeLists.txt 2021-03-19 09:23:08.000000000 -0400
++++ calamares-3.2.39-default-settings/CMakeLists.txt 2021-03-19 16:01:05.087151965 -0400
@@ -49,7 +49,7 @@ set( CALAMARES_VERSION_RC 0 ) # Set to
### OPTIONS
@@ -10,9 +10,9 @@ diff -rup calamares-3.2.38/CMakeLists.txt
calamares-3.2.38-default-settings/CMak
option( INSTALL_POLKIT "Install Polkit configuration" ON )
option( INSTALL_COMPLETION "Install shell completions" OFF )
# Options for the calamares executable
-diff -rup calamares-3.2.38/settings.conf calamares-3.2.38-default-settings/settings.conf
---- calamares-3.2.38/settings.conf 2021-03-14 16:49:15.000000000 -0400
-+++ calamares-3.2.38-default-settings/settings.conf 2021-03-14 19:14:48.845677298 -0400
+diff -rup calamares-3.2.39/settings.conf calamares-3.2.39-default-settings/settings.conf
+--- calamares-3.2.39/settings.conf 2021-03-19 09:23:08.000000000 -0400
++++ calamares-3.2.39-default-settings/settings.conf 2021-03-19 16:01:05.089151958 -0400
@@ -134,21 +134,22 @@ sequence:
- locale
- keyboard
@@ -52,9 +52,9 @@ diff -rup calamares-3.2.38/settings.conf
calamares-3.2.38-default-settings/setti
# If this is set to true, Calamares will show an "Are you sure?" prompt right
# before each execution phase, i.e. at points of no return. If this is set to
-diff -rup calamares-3.2.38/src/branding/default/branding.desc
calamares-3.2.38-default-settings/src/branding/default/branding.desc
---- calamares-3.2.38/src/branding/default/branding.desc 2021-03-14 16:49:15.000000000
-0400
-+++ calamares-3.2.38-default-settings/src/branding/default/branding.desc 2021-03-14
19:14:48.847677307 -0400
+diff -rup calamares-3.2.39/src/branding/default/branding.desc
calamares-3.2.39-default-settings/src/branding/default/branding.desc
+--- calamares-3.2.39/src/branding/default/branding.desc 2021-03-19 09:23:08.000000000
-0400
++++ calamares-3.2.39-default-settings/src/branding/default/branding.desc 2021-03-19
16:01:05.090151955 -0400
@@ -122,12 +122,12 @@ navigation: widget
# are set to "true" (they can also be overridden).
strings:
@@ -74,9 +74,9 @@ diff -rup calamares-3.2.38/src/branding/default/branding.desc
calamares-3.2.38-d
productUrl:
https://calamares.io/
supportUrl:
https://github.com/calamares/calamares/wiki
knownIssuesUrl:
https://github.com/calamares/calamares/issues
-diff -rup calamares-3.2.38/src/modules/bootloader/bootloader.conf
calamares-3.2.38-default-settings/src/modules/bootloader/bootloader.conf
---- calamares-3.2.38/src/modules/bootloader/bootloader.conf 2021-03-14 16:49:15.000000000
-0400
-+++ calamares-3.2.38-default-settings/src/modules/bootloader/bootloader.conf 2021-03-14
19:14:48.848677312 -0400
+diff -rup calamares-3.2.39/src/modules/bootloader/bootloader.conf
calamares-3.2.39-default-settings/src/modules/bootloader/bootloader.conf
+--- calamares-3.2.39/src/modules/bootloader/bootloader.conf 2021-03-19 09:23:08.000000000
-0400
++++ calamares-3.2.39-default-settings/src/modules/bootloader/bootloader.conf 2021-03-19
16:01:05.091151951 -0400
@@ -7,7 +7,7 @@
---
# Define which bootloader you want to use for EFI installations
@@ -112,18 +112,18 @@ diff -rup calamares-3.2.38/src/modules/bootloader/bootloader.conf
calamares-3.2.
# Optionally install a copy of the GRUB EFI bootloader as the EFI
# fallback loader (either bootia32.efi or bootx64.efi depending on
-diff -rup calamares-3.2.38/src/modules/keyboard/keyboard.conf
calamares-3.2.38-default-settings/src/modules/keyboard/keyboard.conf
---- calamares-3.2.38/src/modules/keyboard/keyboard.conf 2021-03-14 16:49:15.000000000
-0400
-+++ calamares-3.2.38-default-settings/src/modules/keyboard/keyboard.conf 2021-03-14
19:14:48.849677316 -0400
+diff -rup calamares-3.2.39/src/modules/keyboard/keyboard.conf
calamares-3.2.39-default-settings/src/modules/keyboard/keyboard.conf
+--- calamares-3.2.39/src/modules/keyboard/keyboard.conf 2021-03-19 09:23:08.000000000
-0400
++++ calamares-3.2.39-default-settings/src/modules/keyboard/keyboard.conf 2021-03-19
16:01:05.092151948 -0400
@@ -20,4 +20,4 @@ convertedKeymapPath: "/lib/kbd/keymaps/x
# Write keymap configuration to /etc/default/keyboard, usually
# found on Debian-related systems.
# Defaults to true if nothing is set.
-#writeEtcDefaultKeyboard: true
+writeEtcDefaultKeyboard: false
-diff -rup calamares-3.2.38/src/modules/license/license.conf
calamares-3.2.38-default-settings/src/modules/license/license.conf
---- calamares-3.2.38/src/modules/license/license.conf 2021-03-14 16:49:15.000000000
-0400
-+++ calamares-3.2.38-default-settings/src/modules/license/license.conf 2021-03-14
19:14:48.850677321 -0400
+diff -rup calamares-3.2.39/src/modules/license/license.conf
calamares-3.2.39-default-settings/src/modules/license/license.conf
+--- calamares-3.2.39/src/modules/license/license.conf 2021-03-19 09:23:08.000000000
-0400
++++ calamares-3.2.39-default-settings/src/modules/license/license.conf 2021-03-19
16:01:05.093151945 -0400
@@ -22,24 +22,12 @@
# default, rather than requiring the user to first open it up.
# YAML: boolean, optional, default is false.
@@ -153,9 +153,9 @@ diff -rup calamares-3.2.38/src/modules/license/license.conf
calamares-3.2.38-def
# This example uses a file: link. This example uses a relative link, which
# is relative to where you run Calamares. Assuming you run it from build/
# as part of your testing, you'll get the LICENSE text for Calamares
-diff -rup calamares-3.2.38/src/modules/locale/locale.conf
calamares-3.2.38-default-settings/src/modules/locale/locale.conf
---- calamares-3.2.38/src/modules/locale/locale.conf 2021-03-14 16:49:15.000000000 -0400
-+++ calamares-3.2.38-default-settings/src/modules/locale/locale.conf 2021-03-14
19:14:48.851677325 -0400
+diff -rup calamares-3.2.39/src/modules/locale/locale.conf
calamares-3.2.39-default-settings/src/modules/locale/locale.conf
+--- calamares-3.2.39/src/modules/locale/locale.conf 2021-03-19 09:23:08.000000000 -0400
++++ calamares-3.2.39-default-settings/src/modules/locale/locale.conf 2021-03-19
16:01:05.094151941 -0400
@@ -118,8 +118,8 @@ zone: "New_York"
#
geoip:
@@ -167,9 +167,9 @@ diff -rup calamares-3.2.38/src/modules/locale/locale.conf
calamares-3.2.38-defau
# For testing purposes, you could use *fixed* style, to see how Calamares
# behaves in a particular zone:
-diff -rup calamares-3.2.38/src/modules/mount/mount.conf
calamares-3.2.38-default-settings/src/modules/mount/mount.conf
---- calamares-3.2.38/src/modules/mount/mount.conf 2021-03-14 19:14:12.291513428 -0400
-+++ calamares-3.2.38-default-settings/src/modules/mount/mount.conf 2021-03-14
19:22:57.896876338 -0400
+diff -rup calamares-3.2.39/src/modules/mount/mount.conf
calamares-3.2.39-default-settings/src/modules/mount/mount.conf
+--- calamares-3.2.39/src/modules/mount/mount.conf 2021-03-19 09:23:08.000000000 -0400
++++ calamares-3.2.39-default-settings/src/modules/mount/mount.conf 2021-03-19
16:01:05.095151938 -0400
@@ -47,10 +47,7 @@ extraMountsEfi:
btrfsSubvolumes:
@@ -186,23 +186,23 @@ diff -rup calamares-3.2.38/src/modules/mount/mount.conf
calamares-3.2.38-default
- subvolume: /@log
\ No newline at end of file
+
-diff -rup calamares-3.2.38/src/modules/netinstall/netinstall.conf
calamares-3.2.38-default-settings/src/modules/netinstall/netinstall.conf
---- calamares-3.2.38/src/modules/netinstall/netinstall.conf 2021-03-14 16:49:15.000000000
-0400
-+++ calamares-3.2.38-default-settings/src/modules/netinstall/netinstall.conf 2021-03-14
19:14:48.853677334 -0400
-@@ -63,7 +63,9 @@
- # `local` means that the data is obtained from **this** config
- # file, under the key *groups*.
+diff -rup calamares-3.2.39/src/modules/netinstall/netinstall.conf
calamares-3.2.39-default-settings/src/modules/netinstall/netinstall.conf
+--- calamares-3.2.39/src/modules/netinstall/netinstall.conf 2021-03-19 09:23:08.000000000
-0400
++++ calamares-3.2.39-default-settings/src/modules/netinstall/netinstall.conf 2021-03-19
16:01:05.097151931 -0400
+@@ -69,7 +69,9 @@
+ # they are interpreted like the *groups* key below. The special case
+ # `local` loads the data directly from **this** file.
#
-groupsUrl: local
+# Packager note: If you want to enable the netinstall module, you will also have
+# to create such a file (see the example in the source code).
+groupsUrl: file:///etc/calamares/modules/netinstall.yaml
- # If the installation can proceed without netinstall (e.g. the Live CD
- # can create a working installed system, but netinstall is preferred
-diff -rup calamares-3.2.38/src/modules/packages/packages.conf
calamares-3.2.38-default-settings/src/modules/packages/packages.conf
---- calamares-3.2.38/src/modules/packages/packages.conf 2021-03-14 16:49:15.000000000
-0400
-+++ calamares-3.2.38-default-settings/src/modules/packages/packages.conf 2021-03-14
19:14:48.854677338 -0400
+ # Alternate form:
+ # groupsUrl: [ local ]
+diff -rup calamares-3.2.39/src/modules/packages/packages.conf
calamares-3.2.39-default-settings/src/modules/packages/packages.conf
+--- calamares-3.2.39/src/modules/packages/packages.conf 2021-03-19 09:23:08.000000000
-0400
++++ calamares-3.2.39-default-settings/src/modules/packages/packages.conf 2021-03-19
16:01:05.098151928 -0400
@@ -18,7 +18,7 @@
# Not actually a package manager, but suitable for testing:
# - dummy - Dummy manager, only logs
@@ -236,9 +236,9 @@ diff -rup calamares-3.2.38/src/modules/packages/packages.conf
calamares-3.2.38-d
- - binutils
+ - try_remove:
+ - calamares
-diff -rup calamares-3.2.38/src/modules/partition/partition.conf
calamares-3.2.38-default-settings/src/modules/partition/partition.conf
---- calamares-3.2.38/src/modules/partition/partition.conf 2021-03-14 16:49:15.000000000
-0400
-+++ calamares-3.2.38-default-settings/src/modules/partition/partition.conf 2021-03-14
19:17:27.964390619 -0400
+diff -rup calamares-3.2.39/src/modules/partition/partition.conf
calamares-3.2.39-default-settings/src/modules/partition/partition.conf
+--- calamares-3.2.39/src/modules/partition/partition.conf 2021-03-19 09:23:08.000000000
-0400
++++ calamares-3.2.39-default-settings/src/modules/partition/partition.conf 2021-03-19
16:01:05.099151925 -0400
@@ -59,7 +59,7 @@ userSwapChoices:
# neverCreateSwap: false
@@ -257,9 +257,9 @@ diff -rup calamares-3.2.38/src/modules/partition/partition.conf
calamares-3.2.38
# Show/hide LUKS related functionality in automated partitioning modes.
# Disable this if you choose not to deploy early unlocking support in GRUB2
-diff -rup calamares-3.2.38/src/modules/plasmalnf/plasmalnf.conf
calamares-3.2.38-default-settings/src/modules/plasmalnf/plasmalnf.conf
---- calamares-3.2.38/src/modules/plasmalnf/plasmalnf.conf 2021-03-14 16:49:15.000000000
-0400
-+++ calamares-3.2.38-default-settings/src/modules/plasmalnf/plasmalnf.conf 2021-03-14
19:14:48.856677347 -0400
+diff -rup calamares-3.2.39/src/modules/plasmalnf/plasmalnf.conf
calamares-3.2.39-default-settings/src/modules/plasmalnf/plasmalnf.conf
+--- calamares-3.2.39/src/modules/plasmalnf/plasmalnf.conf 2021-03-19 09:23:08.000000000
-0400
++++ calamares-3.2.39-default-settings/src/modules/plasmalnf/plasmalnf.conf 2021-03-19
16:01:05.100151921 -0400
@@ -22,7 +22,7 @@ lnftool: "/usr/bin/lookandfeeltool"
# to the originating username; the lnftool will be run through
# "sudo -H -u <liveuser>" instead of directly.
@@ -299,9 +299,9 @@ diff -rup calamares-3.2.38/src/modules/plasmalnf/plasmalnf.conf
calamares-3.2.38
# You can pre-select one of the themes; it is not applied
# immediately, but its radio-button is switched on to indicate
-diff -rup calamares-3.2.38/src/modules/tracking/tracking.conf
calamares-3.2.38-default-settings/src/modules/tracking/tracking.conf
---- calamares-3.2.38/src/modules/tracking/tracking.conf 2021-03-14 16:49:15.000000000
-0400
-+++ calamares-3.2.38-default-settings/src/modules/tracking/tracking.conf 2021-03-14
19:14:48.857677352 -0400
+diff -rup calamares-3.2.39/src/modules/tracking/tracking.conf
calamares-3.2.39-default-settings/src/modules/tracking/tracking.conf
+--- calamares-3.2.39/src/modules/tracking/tracking.conf 2021-03-19 09:23:08.000000000
-0400
++++ calamares-3.2.39-default-settings/src/modules/tracking/tracking.conf 2021-03-19
16:01:05.101151918 -0400
@@ -54,13 +54,13 @@
# This is the global policy; it is displayed as a link on the page.
# If blank or commented out, no link is displayed on the tracking
@@ -318,9 +318,9 @@ diff -rup calamares-3.2.38/src/modules/tracking/tracking.conf
calamares-3.2.38-d
# The install area has one specific configuration key:
# url: this URL (remember to include the protocol, and prefer https)
-diff -rup calamares-3.2.38/src/modules/umount/umount.conf
calamares-3.2.38-default-settings/src/modules/umount/umount.conf
---- calamares-3.2.38/src/modules/umount/umount.conf 2021-03-14 16:49:15.000000000 -0400
-+++ calamares-3.2.38-default-settings/src/modules/umount/umount.conf 2021-03-14
19:14:48.858677356 -0400
+diff -rup calamares-3.2.39/src/modules/umount/umount.conf
calamares-3.2.39-default-settings/src/modules/umount/umount.conf
+--- calamares-3.2.39/src/modules/umount/umount.conf 2021-03-19 09:23:08.000000000 -0400
++++ calamares-3.2.39-default-settings/src/modules/umount/umount.conf 2021-03-19
16:01:05.101151918 -0400
@@ -18,8 +18,8 @@
---
# example when using the normal Calamares log:
@@ -332,9 +332,9 @@ diff -rup calamares-3.2.38/src/modules/umount/umount.conf
calamares-3.2.38-defau
-#srcLog: "/home/live/installation.log"
+#srcLog: "/home/liveuser/installation.log"
#destLog: "/var/log/installation.log"
-diff -rup calamares-3.2.38/src/modules/unpackfs/unpackfs.conf
calamares-3.2.38-default-settings/src/modules/unpackfs/unpackfs.conf
---- calamares-3.2.38/src/modules/unpackfs/unpackfs.conf 2021-03-14 16:49:15.000000000
-0400
-+++ calamares-3.2.38-default-settings/src/modules/unpackfs/unpackfs.conf 2021-03-14
19:14:48.859677361 -0400
+diff -rup calamares-3.2.39/src/modules/unpackfs/unpackfs.conf
calamares-3.2.39-default-settings/src/modules/unpackfs/unpackfs.conf
+--- calamares-3.2.39/src/modules/unpackfs/unpackfs.conf 2021-03-19 09:23:08.000000000
-0400
++++ calamares-3.2.39-default-settings/src/modules/unpackfs/unpackfs.conf 2021-03-19
16:01:05.102151915 -0400
@@ -88,13 +88,6 @@
# for its destination name, as in the example below.
@@ -352,9 +352,9 @@ diff -rup calamares-3.2.38/src/modules/unpackfs/unpackfs.conf
calamares-3.2.38-d
+ - source: "/dev/mapper/live-base"
+ sourcefs: "ext4"
+ destination: ""
-diff -rup calamares-3.2.38/src/modules/users/users.conf
calamares-3.2.38-default-settings/src/modules/users/users.conf
---- calamares-3.2.38/src/modules/users/users.conf 2021-03-14 16:49:15.000000000 -0400
-+++ calamares-3.2.38-default-settings/src/modules/users/users.conf 2021-03-14
19:14:48.860677365 -0400
+diff -rup calamares-3.2.39/src/modules/users/users.conf
calamares-3.2.39-default-settings/src/modules/users/users.conf
+--- calamares-3.2.39/src/modules/users/users.conf 2021-03-19 09:23:08.000000000 -0400
++++ calamares-3.2.39-default-settings/src/modules/users/users.conf 2021-03-19
16:01:05.103151911 -0400
@@ -34,8 +34,7 @@ defaultGroups:
system: true
- lp
@@ -405,9 +405,9 @@ diff -rup calamares-3.2.38/src/modules/users/users.conf
calamares-3.2.38-default
# Hostname setting
#
-diff -rup calamares-3.2.38/src/modules/welcome/welcome.conf
calamares-3.2.38-default-settings/src/modules/welcome/welcome.conf
---- calamares-3.2.38/src/modules/welcome/welcome.conf 2021-03-14 16:49:15.000000000
-0400
-+++ calamares-3.2.38-default-settings/src/modules/welcome/welcome.conf 2021-03-14
19:14:48.861677370 -0400
+diff -rup calamares-3.2.39/src/modules/welcome/welcome.conf
calamares-3.2.39-default-settings/src/modules/welcome/welcome.conf
+--- calamares-3.2.39/src/modules/welcome/welcome.conf 2021-03-19 09:23:08.000000000
-0400
++++ calamares-3.2.39-default-settings/src/modules/welcome/welcome.conf 2021-03-19
16:01:05.104151908 -0400
@@ -23,7 +23,7 @@ showSupportUrl: true
showKnownIssuesUrl: true
showReleaseNotesUrl: false
diff --git a/calamares-3.2.35.1-kdesu.patch b/calamares-3.2.39-kdesu.patch
similarity index 61%
rename from calamares-3.2.35.1-kdesu.patch
rename to calamares-3.2.39-kdesu.patch
index 76adf43..ed2211e 100644
--- a/calamares-3.2.35.1-kdesu.patch
+++ b/calamares-3.2.39-kdesu.patch
@@ -1,32 +1,30 @@
-diff -rup calamares-3.2.35.1-default-settings/calamares.desktop
calamares-3.2.35.1-kdesu/calamares.desktop
---- calamares-3.2.35.1-default-settings/calamares.desktop 2020-12-07 11:09:14.000000000
-0500
-+++ calamares-3.2.35.1-kdesu/calamares.desktop 2021-01-12 19:45:00.031816669 -0500
+diff -rup calamares-3.2.39-default-settings/calamares.desktop
calamares-3.2.39-kdesu/calamares.desktop
+--- calamares-3.2.39-default-settings/calamares.desktop 2021-03-19 09:23:08.000000000
-0400
++++ calamares-3.2.39-kdesu/calamares.desktop 2021-03-19 23:14:47.355166565 -0400
@@ -5,7 +5,7 @@ Name=Install System
GenericName=System Installer
Keywords=calamares;system;installer;
TryExec=calamares
--Exec=pkexec /usr/bin/calamares
+-Exec=sh -c "pkexec calamares"
+Exec=kdesu /usr/bin/calamares
Comment=Calamares — System Installer
Icon=calamares
Terminal=false
-diff -rup calamares-3.2.35.1-default-settings/calamares.desktop.in
calamares-3.2.35.1-kdesu/calamares.desktop.in
---- calamares-3.2.35.1-default-settings/calamares.desktop.in 2020-12-07
11:09:14.000000000 -0500
-+++ calamares-3.2.35.1-kdesu/calamares.desktop.in 2021-01-12 19:45:00.032816674 -0500
+diff -rup calamares-3.2.39-default-settings/calamares.desktop.in
calamares-3.2.39-kdesu/calamares.desktop.in
+--- calamares-3.2.39-default-settings/calamares.desktop.in 2021-03-19 09:23:08.000000000
-0400
++++ calamares-3.2.39-kdesu/calamares.desktop.in 2021-03-19 23:14:47.356166561 -0400
@@ -5,7 +5,7 @@ Name=Install System
GenericName=System Installer
Keywords=calamares;system;installer;
TryExec=calamares
--Exec=pkexec /usr/bin/calamares
+-Exec=sh -c "pkexec calamares"
+Exec=kdesu /usr/bin/calamares
Comment=Calamares — System Installer
Icon=calamares
Terminal=false
-Only in calamares-3.2.35.1-kdesu/: calamares.desktop.in.orig
-Only in calamares-3.2.35.1-kdesu/: calamares.desktop.orig
-diff -rup calamares-3.2.35.1-default-settings/CMakeLists.txt
calamares-3.2.35.1-kdesu/CMakeLists.txt
---- calamares-3.2.35.1-default-settings/CMakeLists.txt 2021-01-12 19:32:27.586834996
-0500
-+++ calamares-3.2.35.1-kdesu/CMakeLists.txt 2021-01-12 19:46:53.821418801 -0500
+diff -rup calamares-3.2.39-default-settings/CMakeLists.txt
calamares-3.2.39-kdesu/CMakeLists.txt
+--- calamares-3.2.39-default-settings/CMakeLists.txt 2021-03-19 16:01:05.087151965 -0400
++++ calamares-3.2.39-kdesu/CMakeLists.txt 2021-03-19 23:14:47.357166558 -0400
@@ -50,7 +50,6 @@ set( CALAMARES_VERSION_RC 0 ) # Set to
### OPTIONS
#
@@ -35,7 +33,7 @@ diff -rup calamares-3.2.35.1-default-settings/CMakeLists.txt
calamares-3.2.35.1-
option( INSTALL_COMPLETION "Install shell completions" OFF )
# Options for the calamares executable
option( WITH_KF5Crash "Enable crash reporting with KCrash." ON ) # TODO:3.3:
WITH->BUILD (this isn't an ABI thing)
-@@ -277,18 +276,6 @@ endif()
+@@ -282,18 +281,6 @@ endif()
find_package( Qt5DBus CONFIG )
find_package( YAMLCPP ${YAMLCPP_VERSION} REQUIRED )
@@ -54,7 +52,7 @@ diff -rup calamares-3.2.35.1-default-settings/CMakeLists.txt
calamares-3.2.35.1-
# Find ECM once, and add it to the module search path; Calamares
# modules that need ECM can do
-@@ -626,13 +613,6 @@ if( INSTALL_CONFIG )
+@@ -631,13 +618,6 @@ if( INSTALL_CONFIG )
)
endif()
diff --git a/calamares-PR1622-Improved-btrfs-subvolumes-support.patch
b/calamares-PR1622-Improved-btrfs-subvolumes-support.patch
deleted file mode 100644
index 35d8ff0..0000000
--- a/calamares-PR1622-Improved-btrfs-subvolumes-support.patch
+++ /dev/null
@@ -1,607 +0,0 @@
-From 4ab30569c2dc21e6c528edfb86eb26069b66632a Mon Sep 17 00:00:00 2001
-From: Chrysostomus <matti(a)manjaro.org>
-Date: Tue, 26 Jan 2021 21:31:33 +0200
-Subject: [PATCH 01/18] Add default configuration
-
----
- src/modules/mount/mount.conf | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/src/modules/mount/mount.conf b/src/modules/mount/mount.conf
-index 3a117d32c..19732b4d3 100644
---- a/src/modules/mount/mount.conf
-+++ b/src/modules/mount/mount.conf
-@@ -19,6 +19,10 @@
- # The device is not mounted if the mountPoint is unset or if the fs is
- # set to unformatted.
- #
-+---
-+# Btrfs subvolumes to create if root filesystem is on btrfs volume.
-+# If mountpoint is mounted already to another partition, it is ignored.
-+# Separate subvolume for swapfile is handled separately and automatically.
- extraMounts:
- - device: proc
- fs: proc
-@@ -40,3 +44,13 @@ extraMountsEfi:
- - device: efivarfs
- fs: efivarfs
- mountPoint: /sys/firmware/efi/efivars
-+
-+btrfsSubvolumes:
-+ - mountPoint: /
-+ subvolume: @
-+ - mountPoint: /home
-+ subvolume: @home
-+ - mountPoint: /var/cache
-+ subvolume: @cache
-+ - mountPoint: /var/log
-+ subvolume: @log
-\ No newline at end of file
-
-From b5cfa5109ecc81d0b7671d7b65494cf9f6dafdfc Mon Sep 17 00:00:00 2001
-From: Chrysostomus <matti(a)manjaro.org>
-Date: Tue, 26 Jan 2021 21:34:11 +0200
-Subject: [PATCH 02/18] Add schema definition
-
----
- src/modules/mount/mount.schema.yaml | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/modules/mount/mount.schema.yaml b/src/modules/mount/mount.schema.yaml
-index 2d5e4d4a0..fb5dfb69c 100644
---- a/src/modules/mount/mount.schema.yaml
-+++ b/src/modules/mount/mount.schema.yaml
-@@ -29,3 +29,12 @@ properties:
- mountPoint: { type: string }
- options: { type: string }
- required: [ device, mountPoint ]
-+ btrfsSubvolumes:
-+ type: array
-+ items:
-+ type: object
-+ additionalProperties: false
-+ properties:
-+ mountPoint: { type: string }
-+ subvolume: { type: string }
-+ required: [ subvolume, mountPoint ]
-
-From 945effb048102d2b6dc6ea763b554e889a9e85ab Mon Sep 17 00:00:00 2001
-From: Chrysostomus <matti(a)manjaro.org>
-Date: Tue, 26 Jan 2021 22:13:29 +0200
-Subject: [PATCH 03/18] Amend subvolumes to include path
-
----
- src/modules/mount/mount.conf | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/modules/mount/mount.conf b/src/modules/mount/mount.conf
-index 19732b4d3..b96d4576a 100644
---- a/src/modules/mount/mount.conf
-+++ b/src/modules/mount/mount.conf
-@@ -47,10 +47,10 @@ extraMountsEfi:
-
- btrfsSubvolumes:
- - mountPoint: /
-- subvolume: @
-+ subvolume: /@
- - mountPoint: /home
-- subvolume: @home
-+ subvolume: /@home
- - mountPoint: /var/cache
-- subvolume: @cache
-+ subvolume: /@cache
- - mountPoint: /var/log
-- subvolume: @log
-\ No newline at end of file
-+ subvolume: /@log
-\ No newline at end of file
-
-From 942221c764a8622c9b23d29b1db291404af0f63b Mon Sep 17 00:00:00 2001
-From: Chrysostomus <matti(a)manjaro.org>
-Date: Tue, 26 Jan 2021 22:24:50 +0200
-Subject: [PATCH 04/18] Generalize subvolume handling
-
----
- src/modules/mount/main.py | 39 +++++++++++++++++++--------------------
- 1 file changed, 19 insertions(+), 20 deletions(-)
-
-diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
-index 3982176df..4b0e911e3 100644
---- a/src/modules/mount/main.py
-+++ b/src/modules/mount/main.py
-@@ -81,26 +81,29 @@ def mount_partition(root_mount_point, partition, partitions):
- # If a swapfile is used, we also create a subvolume "@swap".
- # Finally we remount all of the above on the correct paths.
- if fstype == "btrfs" and partition["mountPoint"] ==
'/':
-- has_home_mount_point = False
-+ # Root has been mounted to btrfs volume -> create subvolumes from
configuration
-+ btrfs_subvolumes =
libcalamares.job.configuration.get("btrfsSubvolumes") or []
-+ subvolume_mountpoints = [d['mountPoint'] for d in btrfs_subvolumes]
-+ # Check if listed mountpoints besides / are already present and don't create
subvolume for those
- for p in partitions:
- if "mountPoint" not in p or not p["mountPoint"]:
- continue
-- if p["mountPoint"] == "/home":
-- has_home_mount_point = True
-- break
-+ if p["mountpoint"] in subvolume_mountpoints and
p["mountpoint"] != '/':
-+ # mountpoint is already define, remove subvolume from the list
-+ btrfs_subvolumes = [d for d in btrfs_subvolumes if
d['mountPoint'] != p["mountpoint"]]
-+ # Now we shouold have a valid list of needed subvolumes, so all subvolumes can
be created and mounted
-+ for s in btrfs_subvolumes:
-+ # Create the subvolume
-+ subprocess.check_call(['btrfs', 'subvolume',
'create',
-+ root_mount_point + s['subvolume']])
-+
-+ # Handle swap subvolume separately
- needs_swap_subvolume = False
- swap_choice = global_storage.value( "partitionChoices" )
- if swap_choice:
- swap_choice = swap_choice.get( "swap", None )
- if swap_choice and swap_choice == "file":
- needs_swap_subvolume = True
--
-- subprocess.check_call(['btrfs', 'subvolume', 'create',
-- root_mount_point + '/@'])
--
-- if not has_home_mount_point:
-- subprocess.check_call(['btrfs', 'subvolume',
'create',
-- root_mount_point + '/@home'])
- if needs_swap_subvolume:
- subprocess.check_call(['btrfs', 'subvolume',
'create',
- root_mount_point + '/@swap'])
-@@ -112,17 +115,13 @@ def mount_partition(root_mount_point, partition, partitions):
- if "luksMapperName" in partition:
- device = os.path.join("/dev/mapper",
partition["luksMapperName"])
-
-- if libcalamares.utils.mount(device,
-+ # Mount the subvolumes
-+ for s in btrfs_subvolumes:
-+ mount_option = f"subvol={s[subvolume]}"
-+ if libcalamares.utils.mount(device,
- mount_point,
- fstype,
-- ",".join(["subvol=@",
partition.get("options", "")])) != 0:
-- libcalamares.utils.warning("Cannot mount {}".format(device))
--
-- if not has_home_mount_point:
-- if libcalamares.utils.mount(device,
-- root_mount_point + "/home",
-- fstype,
-- ",".join(["subvol=@home",
partition.get("options", "")])) != 0:
-+ ",".join([mount_option,
partition.get("options", "")])) != 0:
- libcalamares.utils.warning("Cannot mount {}".format(device))
-
- if needs_swap_subvolume:
-
-From 4b6718b354d1831b8336946798b6113e0aebc71f Mon Sep 17 00:00:00 2001
-From: Chrysostomus <matti(a)manjaro.org>
-Date: Tue, 26 Jan 2021 22:35:42 +0200
-Subject: [PATCH 05/18] Further generalize subvolume handling
-
----
- src/modules/mount/main.py | 26 +++++++-------------------
- 1 file changed, 7 insertions(+), 19 deletions(-)
-
-diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
-index 4b0e911e3..9e7be8a68 100644
---- a/src/modules/mount/main.py
-+++ b/src/modules/mount/main.py
-@@ -89,24 +89,19 @@ def mount_partition(root_mount_point, partition, partitions):
- if "mountPoint" not in p or not p["mountPoint"]:
- continue
- if p["mountpoint"] in subvolume_mountpoints and
p["mountpoint"] != '/':
-- # mountpoint is already define, remove subvolume from the list
-+ # mountpoint is already defined, remove subvolume from the list
- btrfs_subvolumes = [d for d in btrfs_subvolumes if
d['mountPoint'] != p["mountpoint"]]
-- # Now we shouold have a valid list of needed subvolumes, so all subvolumes can
be created and mounted
-- for s in btrfs_subvolumes:
-- # Create the subvolume
-- subprocess.check_call(['btrfs', 'subvolume',
'create',
-- root_mount_point + s['subvolume']])
--
-- # Handle swap subvolume separately
-+ # Check if we need a subvolume for swap file
- needs_swap_subvolume = False
- swap_choice = global_storage.value( "partitionChoices" )
- if swap_choice:
- swap_choice = swap_choice.get( "swap", None )
- if swap_choice and swap_choice == "file":
-- needs_swap_subvolume = True
-- if needs_swap_subvolume:
-+ btrfs_subvolumes.append({'mountPoint': '/swap',
'subvolume': '/@swap'})
-+ # Create the subvolumes that are in the completed list
-+ for s in btrfs_subvolumes:
- subprocess.check_call(['btrfs', 'subvolume',
'create',
-- root_mount_point + '/@swap'])
-+ root_mount_point + s['subvolume']])
-
- subprocess.check_call(["umount", "-v", root_mount_point])
-
-@@ -122,14 +117,7 @@ def mount_partition(root_mount_point, partition, partitions):
- mount_point,
- fstype,
- ",".join([mount_option,
partition.get("options", "")])) != 0:
-- libcalamares.utils.warning("Cannot mount {}".format(device))
--
-- if needs_swap_subvolume:
-- if libcalamares.utils.mount(device,
-- root_mount_point + "/swap",
-- fstype,
-- ",".join(["subvol=@swap",
partition.get("options", "")])) != 0:
-- libcalamares.utils.warning("Cannot mount {}".format(device))
-+ libcalamares.utils.warning(f"Cannot mount {device}")
-
-
- def run():
-
-From f53f43ad03b955d43be16158912540c6d82d3025 Mon Sep 17 00:00:00 2001
-From: Chrysostomus <matti(a)manjaro.org>
-Date: Tue, 26 Jan 2021 22:42:35 +0200
-Subject: [PATCH 06/18] Remove some unnecessary bits
-
----
- src/modules/mount/main.py | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
-index 9e7be8a68..17041fdc5 100644
---- a/src/modules/mount/main.py
-+++ b/src/modules/mount/main.py
-@@ -89,10 +89,8 @@ def mount_partition(root_mount_point, partition, partitions):
- if "mountPoint" not in p or not p["mountPoint"]:
- continue
- if p["mountpoint"] in subvolume_mountpoints and
p["mountpoint"] != '/':
-- # mountpoint is already defined, remove subvolume from the list
- btrfs_subvolumes = [d for d in btrfs_subvolumes if
d['mountPoint'] != p["mountpoint"]]
- # Check if we need a subvolume for swap file
-- needs_swap_subvolume = False
- swap_choice = global_storage.value( "partitionChoices" )
- if swap_choice:
- swap_choice = swap_choice.get( "swap", None )
-
-From 092374d08ce67bdb21d77bcc02c4ad052828c302 Mon Sep 17 00:00:00 2001
-From: Chrysostomus <matti(a)manjaro.org>
-Date: Tue, 26 Jan 2021 22:48:02 +0200
-Subject: [PATCH 07/18] Add modified list to global storage
-
----
- src/modules/mount/main.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
-index 17041fdc5..7a6c1f176 100644
---- a/src/modules/mount/main.py
-+++ b/src/modules/mount/main.py
-@@ -96,6 +96,8 @@ def mount_partition(root_mount_point, partition, partitions):
- swap_choice = swap_choice.get( "swap", None )
- if swap_choice and swap_choice == "file":
- btrfs_subvolumes.append({'mountPoint': '/swap',
'subvolume': '/@swap'})
-+ # Store created list in global storage so it can be used in the fstab module
-+ libcalamares.globalstorage.insert("btrfsSubvolumes",
btrfs_subvolumes)
- # Create the subvolumes that are in the completed list
- for s in btrfs_subvolumes:
- subprocess.check_call(['btrfs', 'subvolume',
'create',
-
-From 14fbbd92dc367f56ce85c619165421e307093e84 Mon Sep 17 00:00:00 2001
-From: Chrysostomus <matti(a)manjaro.org>
-Date: Tue, 26 Jan 2021 22:56:31 +0200
-Subject: [PATCH 08/18] Get configured subvolumes from the global storage
-
----
- src/modules/fstab/main.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py
-index 6977ccad1..ed73f2f0f 100644
---- a/src/modules/fstab/main.py
-+++ b/src/modules/fstab/main.py
-@@ -192,7 +192,9 @@ def generate_fstab(self):
- 'list',
- self.root_mount_point])
- output_lines = output.splitlines()
-+ btrfs_subvolumes =
libcalamares.globalstorage.value("btrfsSubvolumes")
- for line in output_lines:
-+ # This is where changes need to go
- if line.endswith(b'path @'):
- root_entry = partition
- root_entry["subvol"] = "@"
-
-From 8c0c84f162c77c440b16cee784513237288f3b2e Mon Sep 17 00:00:00 2001
-From: Chrysostomus <matti(a)manjaro.org>
-Date: Wed, 27 Jan 2021 15:41:01 +0200
-Subject: [PATCH 09/18] Create all fstab entries one way instead of having
- special handling
-
----
- src/modules/fstab/main.py | 38 +++++++++-----------------------------
- 1 file changed, 9 insertions(+), 29 deletions(-)
-
-diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py
-index ed73f2f0f..c2e221c37 100644
---- a/src/modules/fstab/main.py
-+++ b/src/modules/fstab/main.py
-@@ -183,39 +183,19 @@ def generate_fstab(self):
- print(FSTAB_HEADER, file=fstab_file)
-
- for partition in self.partitions:
-- # Special treatment for a btrfs root with @, @home and @swap
-- # subvolumes
-+ # Special treatment for a btrfs subvolumes
- if (partition["fs"] == "btrfs"
- and partition["mountPoint"] == "/"):
-- output = subprocess.check_output(['btrfs',
-- 'subvolume',
-- 'list',
-- self.root_mount_point])
-- output_lines = output.splitlines()
-+ # Subvolume list has been created in mount.conf and curated in mount
module,
-+ # so all subvolumes here should be safe to add to fstab
- btrfs_subvolumes =
libcalamares.globalstorage.value("btrfsSubvolumes")
-- for line in output_lines:
-- # This is where changes need to go
-- if line.endswith(b'path @'):
-- root_entry = partition
-- root_entry["subvol"] = "@"
-- dct = self.generate_fstab_line_info(root_entry)
-- if dct:
-+ for s in btrfs_subvolumes:
-+ mount_entry = partition
-+ mount_entry["mountPoint"] = s["mountPoint"]
-+ home_entry["subvol"] = s["subvolume"]
-+ dct = self.generate_fstab_line_info(mount_entry)
-+ if dct:
- self.print_fstab_line(dct, file=fstab_file)
-- elif line.endswith(b'path @home'):
-- home_entry = partition
-- home_entry["mountPoint"] = "/home"
-- home_entry["subvol"] = "@home"
-- dct = self.generate_fstab_line_info(home_entry)
-- if dct:
-- self.print_fstab_line(dct, file=fstab_file)
-- elif line.endswith(b'path @swap'):
-- swap_part_entry = partition
-- swap_part_entry["mountPoint"] = "/swap"
-- swap_part_entry["subvol"] = "@swap"
-- dct = self.generate_fstab_line_info(swap_part_entry)
-- if dct:
-- self.print_fstab_line(dct, file=fstab_file)
--
- else:
- dct = self.generate_fstab_line_info(partition)
- if dct:
-
-From fcf6e2fb25fded1c0b849094dbe2632ab121d09b Mon Sep 17 00:00:00 2001
-From: Chrysostomus <matti(a)manjaro.org>
-Date: Tue, 2 Feb 2021 23:07:35 +0200
-Subject: [PATCH 10/18] fix typos
-
----
- src/modules/mount/main.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
-index 7a6c1f176..d12f88d71 100644
---- a/src/modules/mount/main.py
-+++ b/src/modules/mount/main.py
-@@ -88,7 +88,7 @@ def mount_partition(root_mount_point, partition, partitions):
- for p in partitions:
- if "mountPoint" not in p or not p["mountPoint"]:
- continue
-- if p["mountpoint"] in subvolume_mountpoints and
p["mountpoint"] != '/':
-+ if p["mountPoint"] in subvolume_mountpoints and
p["mountPoint"] != '/':
- btrfs_subvolumes = [d for d in btrfs_subvolumes if
d['mountPoint'] != p["mountpoint"]]
- # Check if we need a subvolume for swap file
- swap_choice = global_storage.value( "partitionChoices" )
-
-From 1e0295dc652ec2166a7f2acee1fcb38868c2f1e1 Mon Sep 17 00:00:00 2001
-From: Chrysostomus <matti(a)manjaro.org>
-Date: Wed, 3 Feb 2021 22:55:11 +0200
-Subject: [PATCH 11/18] Fix name error
-
----
- src/modules/mount/main.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
-index d12f88d71..5bab086a7 100644
---- a/src/modules/mount/main.py
-+++ b/src/modules/mount/main.py
-@@ -112,7 +112,7 @@ def mount_partition(root_mount_point, partition, partitions):
-
- # Mount the subvolumes
- for s in btrfs_subvolumes:
-- mount_option = f"subvol={s[subvolume]}"
-+ mount_option = f"subvol={s['subvolume']}"
- if libcalamares.utils.mount(device,
- mount_point,
- fstype,
-
-From 1896a38cccdbaab6650b69e115adb93443159346 Mon Sep 17 00:00:00 2001
-From: Chrysostomus <matti(a)manjaro.org>
-Date: Sat, 6 Feb 2021 01:38:03 +0200
-Subject: [PATCH 12/18] Fix a typo
-
----
- src/modules/mount/main.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
-index 5bab086a7..eb2614caa 100644
---- a/src/modules/mount/main.py
-+++ b/src/modules/mount/main.py
-@@ -89,7 +89,7 @@ def mount_partition(root_mount_point, partition, partitions):
- if "mountPoint" not in p or not p["mountPoint"]:
- continue
- if p["mountPoint"] in subvolume_mountpoints and
p["mountPoint"] != '/':
-- btrfs_subvolumes = [d for d in btrfs_subvolumes if
d['mountPoint'] != p["mountpoint"]]
-+ btrfs_subvolumes = [d for d in btrfs_subvolumes if
d['mountPoint'] != p["mountPoint"]]
- # Check if we need a subvolume for swap file
- swap_choice = global_storage.value( "partitionChoices" )
- if swap_choice:
-
-From 16bf7925a2524c81cc0bdd2fc28109cd5ea17ec0 Mon Sep 17 00:00:00 2001
-From: Chrysostomus <matti(a)manjaro.org>
-Date: Sat, 6 Feb 2021 19:48:09 +0200
-Subject: [PATCH 13/18] Adjust comments
-
----
- src/modules/mount/main.py | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
-index eb2614caa..50e72b316 100644
---- a/src/modules/mount/main.py
-+++ b/src/modules/mount/main.py
-@@ -74,12 +74,7 @@ def mount_partition(root_mount_point, partition, partitions):
- partition.get("options", "")) != 0:
- libcalamares.utils.warning("Cannot mount {}".format(device))
-
-- # If the root partition is btrfs, we create a subvolume "@"
-- # for the root mount point.
-- # If a separate /home partition isn't defined, we also create
-- # a subvolume "@home".
-- # If a swapfile is used, we also create a subvolume "@swap".
-- # Finally we remount all of the above on the correct paths.
-+ # Special handling for btrfs subvolumes. Create the subvolumes listed in mount.conf
- if fstype == "btrfs" and partition["mountPoint"] ==
'/':
- # Root has been mounted to btrfs volume -> create subvolumes from
configuration
- btrfs_subvolumes =
libcalamares.job.configuration.get("btrfsSubvolumes") or []
-
-From 67aedd5582c3c1426331e49ed0e8768000dfd3c3 Mon Sep 17 00:00:00 2001
-From: Chrysostomus <matti(a)manjaro.org>
-Date: Sat, 6 Feb 2021 19:54:29 +0200
-Subject: [PATCH 14/18] Move comments closer to where they are used
-
----
- src/modules/mount/mount.conf | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/modules/mount/mount.conf b/src/modules/mount/mount.conf
-index b96d4576a..6168e97cc 100644
---- a/src/modules/mount/mount.conf
-+++ b/src/modules/mount/mount.conf
-@@ -19,10 +19,6 @@
- # The device is not mounted if the mountPoint is unset or if the fs is
- # set to unformatted.
- #
-----
--# Btrfs subvolumes to create if root filesystem is on btrfs volume.
--# If mountpoint is mounted already to another partition, it is ignored.
--# Separate subvolume for swapfile is handled separately and automatically.
- extraMounts:
- - device: proc
- fs: proc
-@@ -45,6 +41,10 @@ extraMountsEfi:
- fs: efivarfs
- mountPoint: /sys/firmware/efi/efivars
-
-+# Btrfs subvolumes to create if root filesystem is on btrfs volume.
-+# If mountpoint is mounted already to another partition, it is ignored.
-+# Separate subvolume for swapfile is handled separately and automatically.
-+
- btrfsSubvolumes:
- - mountPoint: /
- subvolume: /@
-
-From b16bd6bb23a0bf4775e2626765f3166d1a820b23 Mon Sep 17 00:00:00 2001
-From: Chrysostomus <matti(a)manjaro.org>
-Date: Sat, 6 Feb 2021 20:03:30 +0200
-Subject: [PATCH 15/18] Fix name error
-
----
- src/modules/fstab/main.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py
-index c2e221c37..b6d7a4b2a 100644
---- a/src/modules/fstab/main.py
-+++ b/src/modules/fstab/main.py
-@@ -192,7 +192,7 @@ def generate_fstab(self):
- for s in btrfs_subvolumes:
- mount_entry = partition
- mount_entry["mountPoint"] = s["mountPoint"]
-- home_entry["subvol"] = s["subvolume"]
-+ mount_entry["subvol"] = s["subvolume"]
- dct = self.generate_fstab_line_info(mount_entry)
- if dct:
- self.print_fstab_line(dct, file=fstab_file)
-
-From 6d55005da07dcac8baced60c591bb6b5ee32ed2f Mon Sep 17 00:00:00 2001
-From: Chrysostomus <matti(a)manjaro.org>
-Date: Sun, 7 Feb 2021 00:16:26 +0200
-Subject: [PATCH 16/18] Mount subvolumes to correct mountpoints
-
----
- src/modules/mount/main.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
-index 50e72b316..27df309a3 100644
---- a/src/modules/mount/main.py
-+++ b/src/modules/mount/main.py
-@@ -108,8 +108,9 @@ def mount_partition(root_mount_point, partition, partitions):
- # Mount the subvolumes
- for s in btrfs_subvolumes:
- mount_option = f"subvol={s['subvolume']}"
-+ subvolume_mountpoint = mount_point[:-1] + s['mountPoint']
- if libcalamares.utils.mount(device,
-- mount_point,
-+ subvolume_mountpoint,
- fstype,
- ",".join([mount_option,
partition.get("options", "")])) != 0:
- libcalamares.utils.warning(f"Cannot mount {device}")
-
-From 0c92a36a5393114a2bafd3af654954bdb1ae9bd9 Mon Sep 17 00:00:00 2001
-From: Chrysostomus <matti(a)manjaro.org>
-Date: Sun, 7 Feb 2021 15:29:30 +0200
-Subject: [PATCH 17/18] Remove unnecessary comment
-
----
- src/modules/mount/main.py | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
-index 27df309a3..69c994efc 100644
---- a/src/modules/mount/main.py
-+++ b/src/modules/mount/main.py
-@@ -32,9 +32,6 @@ def pretty_name():
- def mount_partition(root_mount_point, partition, partitions):
- """
- Do a single mount of @p partition inside @p root_mount_point.
--
-- The @p partitions are used to handle btrfs special-cases:
-- then subvolumes are created for root and home.
- """
- # Create mount point with `+` rather than `os.path.join()` because
- # `partition["mountPoint"]` starts with a '/'.
-
-From 16eff98a0653807d5a38a06cc4ccba7983c6ee10 Mon Sep 17 00:00:00 2001
-From: Chrysostomus <matti(a)manjaro.org>
-Date: Sun, 7 Feb 2021 15:39:38 +0200
-Subject: [PATCH 18/18] Don't use f-strings yet.
-
----
- src/modules/mount/main.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
-index 69c994efc..07166dd75 100644
---- a/src/modules/mount/main.py
-+++ b/src/modules/mount/main.py
-@@ -104,13 +104,13 @@ def mount_partition(root_mount_point, partition, partitions):
-
- # Mount the subvolumes
- for s in btrfs_subvolumes:
-- mount_option = f"subvol={s['subvolume']}"
-+ mount_option = "subvol={}".format(s['subvolume'])
- subvolume_mountpoint = mount_point[:-1] + s['mountPoint']
- if libcalamares.utils.mount(device,
- subvolume_mountpoint,
- fstype,
- ",".join([mount_option,
partition.get("options", "")])) != 0:
-- libcalamares.utils.warning(f"Cannot mount {device}")
-+ libcalamares.utils.warning("Cannot mount {}".format(device))
-
-
- def run():
diff --git a/calamares.spec b/calamares.spec
index ffa7dbe..0a26f80 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -17,7 +17,7 @@
%endif
Name: calamares
-Version: 3.2.38
+Version: 3.2.39
Release: %{baserelease}%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c
-13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist}
Summary: Installer from a live CD/DVD/USB to disk
@@ -38,15 +38,11 @@ Source4: calamares-auto_de.ts
# then translate the template in linguist-qt5.
Source5: calamares-auto_it.ts
-# Backport improved Btrfs support (remove when updating to 3.2.39)
-## From:
https://github.com/calamares/calamares/pull/1622
-Patch0: calamares-PR1622-Improved-btrfs-subvolumes-support.patch
-
# adjust some default settings (default shipped .conf files)
-Patch1: calamares-3.2.38-default-settings.patch
+Patch0: calamares-3.2.39-default-settings.patch
# use kdesu instead of pkexec (works around #1171779)
-Patch2: calamares-3.2.35.1-kdesu.patch
+Patch1: calamares-3.2.39-kdesu.patch
# Calamares is only supported where live images (and GRUB) are. (#1171380)
# This list matches the arches where grub2-efi is used to boot the system
@@ -86,6 +82,7 @@ BuildRequires: qt5-qtwebkit-devel >= 5.212
BuildRequires: kf5-kconfig-devel
BuildRequires: kf5-kcoreaddons-devel
BuildRequires: kf5-kcrash-devel
+BuildRequires: kf5-kdbusaddons-devel
BuildRequires: kf5-ki18n-devel
BuildRequires: kf5-kpackage-devel
BuildRequires: kf5-kparts-devel
@@ -98,10 +95,13 @@ BuildRequires: kpmcore-devel >= 4.2.0
# Python 3
BuildRequires: python3-devel >= 3.3
+BuildRequires: python3-jsonschema
+BuildRequires: python3-pyyaml
BuildRequires: boost-python3-devel >= 1.55.0
%global __python %{__python3}
# Other libraries
+BuildRequires: appstream-qt-devel
BuildRequires: libpwquality-devel
BuildRequires: libxcrypt-devel
BuildRequires: parted-devel
@@ -204,13 +204,10 @@ developing custom modules for Calamares.
%prep
%setup -q %{?snaphash:-n %{name}-%{snaphash}} %{!?snaphash:%{?prerelease:-n
%{name}-%{version}-%{prerelease}}}
-%patch0 -p1 -b .btrfs
-# delete backup files so they don't get installed
-rm -f src/modules/*/*.conf.btrfs
-%patch1 -p1 -b .default-settings
+%patch0 -p1 -b .default-settings
# delete backup files so they don't get installed
rm -f src/modules/*/*.conf.default-settings
-%patch2 -p1 -b .kdesu
+%patch1 -p1 -b .kdesu
%build
%{cmake_kf5} -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \
@@ -364,6 +361,11 @@ EOF
%changelog
+* Sat Mar 20 2021 Neal Gompa <ngompa13(a)gmail.com> - 3.2.39-1
+- Update to 3.2.39
+- Drop patches included in this release
+- Refresh customization patches
+
* Sun Mar 14 2021 Neal Gompa <ngompa13(a)gmail.com> - 3.2.38-1
- Update to 3.2.38
- Backport improved Btrfs support
diff --git a/sources b/sources
index 75cad43..fddc50f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (calamares-3.2.38.tar.gz) =
b295f731bc4d5f33e8a521dd077032e42fc13265b22f9aca5d42438a53515611852e005081ae0ccfac3f8ac46e38705d65c79ea4f827f0c6b6bbc87acd5adb9c
+SHA512 (calamares-3.2.39.tar.gz) =
0676a1c038d0b8b260b2228f8c7ff0a8a0b670705e50ef3e0a695dd7bea43a28a299c5eaefdd5eba28eeb2558f02f61c0b0fe01b0b817489b9a4879128a85889
commit 32c44f6d01fff6242e10af98f70e1cdd2e731fa8
Author: Neal Gompa <ngompa13(a)gmail.com>
Date: Sun Mar 14 20:43:48 2021 -0400
Update to 3.2.38
- Backport improved Btrfs support
- Set Btrfs by default with the Fedora Btrfs layout
diff --git a/.gitignore b/.gitignore
index 0e19818..7afd1a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,4 @@
/calamares-3.2.11.tar.gz
/calamares-3.2.35.1.tar.gz
/calamares-3.2.37.tar.gz
+/calamares-3.2.38.tar.gz
diff --git a/calamares-3.2.37-default-settings.patch
b/calamares-3.2.38-default-settings.patch
similarity index 68%
rename from calamares-3.2.37-default-settings.patch
rename to calamares-3.2.38-default-settings.patch
index 12ffc13..a1034df 100644
--- a/calamares-3.2.37-default-settings.patch
+++ b/calamares-3.2.38-default-settings.patch
@@ -1,6 +1,6 @@
-diff -rup calamares-3.2.37/CMakeLists.txt
calamares-3.2.37-default-settings/CMakeLists.txt
---- calamares-3.2.37/CMakeLists.txt 2021-02-23 10:36:31.000000000 -0500
-+++ calamares-3.2.37-default-settings/CMakeLists.txt 2021-03-06 09:50:21.057934003 -0500
+diff -rup calamares-3.2.38/CMakeLists.txt
calamares-3.2.38-default-settings/CMakeLists.txt
+--- calamares-3.2.38/CMakeLists.txt 2021-03-14 16:49:15.000000000 -0400
++++ calamares-3.2.38-default-settings/CMakeLists.txt 2021-03-14 19:14:48.844677294 -0400
@@ -49,7 +49,7 @@ set( CALAMARES_VERSION_RC 0 ) # Set to
### OPTIONS
@@ -10,9 +10,9 @@ diff -rup calamares-3.2.37/CMakeLists.txt
calamares-3.2.37-default-settings/CMak
option( INSTALL_POLKIT "Install Polkit configuration" ON )
option( INSTALL_COMPLETION "Install shell completions" OFF )
# Options for the calamares executable
-diff -rup calamares-3.2.37/settings.conf calamares-3.2.37-default-settings/settings.conf
---- calamares-3.2.37/settings.conf 2021-02-23 10:36:31.000000000 -0500
-+++ calamares-3.2.37-default-settings/settings.conf 2021-03-06 09:50:21.059934010 -0500
+diff -rup calamares-3.2.38/settings.conf calamares-3.2.38-default-settings/settings.conf
+--- calamares-3.2.38/settings.conf 2021-03-14 16:49:15.000000000 -0400
++++ calamares-3.2.38-default-settings/settings.conf 2021-03-14 19:14:48.845677298 -0400
@@ -134,21 +134,22 @@ sequence:
- locale
- keyboard
@@ -52,9 +52,9 @@ diff -rup calamares-3.2.37/settings.conf
calamares-3.2.37-default-settings/setti
# If this is set to true, Calamares will show an "Are you sure?" prompt right
# before each execution phase, i.e. at points of no return. If this is set to
-diff -rup calamares-3.2.37/src/branding/default/branding.desc
calamares-3.2.37-default-settings/src/branding/default/branding.desc
---- calamares-3.2.37/src/branding/default/branding.desc 2021-02-23 10:36:31.000000000
-0500
-+++ calamares-3.2.37-default-settings/src/branding/default/branding.desc 2021-03-06
09:50:21.060934014 -0500
+diff -rup calamares-3.2.38/src/branding/default/branding.desc
calamares-3.2.38-default-settings/src/branding/default/branding.desc
+--- calamares-3.2.38/src/branding/default/branding.desc 2021-03-14 16:49:15.000000000
-0400
++++ calamares-3.2.38-default-settings/src/branding/default/branding.desc 2021-03-14
19:14:48.847677307 -0400
@@ -122,12 +122,12 @@ navigation: widget
# are set to "true" (they can also be overridden).
strings:
@@ -74,9 +74,9 @@ diff -rup calamares-3.2.37/src/branding/default/branding.desc
calamares-3.2.37-d
productUrl:
https://calamares.io/
supportUrl:
https://github.com/calamares/calamares/wiki
knownIssuesUrl:
https://github.com/calamares/calamares/issues
-diff -rup calamares-3.2.37/src/modules/bootloader/bootloader.conf
calamares-3.2.37-default-settings/src/modules/bootloader/bootloader.conf
---- calamares-3.2.37/src/modules/bootloader/bootloader.conf 2021-02-23 10:36:31.000000000
-0500
-+++ calamares-3.2.37-default-settings/src/modules/bootloader/bootloader.conf 2021-03-06
09:50:21.061934017 -0500
+diff -rup calamares-3.2.38/src/modules/bootloader/bootloader.conf
calamares-3.2.38-default-settings/src/modules/bootloader/bootloader.conf
+--- calamares-3.2.38/src/modules/bootloader/bootloader.conf 2021-03-14 16:49:15.000000000
-0400
++++ calamares-3.2.38-default-settings/src/modules/bootloader/bootloader.conf 2021-03-14
19:14:48.848677312 -0400
@@ -7,7 +7,7 @@
---
# Define which bootloader you want to use for EFI installations
@@ -112,18 +112,18 @@ diff -rup calamares-3.2.37/src/modules/bootloader/bootloader.conf
calamares-3.2.
# Optionally install a copy of the GRUB EFI bootloader as the EFI
# fallback loader (either bootia32.efi or bootx64.efi depending on
-diff -rup calamares-3.2.37/src/modules/keyboard/keyboard.conf
calamares-3.2.37-default-settings/src/modules/keyboard/keyboard.conf
---- calamares-3.2.37/src/modules/keyboard/keyboard.conf 2021-02-23 10:36:31.000000000
-0500
-+++ calamares-3.2.37-default-settings/src/modules/keyboard/keyboard.conf 2021-03-06
09:50:21.062934021 -0500
+diff -rup calamares-3.2.38/src/modules/keyboard/keyboard.conf
calamares-3.2.38-default-settings/src/modules/keyboard/keyboard.conf
+--- calamares-3.2.38/src/modules/keyboard/keyboard.conf 2021-03-14 16:49:15.000000000
-0400
++++ calamares-3.2.38-default-settings/src/modules/keyboard/keyboard.conf 2021-03-14
19:14:48.849677316 -0400
@@ -20,4 +20,4 @@ convertedKeymapPath: "/lib/kbd/keymaps/x
# Write keymap configuration to /etc/default/keyboard, usually
# found on Debian-related systems.
# Defaults to true if nothing is set.
-#writeEtcDefaultKeyboard: true
+writeEtcDefaultKeyboard: false
-diff -rup calamares-3.2.37/src/modules/license/license.conf
calamares-3.2.37-default-settings/src/modules/license/license.conf
---- calamares-3.2.37/src/modules/license/license.conf 2021-02-23 10:36:31.000000000
-0500
-+++ calamares-3.2.37-default-settings/src/modules/license/license.conf 2021-03-06
09:50:21.063934024 -0500
+diff -rup calamares-3.2.38/src/modules/license/license.conf
calamares-3.2.38-default-settings/src/modules/license/license.conf
+--- calamares-3.2.38/src/modules/license/license.conf 2021-03-14 16:49:15.000000000
-0400
++++ calamares-3.2.38-default-settings/src/modules/license/license.conf 2021-03-14
19:14:48.850677321 -0400
@@ -22,24 +22,12 @@
# default, rather than requiring the user to first open it up.
# YAML: boolean, optional, default is false.
@@ -153,9 +153,9 @@ diff -rup calamares-3.2.37/src/modules/license/license.conf
calamares-3.2.37-def
# This example uses a file: link. This example uses a relative link, which
# is relative to where you run Calamares. Assuming you run it from build/
# as part of your testing, you'll get the LICENSE text for Calamares
-diff -rup calamares-3.2.37/src/modules/locale/locale.conf
calamares-3.2.37-default-settings/src/modules/locale/locale.conf
---- calamares-3.2.37/src/modules/locale/locale.conf 2021-02-23 10:36:31.000000000 -0500
-+++ calamares-3.2.37-default-settings/src/modules/locale/locale.conf 2021-03-06
09:50:21.064934027 -0500
+diff -rup calamares-3.2.38/src/modules/locale/locale.conf
calamares-3.2.38-default-settings/src/modules/locale/locale.conf
+--- calamares-3.2.38/src/modules/locale/locale.conf 2021-03-14 16:49:15.000000000 -0400
++++ calamares-3.2.38-default-settings/src/modules/locale/locale.conf 2021-03-14
19:14:48.851677325 -0400
@@ -118,8 +118,8 @@ zone: "New_York"
#
geoip:
@@ -167,9 +167,28 @@ diff -rup calamares-3.2.37/src/modules/locale/locale.conf
calamares-3.2.37-defau
# For testing purposes, you could use *fixed* style, to see how Calamares
# behaves in a particular zone:
-diff -rup calamares-3.2.37/src/modules/netinstall/netinstall.conf
calamares-3.2.37-default-settings/src/modules/netinstall/netinstall.conf
---- calamares-3.2.37/src/modules/netinstall/netinstall.conf 2021-02-23 10:36:31.000000000
-0500
-+++ calamares-3.2.37-default-settings/src/modules/netinstall/netinstall.conf 2021-03-06
09:50:21.065934031 -0500
+diff -rup calamares-3.2.38/src/modules/mount/mount.conf
calamares-3.2.38-default-settings/src/modules/mount/mount.conf
+--- calamares-3.2.38/src/modules/mount/mount.conf 2021-03-14 19:14:12.291513428 -0400
++++ calamares-3.2.38-default-settings/src/modules/mount/mount.conf 2021-03-14
19:22:57.896876338 -0400
+@@ -47,10 +47,7 @@ extraMountsEfi:
+
+ btrfsSubvolumes:
+ - mountPoint: /
+- subvolume: /@
++ subvolume: /@root
++ - mountPoint: /boot
++ subvolume: /@boot
+ - mountPoint: /home
+ subvolume: /@home
+- - mountPoint: /var/cache
+- subvolume: /@cache
+- - mountPoint: /var/log
+- subvolume: /@log
+\ No newline at end of file
++
+diff -rup calamares-3.2.38/src/modules/netinstall/netinstall.conf
calamares-3.2.38-default-settings/src/modules/netinstall/netinstall.conf
+--- calamares-3.2.38/src/modules/netinstall/netinstall.conf 2021-03-14 16:49:15.000000000
-0400
++++ calamares-3.2.38-default-settings/src/modules/netinstall/netinstall.conf 2021-03-14
19:14:48.853677334 -0400
@@ -63,7 +63,9 @@
# `local` means that the data is obtained from **this** config
# file, under the key *groups*.
@@ -181,10 +200,10 @@ diff -rup calamares-3.2.37/src/modules/netinstall/netinstall.conf
calamares-3.2.
# If the installation can proceed without netinstall (e.g. the Live CD
# can create a working installed system, but netinstall is preferred
-diff -rup calamares-3.2.37/src/modules/packages/packages.conf
calamares-3.2.37-default-settings/src/modules/packages/packages.conf
---- calamares-3.2.37/src/modules/packages/packages.conf 2021-02-23 10:36:31.000000000
-0500
-+++ calamares-3.2.37-default-settings/src/modules/packages/packages.conf 2021-03-06
09:50:21.066934034 -0500
-@@ -19,7 +19,7 @@
+diff -rup calamares-3.2.38/src/modules/packages/packages.conf
calamares-3.2.38-default-settings/src/modules/packages/packages.conf
+--- calamares-3.2.38/src/modules/packages/packages.conf 2021-03-14 16:49:15.000000000
-0400
++++ calamares-3.2.38-default-settings/src/modules/packages/packages.conf 2021-03-14
19:14:48.854677338 -0400
+@@ -18,7 +18,7 @@
# Not actually a package manager, but suitable for testing:
# - dummy - Dummy manager, only logs
#
@@ -193,7 +212,7 @@ diff -rup calamares-3.2.37/src/modules/packages/packages.conf
calamares-3.2.37-d
#
# Often package installation needs an internet connection.
-@@ -43,7 +43,7 @@ backend: dummy
+@@ -42,7 +42,7 @@ backend: dummy
# Therefore set also "update_system" to 'true'.
#
skip_if_no_internet: false
@@ -202,7 +221,7 @@ diff -rup calamares-3.2.37/src/modules/packages/packages.conf
calamares-3.2.37-d
update_system: false
#
-@@ -169,12 +169,5 @@ update_system: false
+@@ -168,12 +168,5 @@ update_system: false
# of packages, this can lead to a considerable time savings.
#
operations:
@@ -217,9 +236,9 @@ diff -rup calamares-3.2.37/src/modules/packages/packages.conf
calamares-3.2.37-d
- - binutils
+ - try_remove:
+ - calamares
-diff -rup calamares-3.2.37/src/modules/partition/partition.conf
calamares-3.2.37-default-settings/src/modules/partition/partition.conf
---- calamares-3.2.37/src/modules/partition/partition.conf 2021-02-23 10:36:31.000000000
-0500
-+++ calamares-3.2.37-default-settings/src/modules/partition/partition.conf 2021-03-06
09:50:21.067934038 -0500
+diff -rup calamares-3.2.38/src/modules/partition/partition.conf
calamares-3.2.38-default-settings/src/modules/partition/partition.conf
+--- calamares-3.2.38/src/modules/partition/partition.conf 2021-03-14 16:49:15.000000000
-0400
++++ calamares-3.2.38-default-settings/src/modules/partition/partition.conf 2021-03-14
19:17:27.964390619 -0400
@@ -59,7 +59,7 @@ userSwapChoices:
# neverCreateSwap: false
@@ -229,9 +248,18 @@ diff -rup calamares-3.2.37/src/modules/partition/partition.conf
calamares-3.2.37
# Show/hide partition labels on manual partitioning page.
alwaysShowPartitionLabels: true
-diff -rup calamares-3.2.37/src/modules/plasmalnf/plasmalnf.conf
calamares-3.2.37-default-settings/src/modules/plasmalnf/plasmalnf.conf
---- calamares-3.2.37/src/modules/plasmalnf/plasmalnf.conf 2021-02-23 10:36:31.000000000
-0500
-+++ calamares-3.2.37-default-settings/src/modules/plasmalnf/plasmalnf.conf 2021-03-06
09:50:21.069934045 -0500
+@@ -137,7 +137,7 @@ initialSwapChoice: none
+ # If nothing is specified, Calamares defaults to "ext4".
+ #
+ # Names are case-sensitive and defined by KPMCore.
+-defaultFileSystemType: "ext4"
++defaultFileSystemType: "btrfs"
+
+ # Show/hide LUKS related functionality in automated partitioning modes.
+ # Disable this if you choose not to deploy early unlocking support in GRUB2
+diff -rup calamares-3.2.38/src/modules/plasmalnf/plasmalnf.conf
calamares-3.2.38-default-settings/src/modules/plasmalnf/plasmalnf.conf
+--- calamares-3.2.38/src/modules/plasmalnf/plasmalnf.conf 2021-03-14 16:49:15.000000000
-0400
++++ calamares-3.2.38-default-settings/src/modules/plasmalnf/plasmalnf.conf 2021-03-14
19:14:48.856677347 -0400
@@ -22,7 +22,7 @@ lnftool: "/usr/bin/lookandfeeltool"
# to the originating username; the lnftool will be run through
# "sudo -H -u <liveuser>" instead of directly.
@@ -271,9 +299,9 @@ diff -rup calamares-3.2.37/src/modules/plasmalnf/plasmalnf.conf
calamares-3.2.37
# You can pre-select one of the themes; it is not applied
# immediately, but its radio-button is switched on to indicate
-diff -rup calamares-3.2.37/src/modules/tracking/tracking.conf
calamares-3.2.37-default-settings/src/modules/tracking/tracking.conf
---- calamares-3.2.37/src/modules/tracking/tracking.conf 2021-02-23 10:36:31.000000000
-0500
-+++ calamares-3.2.37-default-settings/src/modules/tracking/tracking.conf 2021-03-06
09:50:21.070934048 -0500
+diff -rup calamares-3.2.38/src/modules/tracking/tracking.conf
calamares-3.2.38-default-settings/src/modules/tracking/tracking.conf
+--- calamares-3.2.38/src/modules/tracking/tracking.conf 2021-03-14 16:49:15.000000000
-0400
++++ calamares-3.2.38-default-settings/src/modules/tracking/tracking.conf 2021-03-14
19:14:48.857677352 -0400
@@ -54,13 +54,13 @@
# This is the global policy; it is displayed as a link on the page.
# If blank or commented out, no link is displayed on the tracking
@@ -290,9 +318,9 @@ diff -rup calamares-3.2.37/src/modules/tracking/tracking.conf
calamares-3.2.37-d
# The install area has one specific configuration key:
# url: this URL (remember to include the protocol, and prefer https)
-diff -rup calamares-3.2.37/src/modules/umount/umount.conf
calamares-3.2.37-default-settings/src/modules/umount/umount.conf
---- calamares-3.2.37/src/modules/umount/umount.conf 2021-02-23 10:36:31.000000000 -0500
-+++ calamares-3.2.37-default-settings/src/modules/umount/umount.conf 2021-03-06
09:50:21.071934052 -0500
+diff -rup calamares-3.2.38/src/modules/umount/umount.conf
calamares-3.2.38-default-settings/src/modules/umount/umount.conf
+--- calamares-3.2.38/src/modules/umount/umount.conf 2021-03-14 16:49:15.000000000 -0400
++++ calamares-3.2.38-default-settings/src/modules/umount/umount.conf 2021-03-14
19:14:48.858677356 -0400
@@ -18,8 +18,8 @@
---
# example when using the normal Calamares log:
@@ -304,9 +332,9 @@ diff -rup calamares-3.2.37/src/modules/umount/umount.conf
calamares-3.2.37-defau
-#srcLog: "/home/live/installation.log"
+#srcLog: "/home/liveuser/installation.log"
#destLog: "/var/log/installation.log"
-diff -rup calamares-3.2.37/src/modules/unpackfs/unpackfs.conf
calamares-3.2.37-default-settings/src/modules/unpackfs/unpackfs.conf
---- calamares-3.2.37/src/modules/unpackfs/unpackfs.conf 2021-02-23 10:36:31.000000000
-0500
-+++ calamares-3.2.37-default-settings/src/modules/unpackfs/unpackfs.conf 2021-03-06
09:50:21.072934055 -0500
+diff -rup calamares-3.2.38/src/modules/unpackfs/unpackfs.conf
calamares-3.2.38-default-settings/src/modules/unpackfs/unpackfs.conf
+--- calamares-3.2.38/src/modules/unpackfs/unpackfs.conf 2021-03-14 16:49:15.000000000
-0400
++++ calamares-3.2.38-default-settings/src/modules/unpackfs/unpackfs.conf 2021-03-14
19:14:48.859677361 -0400
@@ -88,13 +88,6 @@
# for its destination name, as in the example below.
@@ -324,9 +352,9 @@ diff -rup calamares-3.2.37/src/modules/unpackfs/unpackfs.conf
calamares-3.2.37-d
+ - source: "/dev/mapper/live-base"
+ sourcefs: "ext4"
+ destination: ""
-diff -rup calamares-3.2.37/src/modules/users/users.conf
calamares-3.2.37-default-settings/src/modules/users/users.conf
---- calamares-3.2.37/src/modules/users/users.conf 2021-02-23 10:36:31.000000000 -0500
-+++ calamares-3.2.37-default-settings/src/modules/users/users.conf 2021-03-06
09:50:21.073934059 -0500
+diff -rup calamares-3.2.38/src/modules/users/users.conf
calamares-3.2.38-default-settings/src/modules/users/users.conf
+--- calamares-3.2.38/src/modules/users/users.conf 2021-03-14 16:49:15.000000000 -0400
++++ calamares-3.2.38-default-settings/src/modules/users/users.conf 2021-03-14
19:14:48.860677365 -0400
@@ -34,8 +34,7 @@ defaultGroups:
system: true
- lp
@@ -377,9 +405,9 @@ diff -rup calamares-3.2.37/src/modules/users/users.conf
calamares-3.2.37-default
# Hostname setting
#
-diff -rup calamares-3.2.37/src/modules/welcome/welcome.conf
calamares-3.2.37-default-settings/src/modules/welcome/welcome.conf
---- calamares-3.2.37/src/modules/welcome/welcome.conf 2021-02-23 10:36:31.000000000
-0500
-+++ calamares-3.2.37-default-settings/src/modules/welcome/welcome.conf 2021-03-06
09:51:51.366250140 -0500
+diff -rup calamares-3.2.38/src/modules/welcome/welcome.conf
calamares-3.2.38-default-settings/src/modules/welcome/welcome.conf
+--- calamares-3.2.38/src/modules/welcome/welcome.conf 2021-03-14 16:49:15.000000000
-0400
++++ calamares-3.2.38-default-settings/src/modules/welcome/welcome.conf 2021-03-14
19:14:48.861677370 -0400
@@ -23,7 +23,7 @@ showSupportUrl: true
showKnownIssuesUrl: true
showReleaseNotesUrl: false
diff --git a/calamares-PR1622-Improved-btrfs-subvolumes-support.patch
b/calamares-PR1622-Improved-btrfs-subvolumes-support.patch
new file mode 100644
index 0000000..35d8ff0
--- /dev/null
+++ b/calamares-PR1622-Improved-btrfs-subvolumes-support.patch
@@ -0,0 +1,607 @@
+From 4ab30569c2dc21e6c528edfb86eb26069b66632a Mon Sep 17 00:00:00 2001
+From: Chrysostomus <matti(a)manjaro.org>
+Date: Tue, 26 Jan 2021 21:31:33 +0200
+Subject: [PATCH 01/18] Add default configuration
+
+---
+ src/modules/mount/mount.conf | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/src/modules/mount/mount.conf b/src/modules/mount/mount.conf
+index 3a117d32c..19732b4d3 100644
+--- a/src/modules/mount/mount.conf
++++ b/src/modules/mount/mount.conf
+@@ -19,6 +19,10 @@
+ # The device is not mounted if the mountPoint is unset or if the fs is
+ # set to unformatted.
+ #
++---
++# Btrfs subvolumes to create if root filesystem is on btrfs volume.
++# If mountpoint is mounted already to another partition, it is ignored.
++# Separate subvolume for swapfile is handled separately and automatically.
+ extraMounts:
+ - device: proc
+ fs: proc
+@@ -40,3 +44,13 @@ extraMountsEfi:
+ - device: efivarfs
+ fs: efivarfs
+ mountPoint: /sys/firmware/efi/efivars
++
++btrfsSubvolumes:
++ - mountPoint: /
++ subvolume: @
++ - mountPoint: /home
++ subvolume: @home
++ - mountPoint: /var/cache
++ subvolume: @cache
++ - mountPoint: /var/log
++ subvolume: @log
+\ No newline at end of file
+
+From b5cfa5109ecc81d0b7671d7b65494cf9f6dafdfc Mon Sep 17 00:00:00 2001
+From: Chrysostomus <matti(a)manjaro.org>
+Date: Tue, 26 Jan 2021 21:34:11 +0200
+Subject: [PATCH 02/18] Add schema definition
+
+---
+ src/modules/mount/mount.schema.yaml | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/src/modules/mount/mount.schema.yaml b/src/modules/mount/mount.schema.yaml
+index 2d5e4d4a0..fb5dfb69c 100644
+--- a/src/modules/mount/mount.schema.yaml
++++ b/src/modules/mount/mount.schema.yaml
+@@ -29,3 +29,12 @@ properties:
+ mountPoint: { type: string }
+ options: { type: string }
+ required: [ device, mountPoint ]
++ btrfsSubvolumes:
++ type: array
++ items:
++ type: object
++ additionalProperties: false
++ properties:
++ mountPoint: { type: string }
++ subvolume: { type: string }
++ required: [ subvolume, mountPoint ]
+
+From 945effb048102d2b6dc6ea763b554e889a9e85ab Mon Sep 17 00:00:00 2001
+From: Chrysostomus <matti(a)manjaro.org>
+Date: Tue, 26 Jan 2021 22:13:29 +0200
+Subject: [PATCH 03/18] Amend subvolumes to include path
+
+---
+ src/modules/mount/mount.conf | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/modules/mount/mount.conf b/src/modules/mount/mount.conf
+index 19732b4d3..b96d4576a 100644
+--- a/src/modules/mount/mount.conf
++++ b/src/modules/mount/mount.conf
+@@ -47,10 +47,10 @@ extraMountsEfi:
+
+ btrfsSubvolumes:
+ - mountPoint: /
+- subvolume: @
++ subvolume: /@
+ - mountPoint: /home
+- subvolume: @home
++ subvolume: /@home
+ - mountPoint: /var/cache
+- subvolume: @cache
++ subvolume: /@cache
+ - mountPoint: /var/log
+- subvolume: @log
+\ No newline at end of file
++ subvolume: /@log
+\ No newline at end of file
+
+From 942221c764a8622c9b23d29b1db291404af0f63b Mon Sep 17 00:00:00 2001
+From: Chrysostomus <matti(a)manjaro.org>
+Date: Tue, 26 Jan 2021 22:24:50 +0200
+Subject: [PATCH 04/18] Generalize subvolume handling
+
+---
+ src/modules/mount/main.py | 39 +++++++++++++++++++--------------------
+ 1 file changed, 19 insertions(+), 20 deletions(-)
+
+diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
+index 3982176df..4b0e911e3 100644
+--- a/src/modules/mount/main.py
++++ b/src/modules/mount/main.py
+@@ -81,26 +81,29 @@ def mount_partition(root_mount_point, partition, partitions):
+ # If a swapfile is used, we also create a subvolume "@swap".
+ # Finally we remount all of the above on the correct paths.
+ if fstype == "btrfs" and partition["mountPoint"] ==
'/':
+- has_home_mount_point = False
++ # Root has been mounted to btrfs volume -> create subvolumes from
configuration
++ btrfs_subvolumes =
libcalamares.job.configuration.get("btrfsSubvolumes") or []
++ subvolume_mountpoints = [d['mountPoint'] for d in btrfs_subvolumes]
++ # Check if listed mountpoints besides / are already present and don't create
subvolume for those
+ for p in partitions:
+ if "mountPoint" not in p or not p["mountPoint"]:
+ continue
+- if p["mountPoint"] == "/home":
+- has_home_mount_point = True
+- break
++ if p["mountpoint"] in subvolume_mountpoints and
p["mountpoint"] != '/':
++ # mountpoint is already define, remove subvolume from the list
++ btrfs_subvolumes = [d for d in btrfs_subvolumes if
d['mountPoint'] != p["mountpoint"]]
++ # Now we shouold have a valid list of needed subvolumes, so all subvolumes can
be created and mounted
++ for s in btrfs_subvolumes:
++ # Create the subvolume
++ subprocess.check_call(['btrfs', 'subvolume',
'create',
++ root_mount_point + s['subvolume']])
++
++ # Handle swap subvolume separately
+ needs_swap_subvolume = False
+ swap_choice = global_storage.value( "partitionChoices" )
+ if swap_choice:
+ swap_choice = swap_choice.get( "swap", None )
+ if swap_choice and swap_choice == "file":
+ needs_swap_subvolume = True
+-
+- subprocess.check_call(['btrfs', 'subvolume', 'create',
+- root_mount_point + '/@'])
+-
+- if not has_home_mount_point:
+- subprocess.check_call(['btrfs', 'subvolume',
'create',
+- root_mount_point + '/@home'])
+ if needs_swap_subvolume:
+ subprocess.check_call(['btrfs', 'subvolume',
'create',
+ root_mount_point + '/@swap'])
+@@ -112,17 +115,13 @@ def mount_partition(root_mount_point, partition, partitions):
+ if "luksMapperName" in partition:
+ device = os.path.join("/dev/mapper",
partition["luksMapperName"])
+
+- if libcalamares.utils.mount(device,
++ # Mount the subvolumes
++ for s in btrfs_subvolumes:
++ mount_option = f"subvol={s[subvolume]}"
++ if libcalamares.utils.mount(device,
+ mount_point,
+ fstype,
+- ",".join(["subvol=@",
partition.get("options", "")])) != 0:
+- libcalamares.utils.warning("Cannot mount {}".format(device))
+-
+- if not has_home_mount_point:
+- if libcalamares.utils.mount(device,
+- root_mount_point + "/home",
+- fstype,
+- ",".join(["subvol=@home",
partition.get("options", "")])) != 0:
++ ",".join([mount_option,
partition.get("options", "")])) != 0:
+ libcalamares.utils.warning("Cannot mount {}".format(device))
+
+ if needs_swap_subvolume:
+
+From 4b6718b354d1831b8336946798b6113e0aebc71f Mon Sep 17 00:00:00 2001
+From: Chrysostomus <matti(a)manjaro.org>
+Date: Tue, 26 Jan 2021 22:35:42 +0200
+Subject: [PATCH 05/18] Further generalize subvolume handling
+
+---
+ src/modules/mount/main.py | 26 +++++++-------------------
+ 1 file changed, 7 insertions(+), 19 deletions(-)
+
+diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
+index 4b0e911e3..9e7be8a68 100644
+--- a/src/modules/mount/main.py
++++ b/src/modules/mount/main.py
+@@ -89,24 +89,19 @@ def mount_partition(root_mount_point, partition, partitions):
+ if "mountPoint" not in p or not p["mountPoint"]:
+ continue
+ if p["mountpoint"] in subvolume_mountpoints and
p["mountpoint"] != '/':
+- # mountpoint is already define, remove subvolume from the list
++ # mountpoint is already defined, remove subvolume from the list
+ btrfs_subvolumes = [d for d in btrfs_subvolumes if
d['mountPoint'] != p["mountpoint"]]
+- # Now we shouold have a valid list of needed subvolumes, so all subvolumes can
be created and mounted
+- for s in btrfs_subvolumes:
+- # Create the subvolume
+- subprocess.check_call(['btrfs', 'subvolume',
'create',
+- root_mount_point + s['subvolume']])
+-
+- # Handle swap subvolume separately
++ # Check if we need a subvolume for swap file
+ needs_swap_subvolume = False
+ swap_choice = global_storage.value( "partitionChoices" )
+ if swap_choice:
+ swap_choice = swap_choice.get( "swap", None )
+ if swap_choice and swap_choice == "file":
+- needs_swap_subvolume = True
+- if needs_swap_subvolume:
++ btrfs_subvolumes.append({'mountPoint': '/swap',
'subvolume': '/@swap'})
++ # Create the subvolumes that are in the completed list
++ for s in btrfs_subvolumes:
+ subprocess.check_call(['btrfs', 'subvolume',
'create',
+- root_mount_point + '/@swap'])
++ root_mount_point + s['subvolume']])
+
+ subprocess.check_call(["umount", "-v", root_mount_point])
+
+@@ -122,14 +117,7 @@ def mount_partition(root_mount_point, partition, partitions):
+ mount_point,
+ fstype,
+ ",".join([mount_option,
partition.get("options", "")])) != 0:
+- libcalamares.utils.warning("Cannot mount {}".format(device))
+-
+- if needs_swap_subvolume:
+- if libcalamares.utils.mount(device,
+- root_mount_point + "/swap",
+- fstype,
+- ",".join(["subvol=@swap",
partition.get("options", "")])) != 0:
+- libcalamares.utils.warning("Cannot mount {}".format(device))
++ libcalamares.utils.warning(f"Cannot mount {device}")
+
+
+ def run():
+
+From f53f43ad03b955d43be16158912540c6d82d3025 Mon Sep 17 00:00:00 2001
+From: Chrysostomus <matti(a)manjaro.org>
+Date: Tue, 26 Jan 2021 22:42:35 +0200
+Subject: [PATCH 06/18] Remove some unnecessary bits
+
+---
+ src/modules/mount/main.py | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
+index 9e7be8a68..17041fdc5 100644
+--- a/src/modules/mount/main.py
++++ b/src/modules/mount/main.py
+@@ -89,10 +89,8 @@ def mount_partition(root_mount_point, partition, partitions):
+ if "mountPoint" not in p or not p["mountPoint"]:
+ continue
+ if p["mountpoint"] in subvolume_mountpoints and
p["mountpoint"] != '/':
+- # mountpoint is already defined, remove subvolume from the list
+ btrfs_subvolumes = [d for d in btrfs_subvolumes if
d['mountPoint'] != p["mountpoint"]]
+ # Check if we need a subvolume for swap file
+- needs_swap_subvolume = False
+ swap_choice = global_storage.value( "partitionChoices" )
+ if swap_choice:
+ swap_choice = swap_choice.get( "swap", None )
+
+From 092374d08ce67bdb21d77bcc02c4ad052828c302 Mon Sep 17 00:00:00 2001
+From: Chrysostomus <matti(a)manjaro.org>
+Date: Tue, 26 Jan 2021 22:48:02 +0200
+Subject: [PATCH 07/18] Add modified list to global storage
+
+---
+ src/modules/mount/main.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
+index 17041fdc5..7a6c1f176 100644
+--- a/src/modules/mount/main.py
++++ b/src/modules/mount/main.py
+@@ -96,6 +96,8 @@ def mount_partition(root_mount_point, partition, partitions):
+ swap_choice = swap_choice.get( "swap", None )
+ if swap_choice and swap_choice == "file":
+ btrfs_subvolumes.append({'mountPoint': '/swap',
'subvolume': '/@swap'})
++ # Store created list in global storage so it can be used in the fstab module
++ libcalamares.globalstorage.insert("btrfsSubvolumes",
btrfs_subvolumes)
+ # Create the subvolumes that are in the completed list
+ for s in btrfs_subvolumes:
+ subprocess.check_call(['btrfs', 'subvolume',
'create',
+
+From 14fbbd92dc367f56ce85c619165421e307093e84 Mon Sep 17 00:00:00 2001
+From: Chrysostomus <matti(a)manjaro.org>
+Date: Tue, 26 Jan 2021 22:56:31 +0200
+Subject: [PATCH 08/18] Get configured subvolumes from the global storage
+
+---
+ src/modules/fstab/main.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py
+index 6977ccad1..ed73f2f0f 100644
+--- a/src/modules/fstab/main.py
++++ b/src/modules/fstab/main.py
+@@ -192,7 +192,9 @@ def generate_fstab(self):
+ 'list',
+ self.root_mount_point])
+ output_lines = output.splitlines()
++ btrfs_subvolumes =
libcalamares.globalstorage.value("btrfsSubvolumes")
+ for line in output_lines:
++ # This is where changes need to go
+ if line.endswith(b'path @'):
+ root_entry = partition
+ root_entry["subvol"] = "@"
+
+From 8c0c84f162c77c440b16cee784513237288f3b2e Mon Sep 17 00:00:00 2001
+From: Chrysostomus <matti(a)manjaro.org>
+Date: Wed, 27 Jan 2021 15:41:01 +0200
+Subject: [PATCH 09/18] Create all fstab entries one way instead of having
+ special handling
+
+---
+ src/modules/fstab/main.py | 38 +++++++++-----------------------------
+ 1 file changed, 9 insertions(+), 29 deletions(-)
+
+diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py
+index ed73f2f0f..c2e221c37 100644
+--- a/src/modules/fstab/main.py
++++ b/src/modules/fstab/main.py
+@@ -183,39 +183,19 @@ def generate_fstab(self):
+ print(FSTAB_HEADER, file=fstab_file)
+
+ for partition in self.partitions:
+- # Special treatment for a btrfs root with @, @home and @swap
+- # subvolumes
++ # Special treatment for a btrfs subvolumes
+ if (partition["fs"] == "btrfs"
+ and partition["mountPoint"] == "/"):
+- output = subprocess.check_output(['btrfs',
+- 'subvolume',
+- 'list',
+- self.root_mount_point])
+- output_lines = output.splitlines()
++ # Subvolume list has been created in mount.conf and curated in mount
module,
++ # so all subvolumes here should be safe to add to fstab
+ btrfs_subvolumes =
libcalamares.globalstorage.value("btrfsSubvolumes")
+- for line in output_lines:
+- # This is where changes need to go
+- if line.endswith(b'path @'):
+- root_entry = partition
+- root_entry["subvol"] = "@"
+- dct = self.generate_fstab_line_info(root_entry)
+- if dct:
++ for s in btrfs_subvolumes:
++ mount_entry = partition
++ mount_entry["mountPoint"] = s["mountPoint"]
++ home_entry["subvol"] = s["subvolume"]
++ dct = self.generate_fstab_line_info(mount_entry)
++ if dct:
+ self.print_fstab_line(dct, file=fstab_file)
+- elif line.endswith(b'path @home'):
+- home_entry = partition
+- home_entry["mountPoint"] = "/home"
+- home_entry["subvol"] = "@home"
+- dct = self.generate_fstab_line_info(home_entry)
+- if dct:
+- self.print_fstab_line(dct, file=fstab_file)
+- elif line.endswith(b'path @swap'):
+- swap_part_entry = partition
+- swap_part_entry["mountPoint"] = "/swap"
+- swap_part_entry["subvol"] = "@swap"
+- dct = self.generate_fstab_line_info(swap_part_entry)
+- if dct:
+- self.print_fstab_line(dct, file=fstab_file)
+-
+ else:
+ dct = self.generate_fstab_line_info(partition)
+ if dct:
+
+From fcf6e2fb25fded1c0b849094dbe2632ab121d09b Mon Sep 17 00:00:00 2001
+From: Chrysostomus <matti(a)manjaro.org>
+Date: Tue, 2 Feb 2021 23:07:35 +0200
+Subject: [PATCH 10/18] fix typos
+
+---
+ src/modules/mount/main.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
+index 7a6c1f176..d12f88d71 100644
+--- a/src/modules/mount/main.py
++++ b/src/modules/mount/main.py
+@@ -88,7 +88,7 @@ def mount_partition(root_mount_point, partition, partitions):
+ for p in partitions:
+ if "mountPoint" not in p or not p["mountPoint"]:
+ continue
+- if p["mountpoint"] in subvolume_mountpoints and
p["mountpoint"] != '/':
++ if p["mountPoint"] in subvolume_mountpoints and
p["mountPoint"] != '/':
+ btrfs_subvolumes = [d for d in btrfs_subvolumes if
d['mountPoint'] != p["mountpoint"]]
+ # Check if we need a subvolume for swap file
+ swap_choice = global_storage.value( "partitionChoices" )
+
+From 1e0295dc652ec2166a7f2acee1fcb38868c2f1e1 Mon Sep 17 00:00:00 2001
+From: Chrysostomus <matti(a)manjaro.org>
+Date: Wed, 3 Feb 2021 22:55:11 +0200
+Subject: [PATCH 11/18] Fix name error
+
+---
+ src/modules/mount/main.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
+index d12f88d71..5bab086a7 100644
+--- a/src/modules/mount/main.py
++++ b/src/modules/mount/main.py
+@@ -112,7 +112,7 @@ def mount_partition(root_mount_point, partition, partitions):
+
+ # Mount the subvolumes
+ for s in btrfs_subvolumes:
+- mount_option = f"subvol={s[subvolume]}"
++ mount_option = f"subvol={s['subvolume']}"
+ if libcalamares.utils.mount(device,
+ mount_point,
+ fstype,
+
+From 1896a38cccdbaab6650b69e115adb93443159346 Mon Sep 17 00:00:00 2001
+From: Chrysostomus <matti(a)manjaro.org>
+Date: Sat, 6 Feb 2021 01:38:03 +0200
+Subject: [PATCH 12/18] Fix a typo
+
+---
+ src/modules/mount/main.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
+index 5bab086a7..eb2614caa 100644
+--- a/src/modules/mount/main.py
++++ b/src/modules/mount/main.py
+@@ -89,7 +89,7 @@ def mount_partition(root_mount_point, partition, partitions):
+ if "mountPoint" not in p or not p["mountPoint"]:
+ continue
+ if p["mountPoint"] in subvolume_mountpoints and
p["mountPoint"] != '/':
+- btrfs_subvolumes = [d for d in btrfs_subvolumes if
d['mountPoint'] != p["mountpoint"]]
++ btrfs_subvolumes = [d for d in btrfs_subvolumes if
d['mountPoint'] != p["mountPoint"]]
+ # Check if we need a subvolume for swap file
+ swap_choice = global_storage.value( "partitionChoices" )
+ if swap_choice:
+
+From 16bf7925a2524c81cc0bdd2fc28109cd5ea17ec0 Mon Sep 17 00:00:00 2001
+From: Chrysostomus <matti(a)manjaro.org>
+Date: Sat, 6 Feb 2021 19:48:09 +0200
+Subject: [PATCH 13/18] Adjust comments
+
+---
+ src/modules/mount/main.py | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
+index eb2614caa..50e72b316 100644
+--- a/src/modules/mount/main.py
++++ b/src/modules/mount/main.py
+@@ -74,12 +74,7 @@ def mount_partition(root_mount_point, partition, partitions):
+ partition.get("options", "")) != 0:
+ libcalamares.utils.warning("Cannot mount {}".format(device))
+
+- # If the root partition is btrfs, we create a subvolume "@"
+- # for the root mount point.
+- # If a separate /home partition isn't defined, we also create
+- # a subvolume "@home".
+- # If a swapfile is used, we also create a subvolume "@swap".
+- # Finally we remount all of the above on the correct paths.
++ # Special handling for btrfs subvolumes. Create the subvolumes listed in mount.conf
+ if fstype == "btrfs" and partition["mountPoint"] ==
'/':
+ # Root has been mounted to btrfs volume -> create subvolumes from
configuration
+ btrfs_subvolumes =
libcalamares.job.configuration.get("btrfsSubvolumes") or []
+
+From 67aedd5582c3c1426331e49ed0e8768000dfd3c3 Mon Sep 17 00:00:00 2001
+From: Chrysostomus <matti(a)manjaro.org>
+Date: Sat, 6 Feb 2021 19:54:29 +0200
+Subject: [PATCH 14/18] Move comments closer to where they are used
+
+---
+ src/modules/mount/mount.conf | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/modules/mount/mount.conf b/src/modules/mount/mount.conf
+index b96d4576a..6168e97cc 100644
+--- a/src/modules/mount/mount.conf
++++ b/src/modules/mount/mount.conf
+@@ -19,10 +19,6 @@
+ # The device is not mounted if the mountPoint is unset or if the fs is
+ # set to unformatted.
+ #
+----
+-# Btrfs subvolumes to create if root filesystem is on btrfs volume.
+-# If mountpoint is mounted already to another partition, it is ignored.
+-# Separate subvolume for swapfile is handled separately and automatically.
+ extraMounts:
+ - device: proc
+ fs: proc
+@@ -45,6 +41,10 @@ extraMountsEfi:
+ fs: efivarfs
+ mountPoint: /sys/firmware/efi/efivars
+
++# Btrfs subvolumes to create if root filesystem is on btrfs volume.
++# If mountpoint is mounted already to another partition, it is ignored.
++# Separate subvolume for swapfile is handled separately and automatically.
++
+ btrfsSubvolumes:
+ - mountPoint: /
+ subvolume: /@
+
+From b16bd6bb23a0bf4775e2626765f3166d1a820b23 Mon Sep 17 00:00:00 2001
+From: Chrysostomus <matti(a)manjaro.org>
+Date: Sat, 6 Feb 2021 20:03:30 +0200
+Subject: [PATCH 15/18] Fix name error
+
+---
+ src/modules/fstab/main.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py
+index c2e221c37..b6d7a4b2a 100644
+--- a/src/modules/fstab/main.py
++++ b/src/modules/fstab/main.py
+@@ -192,7 +192,7 @@ def generate_fstab(self):
+ for s in btrfs_subvolumes:
+ mount_entry = partition
+ mount_entry["mountPoint"] = s["mountPoint"]
+- home_entry["subvol"] = s["subvolume"]
++ mount_entry["subvol"] = s["subvolume"]
+ dct = self.generate_fstab_line_info(mount_entry)
+ if dct:
+ self.print_fstab_line(dct, file=fstab_file)
+
+From 6d55005da07dcac8baced60c591bb6b5ee32ed2f Mon Sep 17 00:00:00 2001
+From: Chrysostomus <matti(a)manjaro.org>
+Date: Sun, 7 Feb 2021 00:16:26 +0200
+Subject: [PATCH 16/18] Mount subvolumes to correct mountpoints
+
+---
+ src/modules/mount/main.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
+index 50e72b316..27df309a3 100644
+--- a/src/modules/mount/main.py
++++ b/src/modules/mount/main.py
+@@ -108,8 +108,9 @@ def mount_partition(root_mount_point, partition, partitions):
+ # Mount the subvolumes
+ for s in btrfs_subvolumes:
+ mount_option = f"subvol={s['subvolume']}"
++ subvolume_mountpoint = mount_point[:-1] + s['mountPoint']
+ if libcalamares.utils.mount(device,
+- mount_point,
++ subvolume_mountpoint,
+ fstype,
+ ",".join([mount_option,
partition.get("options", "")])) != 0:
+ libcalamares.utils.warning(f"Cannot mount {device}")
+
+From 0c92a36a5393114a2bafd3af654954bdb1ae9bd9 Mon Sep 17 00:00:00 2001
+From: Chrysostomus <matti(a)manjaro.org>
+Date: Sun, 7 Feb 2021 15:29:30 +0200
+Subject: [PATCH 17/18] Remove unnecessary comment
+
+---
+ src/modules/mount/main.py | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
+index 27df309a3..69c994efc 100644
+--- a/src/modules/mount/main.py
++++ b/src/modules/mount/main.py
+@@ -32,9 +32,6 @@ def pretty_name():
+ def mount_partition(root_mount_point, partition, partitions):
+ """
+ Do a single mount of @p partition inside @p root_mount_point.
+-
+- The @p partitions are used to handle btrfs special-cases:
+- then subvolumes are created for root and home.
+ """
+ # Create mount point with `+` rather than `os.path.join()` because
+ # `partition["mountPoint"]` starts with a '/'.
+
+From 16eff98a0653807d5a38a06cc4ccba7983c6ee10 Mon Sep 17 00:00:00 2001
+From: Chrysostomus <matti(a)manjaro.org>
+Date: Sun, 7 Feb 2021 15:39:38 +0200
+Subject: [PATCH 18/18] Don't use f-strings yet.
+
+---
+ src/modules/mount/main.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
+index 69c994efc..07166dd75 100644
+--- a/src/modules/mount/main.py
++++ b/src/modules/mount/main.py
+@@ -104,13 +104,13 @@ def mount_partition(root_mount_point, partition, partitions):
+
+ # Mount the subvolumes
+ for s in btrfs_subvolumes:
+- mount_option = f"subvol={s['subvolume']}"
++ mount_option = "subvol={}".format(s['subvolume'])
+ subvolume_mountpoint = mount_point[:-1] + s['mountPoint']
+ if libcalamares.utils.mount(device,
+ subvolume_mountpoint,
+ fstype,
+ ",".join([mount_option,
partition.get("options", "")])) != 0:
+- libcalamares.utils.warning(f"Cannot mount {device}")
++ libcalamares.utils.warning("Cannot mount {}".format(device))
+
+
+ def run():
diff --git a/calamares.spec b/calamares.spec
index 088bc98..ffa7dbe 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -17,7 +17,7 @@
%endif
Name: calamares
-Version: 3.2.37
+Version: 3.2.38
Release: %{baserelease}%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c
-13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist}
Summary: Installer from a live CD/DVD/USB to disk
@@ -38,11 +38,15 @@ Source4: calamares-auto_de.ts
# then translate the template in linguist-qt5.
Source5: calamares-auto_it.ts
+# Backport improved Btrfs support (remove when updating to 3.2.39)
+## From:
https://github.com/calamares/calamares/pull/1622
+Patch0: calamares-PR1622-Improved-btrfs-subvolumes-support.patch
+
# adjust some default settings (default shipped .conf files)
-Patch0: calamares-3.2.37-default-settings.patch
+Patch1: calamares-3.2.38-default-settings.patch
# use kdesu instead of pkexec (works around #1171779)
-Patch1: calamares-3.2.35.1-kdesu.patch
+Patch2: calamares-3.2.35.1-kdesu.patch
# Calamares is only supported where live images (and GRUB) are. (#1171380)
# This list matches the arches where grub2-efi is used to boot the system
@@ -200,10 +204,13 @@ developing custom modules for Calamares.
%prep
%setup -q %{?snaphash:-n %{name}-%{snaphash}} %{!?snaphash:%{?prerelease:-n
%{name}-%{version}-%{prerelease}}}
-%patch0 -p1 -b .default-settings
+%patch0 -p1 -b .btrfs
+# delete backup files so they don't get installed
+rm -f src/modules/*/*.conf.btrfs
+%patch1 -p1 -b .default-settings
# delete backup files so they don't get installed
rm -f src/modules/*/*.conf.default-settings
-%patch1 -p1 -b .kdesu
+%patch2 -p1 -b .kdesu
%build
%{cmake_kf5} -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \
@@ -357,6 +364,11 @@ EOF
%changelog
+* Sun Mar 14 2021 Neal Gompa <ngompa13(a)gmail.com> - 3.2.38-1
+- Update to 3.2.38
+- Backport improved Btrfs support
+- Set Btrfs by default with the Fedora Btrfs layout
+
* Sat Mar 06 2021 Neal Gompa <ngompa13(a)gmail.com> - 3.2.37-1
- Update to 3.2.37
- Drop upstreamed patch to fix shim binary names
diff --git a/sources b/sources
index e2e0164..75cad43 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (calamares-3.2.37.tar.gz) =
fc60381de0e0a1b07f41dd1c329ff9844a6efa06d9df647d3035226602713c8457e51c9c04217ea99f8e197ef3a02520029cdd0cf6b0ada37e5b1f9ee08371d6
+SHA512 (calamares-3.2.38.tar.gz) =
b295f731bc4d5f33e8a521dd077032e42fc13265b22f9aca5d42438a53515611852e005081ae0ccfac3f8ac46e38705d65c79ea4f827f0c6b6bbc87acd5adb9c
commit 3d478e06fbf95ac21eb36dfe1a91a35a55e44de8
Author: Neal Gompa <ngompa13(a)gmail.com>
Date: Sat Mar 6 09:59:09 2021 -0500
Update to 3.2.37
- Drop upstreamed patch to fix shim binary names
diff --git a/.gitignore b/.gitignore
index f0b2b6d..0e19818 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@
/calamares-3.2.8.tar.gz
/calamares-3.2.11.tar.gz
/calamares-3.2.35.1.tar.gz
+/calamares-3.2.37.tar.gz
diff --git a/calamares-3.2.35.1-use-correct-shim.patch
b/calamares-3.2.35.1-use-correct-shim.patch
deleted file mode 100644
index 7541f4a..0000000
--- a/calamares-3.2.35.1-use-correct-shim.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From f3b3da39ce2a6184651defe1d089ab6724affd58 Mon Sep 17 00:00:00 2001
-From: Neal Gompa <ngompa13(a)gmail.com>
-Date: Fri, 29 Jan 2021 20:31:24 -0500
-Subject: [PATCH] modules/bootloader: Use the correct names for the shim
- binaries
-
-Ever since signed shim binaries for multiple architectures became
-available, the shim binaries installed in Linux distributions have
-been renamed to include the EFI architecture in the binary names.
-
-This started in Fedora, but is now used in openSUSE and Ubuntu too.
-
-Reference for shim binary names comes from shim spec in Fedora:
-
-https://src.fedoraproject.org/rpms/shim/blob/d8c3c8e39235507feb17b4e81851da087ae83c77/f/shim.spec#_23-32
----
- src/modules/bootloader/main.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py
-index ec9a6f2e6..b85ef1b9a 100644
---- a/src/modules/bootloader/main.py
-+++ b/src/modules/bootloader/main.py
-@@ -372,9 +372,9 @@ def install_secureboot(efi_directory):
- install_efi_directory = install_path + efi_directory
-
- if efi_word_size() == "64":
-- install_efi_bin = "shim64.efi"
-- else:
-- install_efi_bin = "shim.efi"
-+ install_efi_bin = "shimx64.efi"
-+ elif efi_word_size() == "32":
-+ install_efi_bin = "shimia32.efi"
-
- # Copied, roughly, from openSUSE's install script,
- # and pythonified. *disk* is something like /dev/sda,
---
-2.29.2
-
diff --git a/calamares-3.2.35.1-default-settings.patch
b/calamares-3.2.37-default-settings.patch
similarity index 69%
rename from calamares-3.2.35.1-default-settings.patch
rename to calamares-3.2.37-default-settings.patch
index 94dcef8..12ffc13 100644
--- a/calamares-3.2.35.1-default-settings.patch
+++ b/calamares-3.2.37-default-settings.patch
@@ -1,6 +1,6 @@
-diff -rup calamares-3.2.35.1/CMakeLists.txt
calamares-3.2.35.1-default-settings/CMakeLists.txt
---- calamares-3.2.35.1/CMakeLists.txt 2020-12-07 11:09:14.000000000 -0500
-+++ calamares-3.2.35.1-default-settings/CMakeLists.txt 2021-01-11 20:51:19.663848685
-0500
+diff -rup calamares-3.2.37/CMakeLists.txt
calamares-3.2.37-default-settings/CMakeLists.txt
+--- calamares-3.2.37/CMakeLists.txt 2021-02-23 10:36:31.000000000 -0500
++++ calamares-3.2.37-default-settings/CMakeLists.txt 2021-03-06 09:50:21.057934003 -0500
@@ -49,7 +49,7 @@ set( CALAMARES_VERSION_RC 0 ) # Set to
### OPTIONS
@@ -10,9 +10,9 @@ diff -rup calamares-3.2.35.1/CMakeLists.txt
calamares-3.2.35.1-default-settings/
option( INSTALL_POLKIT "Install Polkit configuration" ON )
option( INSTALL_COMPLETION "Install shell completions" OFF )
# Options for the calamares executable
-diff -rup calamares-3.2.35.1/settings.conf
calamares-3.2.35.1-default-settings/settings.conf
---- calamares-3.2.35.1/settings.conf 2020-12-07 11:09:14.000000000 -0500
-+++ calamares-3.2.35.1-default-settings/settings.conf 2021-01-11 20:51:19.667848702
-0500
+diff -rup calamares-3.2.37/settings.conf calamares-3.2.37-default-settings/settings.conf
+--- calamares-3.2.37/settings.conf 2021-02-23 10:36:31.000000000 -0500
++++ calamares-3.2.37-default-settings/settings.conf 2021-03-06 09:50:21.059934010 -0500
@@ -134,21 +134,22 @@ sequence:
- locale
- keyboard
@@ -52,9 +52,9 @@ diff -rup calamares-3.2.35.1/settings.conf
calamares-3.2.35.1-default-settings/s
# If this is set to true, Calamares will show an "Are you sure?" prompt right
# before each execution phase, i.e. at points of no return. If this is set to
-diff -rup calamares-3.2.35.1/src/branding/default/branding.desc
calamares-3.2.35.1-default-settings/src/branding/default/branding.desc
---- calamares-3.2.35.1/src/branding/default/branding.desc 2020-12-07 11:09:14.000000000
-0500
-+++ calamares-3.2.35.1-default-settings/src/branding/default/branding.desc 2021-01-11
20:54:33.928693213 -0500
+diff -rup calamares-3.2.37/src/branding/default/branding.desc
calamares-3.2.37-default-settings/src/branding/default/branding.desc
+--- calamares-3.2.37/src/branding/default/branding.desc 2021-02-23 10:36:31.000000000
-0500
++++ calamares-3.2.37-default-settings/src/branding/default/branding.desc 2021-03-06
09:50:21.060934014 -0500
@@ -122,12 +122,12 @@ navigation: widget
# are set to "true" (they can also be overridden).
strings:
@@ -74,9 +74,9 @@ diff -rup calamares-3.2.35.1/src/branding/default/branding.desc
calamares-3.2.35
productUrl:
https://calamares.io/
supportUrl:
https://github.com/calamares/calamares/wiki
knownIssuesUrl:
https://github.com/calamares/calamares/issues
-diff -rup calamares-3.2.35.1/src/modules/bootloader/bootloader.conf
calamares-3.2.35.1-default-settings/src/modules/bootloader/bootloader.conf
---- calamares-3.2.35.1/src/modules/bootloader/bootloader.conf 2020-12-07
11:09:14.000000000 -0500
-+++ calamares-3.2.35.1-default-settings/src/modules/bootloader/bootloader.conf 2021-01-11
20:51:19.671848719 -0500
+diff -rup calamares-3.2.37/src/modules/bootloader/bootloader.conf
calamares-3.2.37-default-settings/src/modules/bootloader/bootloader.conf
+--- calamares-3.2.37/src/modules/bootloader/bootloader.conf 2021-02-23 10:36:31.000000000
-0500
++++ calamares-3.2.37-default-settings/src/modules/bootloader/bootloader.conf 2021-03-06
09:50:21.061934017 -0500
@@ -7,7 +7,7 @@
---
# Define which bootloader you want to use for EFI installations
@@ -112,18 +112,18 @@ diff -rup calamares-3.2.35.1/src/modules/bootloader/bootloader.conf
calamares-3.
# Optionally install a copy of the GRUB EFI bootloader as the EFI
# fallback loader (either bootia32.efi or bootx64.efi depending on
-diff -rup calamares-3.2.35.1/src/modules/keyboard/keyboard.conf
calamares-3.2.35.1-default-settings/src/modules/keyboard/keyboard.conf
---- calamares-3.2.35.1/src/modules/keyboard/keyboard.conf 2020-12-07 11:09:14.000000000
-0500
-+++ calamares-3.2.35.1-default-settings/src/modules/keyboard/keyboard.conf 2021-01-11
20:51:19.671848719 -0500
+diff -rup calamares-3.2.37/src/modules/keyboard/keyboard.conf
calamares-3.2.37-default-settings/src/modules/keyboard/keyboard.conf
+--- calamares-3.2.37/src/modules/keyboard/keyboard.conf 2021-02-23 10:36:31.000000000
-0500
++++ calamares-3.2.37-default-settings/src/modules/keyboard/keyboard.conf 2021-03-06
09:50:21.062934021 -0500
@@ -20,4 +20,4 @@ convertedKeymapPath: "/lib/kbd/keymaps/x
# Write keymap configuration to /etc/default/keyboard, usually
# found on Debian-related systems.
# Defaults to true if nothing is set.
-#writeEtcDefaultKeyboard: true
+writeEtcDefaultKeyboard: false
-diff -rup calamares-3.2.35.1/src/modules/license/license.conf
calamares-3.2.35.1-default-settings/src/modules/license/license.conf
---- calamares-3.2.35.1/src/modules/license/license.conf 2020-12-07 11:09:14.000000000
-0500
-+++ calamares-3.2.35.1-default-settings/src/modules/license/license.conf 2021-01-11
20:51:19.673848728 -0500
+diff -rup calamares-3.2.37/src/modules/license/license.conf
calamares-3.2.37-default-settings/src/modules/license/license.conf
+--- calamares-3.2.37/src/modules/license/license.conf 2021-02-23 10:36:31.000000000
-0500
++++ calamares-3.2.37-default-settings/src/modules/license/license.conf 2021-03-06
09:50:21.063934024 -0500
@@ -22,24 +22,12 @@
# default, rather than requiring the user to first open it up.
# YAML: boolean, optional, default is false.
@@ -153,9 +153,9 @@ diff -rup calamares-3.2.35.1/src/modules/license/license.conf
calamares-3.2.35.1
# This example uses a file: link. This example uses a relative link, which
# is relative to where you run Calamares. Assuming you run it from build/
# as part of your testing, you'll get the LICENSE text for Calamares
-diff -rup calamares-3.2.35.1/src/modules/locale/locale.conf
calamares-3.2.35.1-default-settings/src/modules/locale/locale.conf
---- calamares-3.2.35.1/src/modules/locale/locale.conf 2020-12-07 11:09:14.000000000
-0500
-+++ calamares-3.2.35.1-default-settings/src/modules/locale/locale.conf 2021-01-11
21:18:04.412832678 -0500
+diff -rup calamares-3.2.37/src/modules/locale/locale.conf
calamares-3.2.37-default-settings/src/modules/locale/locale.conf
+--- calamares-3.2.37/src/modules/locale/locale.conf 2021-02-23 10:36:31.000000000 -0500
++++ calamares-3.2.37-default-settings/src/modules/locale/locale.conf 2021-03-06
09:50:21.064934027 -0500
@@ -118,8 +118,8 @@ zone: "New_York"
#
geoip:
@@ -167,9 +167,9 @@ diff -rup calamares-3.2.35.1/src/modules/locale/locale.conf
calamares-3.2.35.1-d
# For testing purposes, you could use *fixed* style, to see how Calamares
# behaves in a particular zone:
-diff -rup calamares-3.2.35.1/src/modules/netinstall/netinstall.conf
calamares-3.2.35.1-default-settings/src/modules/netinstall/netinstall.conf
---- calamares-3.2.35.1/src/modules/netinstall/netinstall.conf 2020-12-07
11:09:14.000000000 -0500
-+++ calamares-3.2.35.1-default-settings/src/modules/netinstall/netinstall.conf 2021-01-11
20:57:57.129576597 -0500
+diff -rup calamares-3.2.37/src/modules/netinstall/netinstall.conf
calamares-3.2.37-default-settings/src/modules/netinstall/netinstall.conf
+--- calamares-3.2.37/src/modules/netinstall/netinstall.conf 2021-02-23 10:36:31.000000000
-0500
++++ calamares-3.2.37-default-settings/src/modules/netinstall/netinstall.conf 2021-03-06
09:50:21.065934031 -0500
@@ -63,7 +63,9 @@
# `local` means that the data is obtained from **this** config
# file, under the key *groups*.
@@ -181,9 +181,9 @@ diff -rup calamares-3.2.35.1/src/modules/netinstall/netinstall.conf
calamares-3.
# If the installation can proceed without netinstall (e.g. the Live CD
# can create a working installed system, but netinstall is preferred
-diff -rup calamares-3.2.35.1/src/modules/packages/packages.conf
calamares-3.2.35.1-default-settings/src/modules/packages/packages.conf
---- calamares-3.2.35.1/src/modules/packages/packages.conf 2020-12-07 11:09:14.000000000
-0500
-+++ calamares-3.2.35.1-default-settings/src/modules/packages/packages.conf 2021-01-11
20:51:19.677848745 -0500
+diff -rup calamares-3.2.37/src/modules/packages/packages.conf
calamares-3.2.37-default-settings/src/modules/packages/packages.conf
+--- calamares-3.2.37/src/modules/packages/packages.conf 2021-02-23 10:36:31.000000000
-0500
++++ calamares-3.2.37-default-settings/src/modules/packages/packages.conf 2021-03-06
09:50:21.066934034 -0500
@@ -19,7 +19,7 @@
# Not actually a package manager, but suitable for testing:
# - dummy - Dummy manager, only logs
@@ -217,9 +217,9 @@ diff -rup calamares-3.2.35.1/src/modules/packages/packages.conf
calamares-3.2.35
- - binutils
+ - try_remove:
+ - calamares
-diff -rup calamares-3.2.35.1/src/modules/partition/partition.conf
calamares-3.2.35.1-default-settings/src/modules/partition/partition.conf
---- calamares-3.2.35.1/src/modules/partition/partition.conf 2020-12-07 11:09:14.000000000
-0500
-+++ calamares-3.2.35.1-default-settings/src/modules/partition/partition.conf 2021-01-11
21:00:30.382242829 -0500
+diff -rup calamares-3.2.37/src/modules/partition/partition.conf
calamares-3.2.37-default-settings/src/modules/partition/partition.conf
+--- calamares-3.2.37/src/modules/partition/partition.conf 2021-02-23 10:36:31.000000000
-0500
++++ calamares-3.2.37-default-settings/src/modules/partition/partition.conf 2021-03-06
09:50:21.067934038 -0500
@@ -59,7 +59,7 @@ userSwapChoices:
# neverCreateSwap: false
@@ -229,9 +229,9 @@ diff -rup calamares-3.2.35.1/src/modules/partition/partition.conf
calamares-3.2.
# Show/hide partition labels on manual partitioning page.
alwaysShowPartitionLabels: true
-diff -rup calamares-3.2.35.1/src/modules/plasmalnf/plasmalnf.conf
calamares-3.2.35.1-default-settings/src/modules/plasmalnf/plasmalnf.conf
---- calamares-3.2.35.1/src/modules/plasmalnf/plasmalnf.conf 2020-12-07 11:09:14.000000000
-0500
-+++ calamares-3.2.35.1-default-settings/src/modules/plasmalnf/plasmalnf.conf 2021-01-11
21:01:35.222524710 -0500
+diff -rup calamares-3.2.37/src/modules/plasmalnf/plasmalnf.conf
calamares-3.2.37-default-settings/src/modules/plasmalnf/plasmalnf.conf
+--- calamares-3.2.37/src/modules/plasmalnf/plasmalnf.conf 2021-02-23 10:36:31.000000000
-0500
++++ calamares-3.2.37-default-settings/src/modules/plasmalnf/plasmalnf.conf 2021-03-06
09:50:21.069934045 -0500
@@ -22,7 +22,7 @@ lnftool: "/usr/bin/lookandfeeltool"
# to the originating username; the lnftool will be run through
# "sudo -H -u <liveuser>" instead of directly.
@@ -271,9 +271,9 @@ diff -rup calamares-3.2.35.1/src/modules/plasmalnf/plasmalnf.conf
calamares-3.2.
# You can pre-select one of the themes; it is not applied
# immediately, but its radio-button is switched on to indicate
-diff -rup calamares-3.2.35.1/src/modules/tracking/tracking.conf
calamares-3.2.35.1-default-settings/src/modules/tracking/tracking.conf
---- calamares-3.2.35.1/src/modules/tracking/tracking.conf 2020-12-07 11:09:14.000000000
-0500
-+++ calamares-3.2.35.1-default-settings/src/modules/tracking/tracking.conf 2021-01-11
21:03:31.061028297 -0500
+diff -rup calamares-3.2.37/src/modules/tracking/tracking.conf
calamares-3.2.37-default-settings/src/modules/tracking/tracking.conf
+--- calamares-3.2.37/src/modules/tracking/tracking.conf 2021-02-23 10:36:31.000000000
-0500
++++ calamares-3.2.37-default-settings/src/modules/tracking/tracking.conf 2021-03-06
09:50:21.070934048 -0500
@@ -54,13 +54,13 @@
# This is the global policy; it is displayed as a link on the page.
# If blank or commented out, no link is displayed on the tracking
@@ -290,9 +290,9 @@ diff -rup calamares-3.2.35.1/src/modules/tracking/tracking.conf
calamares-3.2.35
# The install area has one specific configuration key:
# url: this URL (remember to include the protocol, and prefer https)
-diff -rup calamares-3.2.35.1/src/modules/umount/umount.conf
calamares-3.2.35.1-default-settings/src/modules/umount/umount.conf
---- calamares-3.2.35.1/src/modules/umount/umount.conf 2020-12-07 11:09:14.000000000
-0500
-+++ calamares-3.2.35.1-default-settings/src/modules/umount/umount.conf 2021-01-11
20:51:19.682848767 -0500
+diff -rup calamares-3.2.37/src/modules/umount/umount.conf
calamares-3.2.37-default-settings/src/modules/umount/umount.conf
+--- calamares-3.2.37/src/modules/umount/umount.conf 2021-02-23 10:36:31.000000000 -0500
++++ calamares-3.2.37-default-settings/src/modules/umount/umount.conf 2021-03-06
09:50:21.071934052 -0500
@@ -18,8 +18,8 @@
---
# example when using the normal Calamares log:
@@ -304,9 +304,9 @@ diff -rup calamares-3.2.35.1/src/modules/umount/umount.conf
calamares-3.2.35.1-d
-#srcLog: "/home/live/installation.log"
+#srcLog: "/home/liveuser/installation.log"
#destLog: "/var/log/installation.log"
-diff -rup calamares-3.2.35.1/src/modules/unpackfs/unpackfs.conf
calamares-3.2.35.1-default-settings/src/modules/unpackfs/unpackfs.conf
---- calamares-3.2.35.1/src/modules/unpackfs/unpackfs.conf 2020-12-07 11:09:14.000000000
-0500
-+++ calamares-3.2.35.1-default-settings/src/modules/unpackfs/unpackfs.conf 2021-01-11
21:06:21.169769068 -0500
+diff -rup calamares-3.2.37/src/modules/unpackfs/unpackfs.conf
calamares-3.2.37-default-settings/src/modules/unpackfs/unpackfs.conf
+--- calamares-3.2.37/src/modules/unpackfs/unpackfs.conf 2021-02-23 10:36:31.000000000
-0500
++++ calamares-3.2.37-default-settings/src/modules/unpackfs/unpackfs.conf 2021-03-06
09:50:21.072934055 -0500
@@ -88,13 +88,6 @@
# for its destination name, as in the example below.
@@ -324,9 +324,9 @@ diff -rup calamares-3.2.35.1/src/modules/unpackfs/unpackfs.conf
calamares-3.2.35
+ - source: "/dev/mapper/live-base"
+ sourcefs: "ext4"
+ destination: ""
-diff -rup calamares-3.2.35.1/src/modules/users/users.conf
calamares-3.2.35.1-default-settings/src/modules/users/users.conf
---- calamares-3.2.35.1/src/modules/users/users.conf 2020-12-07 11:09:14.000000000 -0500
-+++ calamares-3.2.35.1-default-settings/src/modules/users/users.conf 2021-01-11
21:09:36.506620035 -0500
+diff -rup calamares-3.2.37/src/modules/users/users.conf
calamares-3.2.37-default-settings/src/modules/users/users.conf
+--- calamares-3.2.37/src/modules/users/users.conf 2021-02-23 10:36:31.000000000 -0500
++++ calamares-3.2.37-default-settings/src/modules/users/users.conf 2021-03-06
09:50:21.073934059 -0500
@@ -34,8 +34,7 @@ defaultGroups:
system: true
- lp
@@ -377,28 +377,28 @@ diff -rup calamares-3.2.35.1/src/modules/users/users.conf
calamares-3.2.35.1-def
# Hostname setting
#
-diff -rup calamares-3.2.35.1/src/modules/welcome/welcome.conf
calamares-3.2.35.1-default-settings/src/modules/welcome/welcome.conf
---- calamares-3.2.35.1/src/modules/welcome/welcome.conf 2020-12-07 11:09:14.000000000
-0500
-+++ calamares-3.2.35.1-default-settings/src/modules/welcome/welcome.conf 2021-01-11
21:16:15.720359171 -0500
-@@ -18,7 +18,7 @@
- showSupportUrl: true
+diff -rup calamares-3.2.37/src/modules/welcome/welcome.conf
calamares-3.2.37-default-settings/src/modules/welcome/welcome.conf
+--- calamares-3.2.37/src/modules/welcome/welcome.conf 2021-02-23 10:36:31.000000000
-0500
++++ calamares-3.2.37-default-settings/src/modules/welcome/welcome.conf 2021-03-06
09:51:51.366250140 -0500
+@@ -23,7 +23,7 @@ showSupportUrl: true
showKnownIssuesUrl: true
showReleaseNotesUrl: false
+ # TODO:3.3 Move to branding, keep only a bool here
-showDonateUrl:
https://kde.org/community/donations/
+showDonateUrl: false
# Requirements checking. These are general, generic, things
# that are checked. They may not match with the actual requirements
-@@ -34,7 +34,7 @@ requirements:
-
- # To check for internet connectivity, Calamares does a HTTP GET
- # on this URL; on success (e.g. HTTP code 200) internet is OK.
-- internetCheckUrl:
http://google.com
+@@ -42,7 +42,7 @@ requirements:
+ # Use a privacy-respecting URL here, preferably in your distro's domain.
+ #
+ # The URL is only used if "internet" is in the *check* list below.
+- internetCheckUrl:
http://example.com
+ internetCheckUrl:
https://fedoraproject.org/static/hotspot.txt
# List conditions to check. Each listed condition will be
# probed in some way, and yields true or false according to
-@@ -53,9 +53,9 @@ requirements:
+@@ -61,9 +61,9 @@ requirements:
# If any of these conditions are not met, the user cannot
# continue past the welcome page.
required:
@@ -410,7 +410,7 @@ diff -rup calamares-3.2.35.1/src/modules/welcome/welcome.conf
calamares-3.2.35.1
# GeoIP checking
#
-@@ -79,9 +79,9 @@ requirements:
+@@ -87,9 +87,9 @@ requirements:
# data. Timezone, city, or other data will not be recognized.
#
geoip:
diff --git a/calamares.spec b/calamares.spec
index 7542c80..088bc98 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -17,7 +17,7 @@
%endif
Name: calamares
-Version: 3.2.35.1
+Version: 3.2.37
Release: %{baserelease}%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c
-13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist}
Summary: Installer from a live CD/DVD/USB to disk
@@ -39,15 +39,11 @@ Source4: calamares-auto_de.ts
Source5: calamares-auto_it.ts
# adjust some default settings (default shipped .conf files)
-Patch0: calamares-3.2.35.1-default-settings.patch
+Patch0: calamares-3.2.37-default-settings.patch
# use kdesu instead of pkexec (works around #1171779)
Patch1: calamares-3.2.35.1-kdesu.patch
-# fix shim binary names
-## Submitted:
https://github.com/calamares/calamares/pull/1628
-Patch2: calamares-3.2.35.1-use-correct-shim.patch
-
# Calamares is only supported where live images (and GRUB) are. (#1171380)
# This list matches the arches where grub2-efi is used to boot the system
## NOTE: aarch64 needs some upstream work before it can be added to this list
@@ -208,7 +204,6 @@ developing custom modules for Calamares.
# delete backup files so they don't get installed
rm -f src/modules/*/*.conf.default-settings
%patch1 -p1 -b .kdesu
-%patch2 -p1 -b .shim-bin-names
%build
%{cmake_kf5} -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \
@@ -362,6 +357,10 @@ EOF
%changelog
+* Sat Mar 06 2021 Neal Gompa <ngompa13(a)gmail.com> - 3.2.37-1
+- Update to 3.2.37
+- Drop upstreamed patch to fix shim binary names
+
* Sat Jan 30 2021 Neal Gompa <ngompa13(a)gmail.com> - 3.2.35.1-1
- Rebase to 3.2.35.1
- Prepare for support for AArch64
diff --git a/sources b/sources
index e622c44..e2e0164 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (calamares-3.2.35.1.tar.gz) =
5c0c19fdfaeea85f467a6b59a3e088ad5709940a25521a28bbf8a9bb69a2e87d44f40a4500688c383036c48d4c4d70176bb170dcc39897fff3e09be3117de9ff
+SHA512 (calamares-3.2.37.tar.gz) =
fc60381de0e0a1b07f41dd1c329ff9844a6efa06d9df647d3035226602713c8457e51c9c04217ea99f8e197ef3a02520029cdd0cf6b0ada37e5b1f9ee08371d6
commit aab85b8d346c0c6187fd1f3715280ed65e96ec52
Author: Neal Gompa <ngompa13(a)gmail.com>
Date: Sat Jan 30 05:37:11 2021 -0500
Rebase to 3.2.35.1
- Prepare for support for AArch64
- Add configuration for Fedora GeoIP endpoints
- Add patch to fix shim binary names
- Minor spec cleanups
diff --git a/.gitignore b/.gitignore
index f0758b1..f0b2b6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@
/calamares-3.2.7.tar.gz
/calamares-3.2.8.tar.gz
/calamares-3.2.11.tar.gz
+/calamares-3.2.35.1.tar.gz
diff --git a/calamares-3.2.11-default-settings.patch
b/calamares-3.2.11-default-settings.patch
deleted file mode 100644
index db82403..0000000
--- a/calamares-3.2.11-default-settings.patch
+++ /dev/null
@@ -1,429 +0,0 @@
-diff -ur calamares-3.2.11/CMakeLists.txt
calamares-3.2.11-default-settings/CMakeLists.txt
---- calamares-3.2.11/CMakeLists.txt 2019-07-06 00:52:35.000000000 +0200
-+++ calamares-3.2.11-default-settings/CMakeLists.txt 2019-07-08 22:25:32.488871708 +0200
-@@ -44,7 +44,7 @@
-
- ### OPTIONS
- #
--option( INSTALL_CONFIG "Install configuration files" OFF )
-+option( INSTALL_CONFIG "Install configuration files" ON )
- option( INSTALL_POLKIT "Install Polkit configuration" ON )
- option( BUILD_TESTING "Build the testing tree." ON )
- option( WITH_PYTHON "Enable Python modules API (requires Boost.Python)." ON )
-diff -ur calamares-3.2.11/settings.conf calamares-3.2.11-default-settings/settings.conf
---- calamares-3.2.11/settings.conf 2019-07-06 00:52:35.000000000 +0200
-+++ calamares-3.2.11-default-settings/settings.conf 2019-07-08 22:25:32.579871089 +0200
-@@ -107,21 +107,22 @@
- - locale
- - keyboard
- - localecfg
--# - luksbootkeyfile
-+ - luksbootkeyfile
- # - luksopenswaphookcfg
--# - dracutlukscfg
-+ - dracutlukscfg
- # - plymouthcfg
-- - initcpiocfg
-- - initcpio
-+# - initcpiocfg
-+# - initcpio
- - users
- - displaymanager
- - networkcfg
- - hwclock
- - services-systemd
--# - dracut
-- - initramfs
--# - grubcfg
-+ - dracut
-+# - initramfs
-+ - grubcfg
- - bootloader
-+ - packages
- - umount
- - show:
- # - webview@owncloud
-@@ -139,7 +140,7 @@
- # here, Calamares then takes care of finding it and loading the contents.
- #
- # YAML: string.
--branding: default
-+branding: auto
-
- # If this is set to true, Calamares will show an "Are you sure?" prompt right
- # before each execution phase, i.e. at points of no return. If this is set to
-@@ -167,7 +168,7 @@
- # If this is set to true, Calamares refers to itself as a "setup program"
- # rather than an "installer". Defaults to the value of dont-chroot, but
- # Calamares will complain if this is not explicitly set.
--# oem-setup: true
-+oem-setup: false
-
- # If this is set to true, the "Cancel" button will be disabled entirely.
- # The button is also hidden from view.
-diff -ur calamares-3.2.11/src/branding/default/branding.desc
calamares-3.2.11-default-settings/src/branding/default/branding.desc
---- calamares-3.2.11/src/branding/default/branding.desc 2019-07-06 00:52:35.000000000
+0200
-+++ calamares-3.2.11-default-settings/src/branding/default/branding.desc 2019-07-08
23:49:58.245637521 +0200
-@@ -58,12 +58,12 @@
- # if it contains substitutions, or you'll get YAML exceptions.
- strings:
- productName: "@{NAME}"
-- shortProductName: Generic
-- version: 2017.8 LTS
-- shortVersion: 2017.8
-- versionedName: Generic GNU/Linux 2017.8 LTS "Soapy Sousaphone"
-- shortVersionedName: Generic 2017.8
-- bootloaderEntryName: Generic
-+ shortProductName: "@{NAME}"
-+ version: "@{VERSION}"
-+ shortVersion: "@{VERSION_ID}"
-+ versionedName: "@{NAME} @{VERSION}"
-+ shortVersionedName: "@{NAME} @{VERSION_ID}"
-+ bootloaderEntryName: "@{NAME}"
- productUrl:
https://calamares.io/
- supportUrl:
https://github.com/calamares/calamares/issues
- knownIssuesUrl:
https://calamares.io/about/
-diff -ur calamares-3.2.11/src/modules/bootloader/bootloader.conf
calamares-3.2.11-default-settings/src/modules/bootloader/bootloader.conf
---- calamares-3.2.11/src/modules/bootloader/bootloader.conf 2019-07-06 00:52:35.000000000
+0200
-+++ calamares-3.2.11-default-settings/src/modules/bootloader/bootloader.conf 2019-07-08
22:25:32.579871089 +0200
-@@ -4,7 +4,7 @@
- ---
- # Define which bootloader you want to use for EFI installations
- # Possible options are 'grub', 'sb-shim' and 'systemd-boot'.
--efiBootLoader: "grub"
-+efiBootLoader: "sb-shim"
-
- # systemd-boot configuration files settings, set kernel and initramfs file names
- # and amount of time before default selection boots
-@@ -26,10 +26,10 @@
- # GRUB functionality (notably grub-probe) to work. As needed, you may use
- # complete paths like `/usr/bin/efibootmgr` for the executables.
- #
--grubInstall: "grub-install"
--grubMkconfig: "grub-mkconfig"
--grubCfg: "/boot/grub/grub.cfg"
--grubProbe: "grub-probe"
-+grubInstall: "grub2-install"
-+grubMkconfig: "grub2-mkconfig"
-+grubCfg: "/boot/grub2/grub.cfg"
-+grubProbe: "grub2-probe"
- efiBootMgr: "efibootmgr"
-
- # Optionally set the bootloader ID to use for EFI. This is passed to
-@@ -43,7 +43,9 @@
- # setting the option here, keep in mind that the name is sanitized
- # (problematic characters, see above, are replaced).
- #
--# efiBootloaderId: "dirname"
-+# PACKAGER NOTE: If you really want to change this value, you will also have to
-+# change the hardcoded directory name in the grub2(-efi) package.
-+efiBootloaderId: "fedora"
-
- # Optionally install a copy of the GRUB EFI bootloader as the EFI
- # fallback loader (either bootia32.efi or bootx64.efi depending on
-diff -ur calamares-3.2.11/src/modules/keyboard/keyboard.conf
calamares-3.2.11-default-settings/src/modules/keyboard/keyboard.conf
---- calamares-3.2.11/src/modules/keyboard/keyboard.conf 2019-07-06 00:52:35.000000000
+0200
-+++ calamares-3.2.11-default-settings/src/modules/keyboard/keyboard.conf 2019-07-08
22:25:32.579871089 +0200
-@@ -13,4 +13,4 @@
- # Write keymap configuration to /etc/default/keyboard, usually
- # found on Debian-related systems.
- # Defaults to true if nothing is set.
--#writeEtcDefaultKeyboard: true
-+writeEtcDefaultKeyboard: false
-diff -ur calamares-3.2.11/src/modules/license/license.conf
calamares-3.2.11-default-settings/src/modules/license/license.conf
---- calamares-3.2.11/src/modules/license/license.conf 2019-07-06 00:52:35.000000000
+0200
-+++ calamares-3.2.11-default-settings/src/modules/license/license.conf 2019-07-08
22:25:32.580871083 +0200
-@@ -15,24 +15,12 @@
- # URL (i.e. file:///) assumes that the contents are HTML or plain text,
and
- # displays the license in-line. YAML: string, mandatory.
- entries:
--- id: nvidia
-- name: Nvidia
-- vendor: Nvidia Corporation
-+- id: evil
-+ name: Evil
-+ vendor: Evil Corporation
- type: driver
-- url:
http://developer.download.nvidia.com/cg/Cg_3.0/license.pdf
-+ url:
http://www.example.com/evil_666.0/license.pdf
- required: false
--- id: amd
-- name: Catalyst
-- vendor: "Advanced Micro Devices, Inc."
-- type: gpudriver
-- url:
http://support.amd.com/en-us/download/eula
-- required: false
--- id: flashplugin
-- name: Adobe Flash
-- vendor: Adobe Systems Incorporated
-- type: browserplugin
-- url:
http://www.adobe.com/products/eulas/pdfs/PlatformClients_PC_WWEULA_Combin...
-- required: true
- # This example uses a file: link. This example uses a relative link, which
- # is relative to where you run Calamares. Assuming you run it from build/
- # as part of your testing, you'll get the LICENSE text for Calamares
-diff -ur calamares-3.2.11/src/modules/locale/locale.conf
calamares-3.2.11-default-settings/src/modules/locale/locale.conf
---- calamares-3.2.11/src/modules/locale/locale.conf 2019-07-06 00:52:35.000000000 +0200
-+++ calamares-3.2.11-default-settings/src/modules/locale/locale.conf 2019-07-08
22:25:32.580871083 +0200
-@@ -85,7 +85,7 @@
- #
- # Legacy settings "geoipStyle", "geoipUrl" and
"geoipSelector"
- # in the top-level are still supported, but I'd advise against.
--geoip:
-- style: "json"
-- url: "https://geoip.kde.org/v1/calamares"
-- selector: "" # leave blank for the default
-+#geoip:
-+# style: "json"
-+# url: "https://geoip.kde.org/v1/calamares"
-+# selector: "" # leave blank for the default
-diff -ur calamares-3.2.11/src/modules/netinstall/netinstall.conf
calamares-3.2.11-default-settings/src/modules/netinstall/netinstall.conf
---- calamares-3.2.11/src/modules/netinstall/netinstall.conf 2019-07-06 00:52:35.000000000
+0200
-+++ calamares-3.2.11-default-settings/src/modules/netinstall/netinstall.conf 2019-07-08
22:25:32.580871083 +0200
-@@ -5,6 +5,9 @@
- # or it can be a locally installed file:
- # groupsUrl: file:///usr/share/calamares/netinstall.yaml
- # groupsUrl: file:///usr/share/calamares/netinstall.yaml
-+# Packager note: If you want to enable the netinstall module, you will also have
-+# to create such a file (see the example in the source code).
-+groupsUrl: file:///etc/calamares/modules/netinstall.yaml
-
- # If the installation can proceed without netinstall (e.g. the Live CD
- # can create a working installed system, but netinstall is preferred
-diff -ur calamares-3.2.11/src/modules/packages/packages.conf
calamares-3.2.11-default-settings/src/modules/packages/packages.conf
---- calamares-3.2.11/src/modules/packages/packages.conf 2019-07-06 00:52:35.000000000
+0200
-+++ calamares-3.2.11-default-settings/src/modules/packages/packages.conf 2019-07-08
22:25:32.580871083 +0200
-@@ -12,7 +12,7 @@
- # - entropy - Sabayon package manager
- # - dummy - Dummy manager, only logs
- #
--backend: dummy
-+backend: dnf
-
- #
- # Often package installation needs an internet connection.
-@@ -36,7 +36,7 @@
- # Therefore set also "update_system" to 'true'.
- #
- skip_if_no_internet: false
--update_db: true
-+update_db: false
- update_system: false
-
- #
-@@ -143,12 +143,5 @@
- # of packages, this can lead to a considerable time savings.
- #
- operations:
-- - install:
-- - vi
-- - vi-${LOCALE}
-- - wget
-- - binutils
-- - remove:
-- - vi
-- - wget
-- - binutils
-+ - try_remove:
-+ - calamares
-diff -ur calamares-3.2.11/src/modules/partition/partition.conf
calamares-3.2.11-default-settings/src/modules/partition/partition.conf
---- calamares-3.2.11/src/modules/partition/partition.conf 2019-07-06 00:52:35.000000000
+0200
-+++ calamares-3.2.11-default-settings/src/modules/partition/partition.conf 2019-07-08
22:33:19.646704441 +0200
-@@ -29,18 +29,18 @@
- # is some space for administrative overhead (e.g. 8 GiB swap will allocate
- # 8.8GiB on disk in the end).
- userSwapChoices:
-- - none # Create no swap, use no swap
-- - reuse # Re-use existing swap, but don't create any (unsupported right
now)
-- - small # Up to 4GB
- - suspend # At least main memory size
-- - file # To swap file instead of partition (unsupported right now)
-+ - small # Up to 4GB
-+ - none # Create no swap, use no swap
-+# - reuse # Re-use existing swap, but don't create any (unsupported right
now)
-+# - file # To swap file instead of partition (unsupported right now)
-
- # LEGACY SETTINGS (these will generate a warning)
- # ensureSuspendToDisk: true
- # neverCreateSwap: false
-
- # Correctly draw nested (e.g. logical) partitions as such.
--drawNestedPartitions: false
-+drawNestedPartitions: true
-
- # Show/hide partition labels on manual partitioning page.
- alwaysShowPartitionLabels: true
-diff -ur calamares-3.2.11/src/modules/plasmalnf/plasmalnf.conf
calamares-3.2.11-default-settings/src/modules/plasmalnf/plasmalnf.conf
---- calamares-3.2.11/src/modules/plasmalnf/plasmalnf.conf 2019-07-06 00:52:35.000000000
+0200
-+++ calamares-3.2.11-default-settings/src/modules/plasmalnf/plasmalnf.conf 2019-07-08
22:25:32.581871076 +0200
-@@ -19,7 +19,7 @@
- # to the originating username; the lnftool will be run through
- # "sudo -H -u <liveuser>" instead of directly.
- #
--# liveuser: "live"
-+liveuser: "liveuser"
-
- # You can limit the list of Plasma look-and-feel themes by listing ids
- # here. If this key is not present, all of the installed themes are listed.
-@@ -47,20 +47,20 @@
- # The image screenshot is resized to 12x8 the current font size, with
- # a minimum of 120x80 pixels. This allows the screenshot to scale up
- # on HiDPI displays where the fonts are larger (in pixels).
--themes:
-- - org.kde.fuzzy-pig.desktop
-- - theme: org.kde.breeze.desktop
-- image: "breeze.png"
-- - theme: org.kde.breezedark.desktop
-- image: "breeze-dark.png"
-- - org.kde.fluffy-bunny.desktop
-+#themes:
-+# - org.kde.fuzzy-pig.desktop
-+# - theme: org.kde.breeze.desktop
-+# image: "breeze.png"
-+# - theme: org.kde.breezedark.desktop
-+# image: "breeze-dark.png"
-+# - org.kde.fluffy-bunny.desktop
-
- # If *showAll* is true, then all installed themes are shown in the
- # UI for selection, even if they are not listed in *themes*. This
- # allows selection of all themes even while not all of them are
- # listed in *themes* -- which is useful to show screenshots for those
- # you do have a screenshot for.
--showAll: false
-+showAll: true
-
- # You can pre-select one of the themes; it is not applied
- # immediately, but its radio-button is switched on to indicate
-diff -ur calamares-3.2.11/src/modules/tracking/tracking.conf
calamares-3.2.11-default-settings/src/modules/tracking/tracking.conf
---- calamares-3.2.11/src/modules/tracking/tracking.conf 2019-07-06 00:52:35.000000000
+0200
-+++ calamares-3.2.11-default-settings/src/modules/tracking/tracking.conf 2019-07-08
22:25:32.581871076 +0200
-@@ -54,7 +54,7 @@
-
- # This is the default level to enable for tracking. If commented out,
- # empty, or otherwise invalid, "none" is used, so no tracking by default.
--default: user
-+default: none
-
- # The install area has one specific configuration key:
- # url: this URL (remember to include the protocol, and prefer https)
-diff -ur calamares-3.2.11/src/modules/umount/umount.conf
calamares-3.2.11-default-settings/src/modules/umount/umount.conf
---- calamares-3.2.11/src/modules/umount/umount.conf 2019-07-06 00:52:35.000000000 +0200
-+++ calamares-3.2.11-default-settings/src/modules/umount/umount.conf 2019-07-08
22:25:32.581871076 +0200
-@@ -35,8 +35,8 @@
- ---
- # example when using the normal Calamares log:
- srcLog: "/root/.cache/calamares/session.log"
--destLog: "/var/log/Calamares.log"
-+destLog: "/var/log/calamares.log"
-
- # example when using a log created by `sudo calamares -d`:
--#srcLog: "/home/live/installation.log"
-+#srcLog: "/home/liveuser/installation.log"
- #destLog: "/var/log/installation.log"
-diff -ur calamares-3.2.11/src/modules/unpackfs/unpackfs.conf
calamares-3.2.11-default-settings/src/modules/unpackfs/unpackfs.conf
---- calamares-3.2.11/src/modules/unpackfs/unpackfs.conf 2019-07-06 00:52:35.000000000
+0200
-+++ calamares-3.2.11-default-settings/src/modules/unpackfs/unpackfs.conf 2019-07-08
22:25:32.582871069 +0200
-@@ -33,6 +33,10 @@
-
- # You can list filesystem source paths relative to the Calamares run
- # directory, if you use -d (this is only useful for testing, though).
-- - source: ./example.sqfs
-- sourcefs: squashfs
-+# - source: ./example.sqfs
-+# sourcefs: squashfs
-+# destination: ""
-+
-+ - source: "/dev/mapper/live-base"
-+ sourcefs: "ext4"
- destination: ""
-diff -ur calamares-3.2.11/src/modules/users/users.conf
calamares-3.2.11-default-settings/src/modules/users/users.conf
---- calamares-3.2.11/src/modules/users/users.conf 2019-07-06 00:52:35.000000000 +0200
-+++ calamares-3.2.11-default-settings/src/modules/users/users.conf 2019-07-08
22:25:32.582871069 +0200
-@@ -17,8 +17,7 @@
- - users
- - lp
- - video
-- - network
-- - storage
-+ - dialout
- - wheel
- - audio
-
-@@ -29,7 +28,7 @@
- autologinGroup: autologin
- # You can control the initial state for the 'autologin checkbox' in
UsersViewStep here.
- # Possible values are: true to enable or false to disable the checkbox by default
--doAutologin: true
-+doAutologin: false
-
- # When set to a non-empty string, Calamares creates a sudoers file for the user.
- # /etc/sudoers.d/10-installer
-@@ -39,7 +38,7 @@
- # remove this setting (delete or comment out the line below). Otherwise,
- # the setting will be duplicated in the /etc/sudoers.d/10-installer file,
- # potentially confusing users.
--sudoersGroup: wheel
-+#sudoersGroup: wheel
-
- # Setting this to false , causes the root account to be disabled.
- setRootPassword: true
-@@ -71,9 +70,9 @@
- passwordRequirements:
- minLength: -1 # Password at least this many characters
- maxLength: -1 # Password at most this many characters
-- libpwquality:
-- - minlen=0
-- - minclass=0
-+# libpwquality:
-+# - minlen=0
-+# - minclass=0
-
- # Shell to be used for the regular user of the target system.
- # There are three possible kinds of settings:
-@@ -82,4 +81,4 @@
- # and rely on a correct configuration file in /etc/default/useradd
- # - set, non-empty, use that path as shell. No validation is done
- # that the shell actually exists or is executable.
--# userShell: /bin/bash
-+userShell: ""
-diff -ur calamares-3.2.11/src/modules/welcome/welcome.conf
calamares-3.2.11-default-settings/src/modules/welcome/welcome.conf
---- calamares-3.2.11/src/modules/welcome/welcome.conf 2019-07-06 00:52:35.000000000
+0200
-+++ calamares-3.2.11-default-settings/src/modules/welcome/welcome.conf 2019-07-08
23:47:31.599629603 +0200
-@@ -25,7 +25,7 @@
-
- # To check for internet connectivity, Calamares does a HTTP GET
- # on this URL; on success (e.g. HTTP code 200) internet is OK.
-- internetCheckUrl:
http://google.com
-+ internetCheckUrl:
https://fedoraproject.org/static/hotspot.txt
-
- # List conditions to check. Each listed condition will be
- # probed in some way, and yields true or false according to
-@@ -44,9 +44,9 @@
- # If any of these conditions are not met, the user cannot
- # continue past the welcome page.
- required:
-- # - storage
-+ - storage
- - ram
-- # - root
-+ - root
-
- # GeoIP checking
- #
-@@ -59,11 +59,11 @@
- # To disable, either comment-out the entire section, or set
- # the *style* key to an unsupported format (e.g. `none`, as is
- # done here).
--
--geoip:
-- style: "none"
-- url: "https://geoip.kde.org/v1/ubiquity" # extended XML format
-- selector: "CountryCode" # blank uses default, which is wrong
-+#
-+#geoip:
-+# style: "none"
-+# url: "https://geoip.kde.org/v1/ubiquity" # extended XML format
-+# selector: "CountryCode" # blank uses default, which is wrong
-
- # User interface
- #
diff --git a/calamares-3.2.11-include.patch b/calamares-3.2.11-include.patch
deleted file mode 100644
index bfbcfe2..0000000
--- a/calamares-3.2.11-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
----
calamares-3.2.11/src/modules/partition/gui/PartitionSplitterWidget.cpp.include 2019-07-06
07:52:35.000000000 +0900
-+++ calamares-3.2.11/src/modules/partition/gui/PartitionSplitterWidget.cpp 2020-10-17
19:56:33.680518437 +0900
-@@ -30,6 +30,7 @@
-
- #include <QApplication>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QMouseEvent>
- #include <QStyleOption>
-
diff --git a/calamares-3.2.11-kdesu.patch b/calamares-3.2.11-kdesu.patch
deleted file mode 100644
index 38e7eb4..0000000
--- a/calamares-3.2.11-kdesu.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -Nur calamares-3.2.11-default-settings/calamares.desktop
calamares-3.2.11-kdesu/calamares.desktop
---- calamares-3.2.11-default-settings/calamares.desktop 2019-07-06 00:52:35.000000000
+0200
-+++ calamares-3.2.11-kdesu/calamares.desktop 2019-07-08 23:54:03.108978532 +0200
-@@ -5,7 +5,7 @@
- GenericName=System Installer
- Keywords=calamares;system;installer
- TryExec=calamares
--Exec=pkexec /usr/bin/calamares
-+Exec=kdesu /usr/bin/calamares
- Comment=Calamares — System Installer
- Icon=calamares
- Terminal=false
-diff -Nur calamares-3.2.11-default-settings/calamares.desktop.in
calamares-3.2.11-kdesu/calamares.desktop.in
---- calamares-3.2.11-default-settings/calamares.desktop.in 2019-07-06 00:52:35.000000000
+0200
-+++ calamares-3.2.11-kdesu/calamares.desktop.in 2019-07-08 23:54:03.269977444 +0200
-@@ -5,7 +5,7 @@
- GenericName=System Installer
- Keywords=calamares;system;installer
- TryExec=calamares
--Exec=pkexec /usr/bin/calamares
-+Exec=kdesu /usr/bin/calamares
- Comment=Calamares — System Installer
- Icon=calamares
- Terminal=false
-diff -Nur calamares-3.2.11-default-settings/CMakeLists.txt
calamares-3.2.11-kdesu/CMakeLists.txt
---- calamares-3.2.11-default-settings/CMakeLists.txt 2019-07-08 22:25:32.488871708 +0200
-+++ calamares-3.2.11-kdesu/CMakeLists.txt 2019-07-08 23:54:03.269977444 +0200
-@@ -45,7 +45,6 @@
- ### OPTIONS
- #
- option( INSTALL_CONFIG "Install configuration files" ON )
--option( INSTALL_POLKIT "Install Polkit configuration" ON )
- option( BUILD_TESTING "Build the testing tree." ON )
- option( WITH_PYTHON "Enable Python modules API (requires Boost.Python)." ON )
- option( WITH_PYTHONQT "Enable next generation Python modules API (experimental,
requires PythonQt)." OFF )
-@@ -248,18 +247,6 @@
- #
- find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Concurrent Core Gui Widgets
LinguistTools Svg Quick QuickWidgets )
- find_package( YAMLCPP ${YAMLCPP_VERSION} REQUIRED )
--if( INSTALL_POLKIT )
-- find_package( PolkitQt5-1 REQUIRED )
--else()
-- # Find it anyway, for dependencies-reporting
-- find_package( PolkitQt5-1 )
--endif()
--set_package_properties(
-- PolkitQt5-1 PROPERTIES
-- DESCRIPTION "Qt5 support for Polkit"
-- URL "https://cgit.kde.org/polkit-qt-1.git"
-- PURPOSE "PolkitQt5-1 helps with installing Polkit configuration"
--)
-
- # Find ECM once, and add it to the module search path; Calamares
- # modules that need ECM can do
-@@ -539,15 +526,6 @@
- )
- endif()
-
--if( INSTALL_POLKIT )
-- install(
-- FILES
-- com.github.calamares.calamares.policy
-- DESTINATION
-- "${POLKITQT-1_POLICY_FILES_INSTALL_DIR}"
-- )
--endif()
--
- install(
- FILES
- calamares.desktop
-diff -Nur calamares-3.2.11-default-settings/com.github.calamares.calamares.policy
calamares-3.2.11-kdesu/com.github.calamares.calamares.policy
---- calamares-3.2.11-default-settings/com.github.calamares.calamares.policy 2019-07-06
00:52:35.000000000 +0200
-+++ calamares-3.2.11-kdesu/com.github.calamares.calamares.policy 1970-01-01
01:00:00.000000000 +0100
-@@ -1,22 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!DOCTYPE policyconfig PUBLIC
--"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
--"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
--<policyconfig>
--
-- <vendor>Calamares</vendor>
-- <
vendor_url>https://github.com/calamares</vendor_url>
--
-- <action id="com.github.calamares.calamares.pkexec.run">
-- <description>Run Installer</description>
-- <message>Authentication is required to run the installation
program</message>
-- <icon_name>drive-harddisk</icon_name>
-- <defaults>
-- <allow_any>no</allow_any>
-- <allow_inactive>no</allow_inactive>
-- <allow_active>auth_admin</allow_active>
-- </defaults>
-- <annotate
key="org.freedesktop.policykit.exec.path">/usr/bin/calamares</annotate>
-- <annotate
key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
-- </action>
--</policyconfig>
-\ No newline at end of file
diff --git a/calamares-3.2.35.1-default-settings.patch
b/calamares-3.2.35.1-default-settings.patch
new file mode 100644
index 0000000..94dcef8
--- /dev/null
+++ b/calamares-3.2.35.1-default-settings.patch
@@ -0,0 +1,425 @@
+diff -rup calamares-3.2.35.1/CMakeLists.txt
calamares-3.2.35.1-default-settings/CMakeLists.txt
+--- calamares-3.2.35.1/CMakeLists.txt 2020-12-07 11:09:14.000000000 -0500
++++ calamares-3.2.35.1-default-settings/CMakeLists.txt 2021-01-11 20:51:19.663848685
-0500
+@@ -49,7 +49,7 @@ set( CALAMARES_VERSION_RC 0 ) # Set to
+
+ ### OPTIONS
+ #
+-option( INSTALL_CONFIG "Install configuration files" OFF )
++option( INSTALL_CONFIG "Install configuration files" ON )
+ option( INSTALL_POLKIT "Install Polkit configuration" ON )
+ option( INSTALL_COMPLETION "Install shell completions" OFF )
+ # Options for the calamares executable
+diff -rup calamares-3.2.35.1/settings.conf
calamares-3.2.35.1-default-settings/settings.conf
+--- calamares-3.2.35.1/settings.conf 2020-12-07 11:09:14.000000000 -0500
++++ calamares-3.2.35.1-default-settings/settings.conf 2021-01-11 20:51:19.667848702
-0500
+@@ -134,21 +134,22 @@ sequence:
+ - locale
+ - keyboard
+ - localecfg
+-# - luksbootkeyfile
++ - luksbootkeyfile
+ # - luksopenswaphookcfg
+-# - dracutlukscfg
++ - dracutlukscfg
+ # - plymouthcfg
+- - initcpiocfg
+- - initcpio
++# - initcpiocfg
++# - initcpio
+ - users
+ - displaymanager
+ - networkcfg
+ - hwclock
+ - services-systemd
+-# - dracut
+- - initramfs
+-# - grubcfg
++ - dracut
++# - initramfs
++ - grubcfg
+ - bootloader
++ - packages
+ - umount
+ - show:
+ # - webview@owncloud
+@@ -166,7 +167,7 @@ sequence:
+ # here, Calamares then takes care of finding it and loading the contents.
+ #
+ # YAML: string.
+-branding: default
++branding: auto
+
+ # If this is set to true, Calamares will show an "Are you sure?" prompt right
+ # before each execution phase, i.e. at points of no return. If this is set to
+diff -rup calamares-3.2.35.1/src/branding/default/branding.desc
calamares-3.2.35.1-default-settings/src/branding/default/branding.desc
+--- calamares-3.2.35.1/src/branding/default/branding.desc 2020-12-07 11:09:14.000000000
-0500
++++ calamares-3.2.35.1-default-settings/src/branding/default/branding.desc 2021-01-11
20:54:33.928693213 -0500
+@@ -122,12 +122,12 @@ navigation: widget
+ # are set to "true" (they can also be overridden).
+ strings:
+ productName: "@{NAME}"
+- shortProductName: Generic
+- version: 2020.2 LTS
+- shortVersion: 2020.2
+- versionedName: Fancy GNU/Linux 2020.2 LTS "Turgid Tuba"
+- shortVersionedName: FancyGL 2020.2
+- bootloaderEntryName: FancyGL
++ shortProductName: "@{NAME}"
++ version: "@{VERSION}"
++ shortVersion: "@{VERSION_ID}"
++ versionedName: "@{NAME} @{VERSION}"
++ shortVersionedName: "@{NAME} @{VERSION_ID}"
++ bootloaderEntryName: "@{NAME}"
+ productUrl:
https://calamares.io/
+ supportUrl:
https://github.com/calamares/calamares/wiki
+ knownIssuesUrl:
https://github.com/calamares/calamares/issues
+diff -rup calamares-3.2.35.1/src/modules/bootloader/bootloader.conf
calamares-3.2.35.1-default-settings/src/modules/bootloader/bootloader.conf
+--- calamares-3.2.35.1/src/modules/bootloader/bootloader.conf 2020-12-07
11:09:14.000000000 -0500
++++ calamares-3.2.35.1-default-settings/src/modules/bootloader/bootloader.conf 2021-01-11
20:51:19.671848719 -0500
+@@ -7,7 +7,7 @@
+ ---
+ # Define which bootloader you want to use for EFI installations
+ # Possible options are 'grub', 'sb-shim' and 'systemd-boot'.
+-efiBootLoader: "grub"
++efiBootLoader: "sb-shim"
+
+ # systemd-boot configuration files settings, set kernel and initramfs file names
+ # and amount of time before default selection boots
+@@ -29,10 +29,10 @@ timeout: "10"
+ # GRUB functionality (notably grub-probe) to work. As needed, you may use
+ # complete paths like `/usr/bin/efibootmgr` for the executables.
+ #
+-grubInstall: "grub-install"
+-grubMkconfig: "grub-mkconfig"
+-grubCfg: "/boot/grub/grub.cfg"
+-grubProbe: "grub-probe"
++grubInstall: "grub2-install"
++grubMkconfig: "grub2-mkconfig"
++grubCfg: "/boot/grub2/grub.cfg"
++grubProbe: "grub2-probe"
+ efiBootMgr: "efibootmgr"
+
+ # Optionally set the bootloader ID to use for EFI. This is passed to
+@@ -46,7 +46,9 @@ efiBootMgr: "efibootmgr"
+ # setting the option here, keep in mind that the name is sanitized
+ # (problematic characters, see above, are replaced).
+ #
+-# efiBootloaderId: "dirname"
++# PACKAGER NOTE: If you really want to change this value, you will also have to
++# change the hardcoded directory name in the grub2(-efi) package.
++efiBootloaderId: "fedora"
+
+ # Optionally install a copy of the GRUB EFI bootloader as the EFI
+ # fallback loader (either bootia32.efi or bootx64.efi depending on
+diff -rup calamares-3.2.35.1/src/modules/keyboard/keyboard.conf
calamares-3.2.35.1-default-settings/src/modules/keyboard/keyboard.conf
+--- calamares-3.2.35.1/src/modules/keyboard/keyboard.conf 2020-12-07 11:09:14.000000000
-0500
++++ calamares-3.2.35.1-default-settings/src/modules/keyboard/keyboard.conf 2021-01-11
20:51:19.671848719 -0500
+@@ -20,4 +20,4 @@ convertedKeymapPath: "/lib/kbd/keymaps/x
+ # Write keymap configuration to /etc/default/keyboard, usually
+ # found on Debian-related systems.
+ # Defaults to true if nothing is set.
+-#writeEtcDefaultKeyboard: true
++writeEtcDefaultKeyboard: false
+diff -rup calamares-3.2.35.1/src/modules/license/license.conf
calamares-3.2.35.1-default-settings/src/modules/license/license.conf
+--- calamares-3.2.35.1/src/modules/license/license.conf 2020-12-07 11:09:14.000000000
-0500
++++ calamares-3.2.35.1-default-settings/src/modules/license/license.conf 2021-01-11
20:51:19.673848728 -0500
+@@ -22,24 +22,12 @@
+ # default, rather than requiring the user to first open it up.
+ # YAML: boolean, optional, default is false.
+ entries:
+-- id: nvidia
+- name: Nvidia
+- vendor: Nvidia Corporation
++- id: evil
++ name: Evil
++ vendor: Evil Corporation
+ type: driver
+- url:
http://developer.download.nvidia.com/cg/Cg_3.0/license.pdf
++ url:
http://www.example.com/evil_666.0/license.pdf
+ required: false
+-- id: amd
+- name: Catalyst
+- vendor: "Advanced Micro Devices, Inc."
+- type: gpudriver
+- url:
http://support.amd.com/en-us/download/eula
+- required: false
+-- id: flashplugin
+- name: Adobe Flash
+- vendor: Adobe Systems Incorporated
+- type: browserplugin
+- url:
http://www.adobe.com/products/eulas/pdfs/PlatformClients_PC_WWEULA_Combin...
+- required: true
+ # This example uses a file: link. This example uses a relative link, which
+ # is relative to where you run Calamares. Assuming you run it from build/
+ # as part of your testing, you'll get the LICENSE text for Calamares
+diff -rup calamares-3.2.35.1/src/modules/locale/locale.conf
calamares-3.2.35.1-default-settings/src/modules/locale/locale.conf
+--- calamares-3.2.35.1/src/modules/locale/locale.conf 2020-12-07 11:09:14.000000000
-0500
++++ calamares-3.2.35.1-default-settings/src/modules/locale/locale.conf 2021-01-11
21:18:04.412832678 -0500
+@@ -118,8 +118,8 @@ zone: "New_York"
+ #
+ geoip:
+ style: "json"
+- url: "https://geoip.kde.org/v1/calamares"
+- selector: "" # leave blank for the default
++ url: "https://geoip.fedoraproject.org/city"
++ selector: "time_zone"
+
+ # For testing purposes, you could use *fixed* style, to see how Calamares
+ # behaves in a particular zone:
+diff -rup calamares-3.2.35.1/src/modules/netinstall/netinstall.conf
calamares-3.2.35.1-default-settings/src/modules/netinstall/netinstall.conf
+--- calamares-3.2.35.1/src/modules/netinstall/netinstall.conf 2020-12-07
11:09:14.000000000 -0500
++++ calamares-3.2.35.1-default-settings/src/modules/netinstall/netinstall.conf 2021-01-11
20:57:57.129576597 -0500
+@@ -63,7 +63,9 @@
+ # `local` means that the data is obtained from **this** config
+ # file, under the key *groups*.
+ #
+-groupsUrl: local
++# Packager note: If you want to enable the netinstall module, you will also have
++# to create such a file (see the example in the source code).
++groupsUrl: file:///etc/calamares/modules/netinstall.yaml
+
+ # If the installation can proceed without netinstall (e.g. the Live CD
+ # can create a working installed system, but netinstall is preferred
+diff -rup calamares-3.2.35.1/src/modules/packages/packages.conf
calamares-3.2.35.1-default-settings/src/modules/packages/packages.conf
+--- calamares-3.2.35.1/src/modules/packages/packages.conf 2020-12-07 11:09:14.000000000
-0500
++++ calamares-3.2.35.1-default-settings/src/modules/packages/packages.conf 2021-01-11
20:51:19.677848745 -0500
+@@ -19,7 +19,7 @@
+ # Not actually a package manager, but suitable for testing:
+ # - dummy - Dummy manager, only logs
+ #
+-backend: dummy
++backend: dnf
+
+ #
+ # Often package installation needs an internet connection.
+@@ -43,7 +43,7 @@ backend: dummy
+ # Therefore set also "update_system" to 'true'.
+ #
+ skip_if_no_internet: false
+-update_db: true
++update_db: false
+ update_system: false
+
+ #
+@@ -169,12 +169,5 @@ update_system: false
+ # of packages, this can lead to a considerable time savings.
+ #
+ operations:
+- - install:
+- - vi
+- - vi-${LOCALE}
+- - wget
+- - binutils
+- - remove:
+- - vi
+- - wget
+- - binutils
++ - try_remove:
++ - calamares
+diff -rup calamares-3.2.35.1/src/modules/partition/partition.conf
calamares-3.2.35.1-default-settings/src/modules/partition/partition.conf
+--- calamares-3.2.35.1/src/modules/partition/partition.conf 2020-12-07 11:09:14.000000000
-0500
++++ calamares-3.2.35.1-default-settings/src/modules/partition/partition.conf 2021-01-11
21:00:30.382242829 -0500
+@@ -59,7 +59,7 @@ userSwapChoices:
+ # neverCreateSwap: false
+
+ # Correctly draw nested (e.g. logical) partitions as such.
+-drawNestedPartitions: false
++drawNestedPartitions: true
+
+ # Show/hide partition labels on manual partitioning page.
+ alwaysShowPartitionLabels: true
+diff -rup calamares-3.2.35.1/src/modules/plasmalnf/plasmalnf.conf
calamares-3.2.35.1-default-settings/src/modules/plasmalnf/plasmalnf.conf
+--- calamares-3.2.35.1/src/modules/plasmalnf/plasmalnf.conf 2020-12-07 11:09:14.000000000
-0500
++++ calamares-3.2.35.1-default-settings/src/modules/plasmalnf/plasmalnf.conf 2021-01-11
21:01:35.222524710 -0500
+@@ -22,7 +22,7 @@ lnftool: "/usr/bin/lookandfeeltool"
+ # to the originating username; the lnftool will be run through
+ # "sudo -H -u <liveuser>" instead of directly.
+ #
+-# liveuser: "live"
++liveuser: "liveuser"
+
+ # If *showAll* is true, then all installed themes are shown in the
+ # UI for selection, even if they are not listed in *themes* (below).
+@@ -30,7 +30,7 @@ lnftool: "/usr/bin/lookandfeeltool"
+ # listed in *themes* -- which is useful to show screenshots for those
+ # you do have a screenshot for. If *themes* is empty or missing,
+ # the value of *showAll* is treated as `true`.
+-showAll: false
++showAll: true
+
+ # You can limit the list of Plasma look-and-feel themes by listing ids
+ # here. If this key is not present, all of the installed themes are listed.
+@@ -58,13 +58,13 @@ showAll: false
+ # The image screenshot is resized to 12x8 the current font size, with
+ # a minimum of 120x80 pixels. This allows the screenshot to scale up
+ # on HiDPI displays where the fonts are larger (in pixels).
+-themes:
+- - org.kde.fuzzy-pig.desktop
+- - theme: org.kde.breeze.desktop
+- image: "breeze.png"
+- - theme: org.kde.breezedark.desktop
+- image: "breeze-dark.png"
+- - org.kde.fluffy-bunny.desktop
++#themes:
++# - org.kde.fuzzy-pig.desktop
++# - theme: org.kde.breeze.desktop
++# image: "breeze.png"
++# - theme: org.kde.breezedark.desktop
++# image: "breeze-dark.png"
++# - org.kde.fluffy-bunny.desktop
+
+ # You can pre-select one of the themes; it is not applied
+ # immediately, but its radio-button is switched on to indicate
+diff -rup calamares-3.2.35.1/src/modules/tracking/tracking.conf
calamares-3.2.35.1-default-settings/src/modules/tracking/tracking.conf
+--- calamares-3.2.35.1/src/modules/tracking/tracking.conf 2020-12-07 11:09:14.000000000
-0500
++++ calamares-3.2.35.1-default-settings/src/modules/tracking/tracking.conf 2021-01-11
21:03:31.061028297 -0500
+@@ -54,13 +54,13 @@
+ # This is the global policy; it is displayed as a link on the page.
+ # If blank or commented out, no link is displayed on the tracking
+ # page. You **must** provide policy links per-area as well.
+-policy:
"https://github.com/calamares/calamares/wiki/Use-Guide#installation-tracking"
++#policy:
"https://github.com/calamares/calamares/wiki/Use-Guide#installation-tracking"
+
+ # This is the default area to enable for tracking. If commented out,
+ # empty, or otherwise invalid, "none" is used, so no tracking by default.
+ # Setting an area here also checks the areas before it (install, machine,
+ # then user) by default -- subject to those areas being enabled at all.
+-# default: user
++default: none
+
+ # The install area has one specific configuration key:
+ # url: this URL (remember to include the protocol, and prefer https)
+diff -rup calamares-3.2.35.1/src/modules/umount/umount.conf
calamares-3.2.35.1-default-settings/src/modules/umount/umount.conf
+--- calamares-3.2.35.1/src/modules/umount/umount.conf 2020-12-07 11:09:14.000000000
-0500
++++ calamares-3.2.35.1-default-settings/src/modules/umount/umount.conf 2021-01-11
20:51:19.682848767 -0500
+@@ -18,8 +18,8 @@
+ ---
+ # example when using the normal Calamares log:
+ srcLog: "/root/.cache/calamares/session.log"
+-destLog: "/var/log/Calamares.log"
++destLog: "/var/log/calamares.log"
+
+ # example when using a log created by `sudo calamares -d`:
+-#srcLog: "/home/live/installation.log"
++#srcLog: "/home/liveuser/installation.log"
+ #destLog: "/var/log/installation.log"
+diff -rup calamares-3.2.35.1/src/modules/unpackfs/unpackfs.conf
calamares-3.2.35.1-default-settings/src/modules/unpackfs/unpackfs.conf
+--- calamares-3.2.35.1/src/modules/unpackfs/unpackfs.conf 2020-12-07 11:09:14.000000000
-0500
++++ calamares-3.2.35.1-default-settings/src/modules/unpackfs/unpackfs.conf 2021-01-11
21:06:21.169769068 -0500
+@@ -88,13 +88,6 @@
+ # for its destination name, as in the example below.
+
+ unpack:
+- - source: ../CHANGES
+- sourcefs: file
+- destination: "/tmp/changes.txt"
+- weight: 1 # Single file
+- - source: src/qml/calamares/slideshow
+- sourcefs: file
+- destination: "/tmp/slideshow/"
+- exclude: [ "*.qmlc", "qmldir" ]
+- weight: 5 # Lots of files
+- # excludeFile: /etc/calamares/modules/unpackfs/exclude-list.txt
++ - source: "/dev/mapper/live-base"
++ sourcefs: "ext4"
++ destination: ""
+diff -rup calamares-3.2.35.1/src/modules/users/users.conf
calamares-3.2.35.1-default-settings/src/modules/users/users.conf
+--- calamares-3.2.35.1/src/modules/users/users.conf 2020-12-07 11:09:14.000000000 -0500
++++ calamares-3.2.35.1-default-settings/src/modules/users/users.conf 2021-01-11
21:09:36.506620035 -0500
+@@ -34,8 +34,7 @@ defaultGroups:
+ system: true
+ - lp
+ - video
+- - network
+- - storage
++ - dialout
+ - name: wheel
+ must_exist: false
+ system: true
+@@ -51,7 +50,7 @@ autologinGroup: autologin
+ # - true to check or
+ # - false to uncheck
+ # These set the **initial** state of the checkbox.
+-doAutologin: true
++doAutologin: false
+
+ # When *sudoersGroup* is set to a non-empty string, Calamares creates a
+ # sudoers file for the user. This file is located at:
+@@ -62,7 +61,7 @@ doAutologin: true
+ # remove this setting (delete or comment out the line below). Otherwise,
+ # the setting will be duplicated in the `/etc/sudoers.d/10-installer` file,
+ # potentially confusing users.
+-sudoersGroup: wheel
++#sudoersGroup: wheel
+
+ # Setting this to false, causes the root account to be disabled.
+ # When disabled, hides the "Use the same password for administrator"
+@@ -115,9 +114,9 @@ passwordRequirements:
+ nonempty: true
+ minLength: -1 # Password at least this many characters
+ maxLength: -1 # Password at most this many characters
+- libpwquality:
+- - minlen=0
+- - minclass=0
++# libpwquality:
++# - minlen=0
++# - minclass=0
+
+ # You can control the visibility of the 'strong passwords' checkbox here.
+ # Possible values are:
+@@ -143,7 +142,7 @@ allowWeakPasswordsDefault: false
+ # and rely on a correct configuration file in /etc/default/useradd
+ # - set, non-empty, use that path as shell. No validation is done
+ # that the shell actually exists or is executable.
+-userShell: /bin/bash
++userShell: ""
+
+ # Hostname setting
+ #
+diff -rup calamares-3.2.35.1/src/modules/welcome/welcome.conf
calamares-3.2.35.1-default-settings/src/modules/welcome/welcome.conf
+--- calamares-3.2.35.1/src/modules/welcome/welcome.conf 2020-12-07 11:09:14.000000000
-0500
++++ calamares-3.2.35.1-default-settings/src/modules/welcome/welcome.conf 2021-01-11
21:16:15.720359171 -0500
+@@ -18,7 +18,7 @@
+ showSupportUrl: true
+ showKnownIssuesUrl: true
+ showReleaseNotesUrl: false
+-showDonateUrl:
https://kde.org/community/donations/
++showDonateUrl: false
+
+ # Requirements checking. These are general, generic, things
+ # that are checked. They may not match with the actual requirements
+@@ -34,7 +34,7 @@ requirements:
+
+ # To check for internet connectivity, Calamares does a HTTP GET
+ # on this URL; on success (e.g. HTTP code 200) internet is OK.
+- internetCheckUrl:
http://google.com
++ internetCheckUrl:
https://fedoraproject.org/static/hotspot.txt
+
+ # List conditions to check. Each listed condition will be
+ # probed in some way, and yields true or false according to
+@@ -53,9 +53,9 @@ requirements:
+ # If any of these conditions are not met, the user cannot
+ # continue past the welcome page.
+ required:
+- # - storage
++ - storage
+ - ram
+- # - root
++ - root
+
+ # GeoIP checking
+ #
+@@ -79,9 +79,9 @@ requirements:
+ # data. Timezone, city, or other data will not be recognized.
+ #
+ geoip:
+- style: "none"
+- url: "https://geoip.kde.org/v1/ubiquity" # extended XML format
+- selector: "CountryCode" # blank uses default, which is wrong
++ style: "json"
++ url: "https://geoip.fedoraproject.org/city"
++ selector: "country_code"
+
+ # User interface
+ #
diff --git a/calamares-3.2.35.1-kdesu.patch b/calamares-3.2.35.1-kdesu.patch
new file mode 100644
index 0000000..76adf43
--- /dev/null
+++ b/calamares-3.2.35.1-kdesu.patch
@@ -0,0 +1,70 @@
+diff -rup calamares-3.2.35.1-default-settings/calamares.desktop
calamares-3.2.35.1-kdesu/calamares.desktop
+--- calamares-3.2.35.1-default-settings/calamares.desktop 2020-12-07 11:09:14.000000000
-0500
++++ calamares-3.2.35.1-kdesu/calamares.desktop 2021-01-12 19:45:00.031816669 -0500
+@@ -5,7 +5,7 @@ Name=Install System
+ GenericName=System Installer
+ Keywords=calamares;system;installer;
+ TryExec=calamares
+-Exec=pkexec /usr/bin/calamares
++Exec=kdesu /usr/bin/calamares
+ Comment=Calamares — System Installer
+ Icon=calamares
+ Terminal=false
+diff -rup calamares-3.2.35.1-default-settings/calamares.desktop.in
calamares-3.2.35.1-kdesu/calamares.desktop.in
+--- calamares-3.2.35.1-default-settings/calamares.desktop.in 2020-12-07
11:09:14.000000000 -0500
++++ calamares-3.2.35.1-kdesu/calamares.desktop.in 2021-01-12 19:45:00.032816674 -0500
+@@ -5,7 +5,7 @@ Name=Install System
+ GenericName=System Installer
+ Keywords=calamares;system;installer;
+ TryExec=calamares
+-Exec=pkexec /usr/bin/calamares
++Exec=kdesu /usr/bin/calamares
+ Comment=Calamares — System Installer
+ Icon=calamares
+ Terminal=false
+Only in calamares-3.2.35.1-kdesu/: calamares.desktop.in.orig
+Only in calamares-3.2.35.1-kdesu/: calamares.desktop.orig
+diff -rup calamares-3.2.35.1-default-settings/CMakeLists.txt
calamares-3.2.35.1-kdesu/CMakeLists.txt
+--- calamares-3.2.35.1-default-settings/CMakeLists.txt 2021-01-12 19:32:27.586834996
-0500
++++ calamares-3.2.35.1-kdesu/CMakeLists.txt 2021-01-12 19:46:53.821418801 -0500
+@@ -50,7 +50,6 @@ set( CALAMARES_VERSION_RC 0 ) # Set to
+ ### OPTIONS
+ #
+ option( INSTALL_CONFIG "Install configuration files" ON )
+-option( INSTALL_POLKIT "Install Polkit configuration" ON )
+ option( INSTALL_COMPLETION "Install shell completions" OFF )
+ # Options for the calamares executable
+ option( WITH_KF5Crash "Enable crash reporting with KCrash." ON ) # TODO:3.3:
WITH->BUILD (this isn't an ABI thing)
+@@ -277,18 +276,6 @@ endif()
+ find_package( Qt5DBus CONFIG )
+
+ find_package( YAMLCPP ${YAMLCPP_VERSION} REQUIRED )
+-if( INSTALL_POLKIT )
+- find_package( PolkitQt5-1 REQUIRED )
+-else()
+- # Find it anyway, for dependencies-reporting
+- find_package( PolkitQt5-1 )
+-endif()
+-set_package_properties(
+- PolkitQt5-1 PROPERTIES
+- DESCRIPTION "Qt5 support for Polkit"
+- URL "https://cgit.kde.org/polkit-qt-1.git"
+- PURPOSE "PolkitQt5-1 helps with installing Polkit configuration"
+-)
+
+ # Find ECM once, and add it to the module search path; Calamares
+ # modules that need ECM can do
+@@ -626,13 +613,6 @@ if( INSTALL_CONFIG )
+ )
+ endif()
+
+-if( INSTALL_POLKIT )
+- install(
+- FILES com.github.calamares.calamares.policy
+- DESTINATION "${POLKITQT-1_POLICY_FILES_INSTALL_DIR}"
+- )
+-endif()
+-
+ if ( INSTALL_COMPLETION )
+ if( NOT CMAKE_INSTALL_BASHCOMPLETIONDIR )
+ set( CMAKE_INSTALL_BASHCOMPLETIONDIR
"${CMAKE_INSTALL_DATADIR}/bash-completion/completions" )
diff --git a/calamares-3.2.35.1-use-correct-shim.patch
b/calamares-3.2.35.1-use-correct-shim.patch
new file mode 100644
index 0000000..7541f4a
--- /dev/null
+++ b/calamares-3.2.35.1-use-correct-shim.patch
@@ -0,0 +1,39 @@
+From f3b3da39ce2a6184651defe1d089ab6724affd58 Mon Sep 17 00:00:00 2001
+From: Neal Gompa <ngompa13(a)gmail.com>
+Date: Fri, 29 Jan 2021 20:31:24 -0500
+Subject: [PATCH] modules/bootloader: Use the correct names for the shim
+ binaries
+
+Ever since signed shim binaries for multiple architectures became
+available, the shim binaries installed in Linux distributions have
+been renamed to include the EFI architecture in the binary names.
+
+This started in Fedora, but is now used in openSUSE and Ubuntu too.
+
+Reference for shim binary names comes from shim spec in Fedora:
+
+https://src.fedoraproject.org/rpms/shim/blob/d8c3c8e39235507feb17b4e81851da087ae83c77/f/shim.spec#_23-32
+---
+ src/modules/bootloader/main.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py
+index ec9a6f2e6..b85ef1b9a 100644
+--- a/src/modules/bootloader/main.py
++++ b/src/modules/bootloader/main.py
+@@ -372,9 +372,9 @@ def install_secureboot(efi_directory):
+ install_efi_directory = install_path + efi_directory
+
+ if efi_word_size() == "64":
+- install_efi_bin = "shim64.efi"
+- else:
+- install_efi_bin = "shim.efi"
++ install_efi_bin = "shimx64.efi"
++ elif efi_word_size() == "32":
++ install_efi_bin = "shimia32.efi"
+
+ # Copied, roughly, from openSUSE's install script,
+ # and pythonified. *disk* is something like /dev/sda,
+--
+2.29.2
+
diff --git a/calamares-3.2.8-shim-grub-cfg.patch b/calamares-3.2.8-shim-grub-cfg.patch
deleted file mode 100644
index 86f5fe6..0000000
--- a/calamares-3.2.8-shim-grub-cfg.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur calamares-3.2.8/src/modules/bootloader/main.py
calamares-3.2.8-shim-grub-cfg/src/modules/bootloader/main.py
---- calamares-3.2.8/src/modules/bootloader/main.py 2019-05-11 01:00:11.000000000 +0200
-+++ calamares-3.2.8-shim-grub-cfg/src/modules/bootloader/main.py 2019-05-12
15:26:16.944784471 +0200
-@@ -7,7 +7,7 @@
- # Copyright 2014, Anke Boersma <demm(a)kaosx.us>
- # Copyright 2014, Daniel Hillenbrand <codeworkx(a)bbqlinux.org>
- # Copyright 2014, Benjamin Vaudour <benjamin.vaudour(a)yahoo.fr>
--# Copyright 2014, Kevin Kofler <kevin.kofler(a)chello.at>
-+# Copyright 2014-2019, Kevin Kofler <kevin.kofler(a)chello.at>
- # Copyright 2015-2018, Philip Mueller <philm(a)manjaro.org>
- # Copyright 2016-2017, Teo Mrnjavac <teo(a)kde.org>
- # Copyright 2017, Alf Gaida <agaida(a)siduction.org>
-@@ -339,8 +339,8 @@
- "--force",
- boot_loader["installPath"]])
-
-- # The file specified in grubCfg should already be filled out
-- # by the grubcfg job module.
-+ # The input file /etc/default/grub should already be filled out by the
-+ # grubcfg job module.
- check_target_env_call([libcalamares.job.configuration["grubMkconfig"],
- "-o",
libcalamares.job.configuration["grubCfg"]])
-
-@@ -395,6 +395,12 @@
- "-p", efi_partition_number,
- "-l", install_efi_directory + "/" + install_efi_bin])
-
-+ # The input file /etc/default/grub should already be filled out by the
-+ # grubcfg job module.
-+ check_target_env_call([libcalamares.job.configuration["grubMkconfig"],
-+ "-o", os.path.join(efi_directory, "EFI",
-+ efi_bootloader_id,
"grub.cfg")])
-+
-
- def vfat_correct_case(parent, name):
- for candidate in os.listdir(parent):
diff --git a/calamares.spec b/calamares.spec
index fc22750..7542c80 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -3,6 +3,9 @@
#global prerelease beta2
+# For rpmdev-bumpspec and releng scripts
+%global baserelease 1
+
# do not use QtWebEngine because it no longer works with QtWebEngine >= 5.11
# (it now refuses to run as root unless "export
QTWEBENGINE_DISABLE_SANDBOX=1")
#
https://github.com/calamares/calamares/issues/1051
@@ -13,13 +16,9 @@
%global webview_qtwebengine 1
%endif
-%if 0%{?fedora} > 29
-%global kpmcore4 1
-%endif
-
Name: calamares
-Version: 3.2.11
-Release: 16%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c
-13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist}
+Version: 3.2.35.1
+Release: %{baserelease}%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c
-13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist}
Summary: Installer from a live CD/DVD/USB to disk
License: GPLv3+
@@ -40,27 +39,29 @@ Source4: calamares-auto_de.ts
Source5: calamares-auto_it.ts
# adjust some default settings (default shipped .conf files)
-Patch0: calamares-3.2.11-default-settings.patch
+Patch0: calamares-3.2.35.1-default-settings.patch
# use kdesu instead of pkexec (works around #1171779)
-Patch1: calamares-3.2.11-kdesu.patch
+Patch1: calamares-3.2.35.1-kdesu.patch
-# Already upstream:
-#
https://github.com/calamares/calamares/commit/0e7c984854bcf9b25655e369986...
-Patch2: calamares-3.2.11-include.patch
+# fix shim binary names
+## Submitted:
https://github.com/calamares/calamares/pull/1628
+Patch2: calamares-3.2.35.1-use-correct-shim.patch
# Calamares is only supported where live images (and GRUB) are. (#1171380)
-# This list matches the livearches global from anaconda.spec
+# This list matches the arches where grub2-efi is used to boot the system
+## NOTE: aarch64 needs some upstream work before it can be added to this list
ExclusiveArch: %{ix86} x86_64
# Macros
BuildRequires: kf5-rpm-macros
# Compilation tools
-BuildRequires: cmake >= 3.2
+BuildRequires: cmake >= 3.3
BuildRequires: extra-cmake-modules >= 5.18
-BuildRequires: gcc-c++ >= 4.9.0
+BuildRequires: gcc-c++ >= 7.0
BuildRequires: pkgconfig
+BuildRequires: make
# Other build-time tools
BuildRequires: desktop-file-utils
@@ -93,13 +94,7 @@ BuildRequires: kf5-kwidgetsaddons-devel
BuildRequires: kf5-plasma-devel
# KPMCore
-%if 0%{?kpmcore4}
-BuildRequires: kpmcore-devel >= 4.0
-%else
-BuildRequires: kpmcore-devel >= 3.3
-BuildRequires: libatasmart-devel
-BuildRequires: libblkid-devel
-%endif
+BuildRequires: kpmcore-devel >= 4.2.0
# Python 3
BuildRequires: python3-devel >= 3.3
@@ -111,7 +106,6 @@ BuildRequires: libpwquality-devel
BuildRequires: libxcrypt-devel
BuildRequires: parted-devel
BuildRequires: yaml-cpp-devel >= 0.5.1
-BuildRequires: make
# for automatic branding setup
Requires(post): system-release
@@ -124,14 +118,15 @@ Requires: upower
Requires: NetworkManager
Requires: dracut
Requires: grub2
+%ifarch x86_64 aarch64
%ifarch x86_64
-# EFI currently only supported on x86_64
-# To make EFI work on 32-bit x86 Fedora, the repository would have to ship at
-# least the grub2-efi-* package(s), which are missing in the i386 Everything
-# repository. (At least you can install 64-bit Fedora 27+ on 32-bit UEFI now.)
-# F27+:
https://fedoraproject.org/wiki/Changes/32BitUefiSupport
+# For x86 systems
Requires: grub2-efi-x64
Recommends: grub2-efi-ia32
+%else
+# For all non-x86 arches
+Requires: grub2-efi
+%endif
Requires: efibootmgr
%endif
Requires: console-setup
@@ -213,19 +208,18 @@ developing custom modules for Calamares.
# delete backup files so they don't get installed
rm -f src/modules/*/*.conf.default-settings
%patch1 -p1 -b .kdesu
-%patch2 -p1 -b .include
+%patch2 -p1 -b .shim-bin-names
%build
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-# Since %%cmake_kf5 forcely undefines %%__cmake_in_source_build, for now explicitly add
-B option here
-%{cmake_kf5} -DBUILD_TESTING:BOOL=OFF -DWITH_PYTHONQT:BOOL=OFF
-DWEBVIEW_FORCE_WEBKIT:BOOL="%{webview_force_webkit}"
-DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" -B. ..
-popd
-
-make %{?_smp_mflags} -C %{_target_platform}
+%{cmake_kf5} -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \
+ -DBUILD_TESTING:BOOL=OFF \
+ -DWITH_PYTHONQT:BOOL=OFF \
+ -DWEBVIEW_FORCE_WEBKIT:BOOL="%{webview_force_webkit}"
+%cmake_build
%install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%cmake_install
+
# create the auto branding directory
mkdir -p %{buildroot}%{_datadir}/calamares/branding/auto
touch %{buildroot}%{_datadir}/calamares/branding/auto/branding.desc
@@ -319,7 +313,8 @@ style:
EOF
%files -f calamares-python.lang
-%doc LICENSE AUTHORS
+%doc AUTHORS
+%license LICENSES/*
%{_bindir}/calamares
%dir %{_datadir}/calamares/
%{_datadir}/calamares/settings.conf
@@ -339,8 +334,6 @@ EOF
%{_mandir}/man8/calamares.8*
%{_sysconfdir}/calamares/
-%ldconfig_scriptlets libs
-
%files libs
%{_libdir}/libcalamares.so.*
%{_libdir}/libcalamaresui.so.*
@@ -369,6 +362,13 @@ EOF
%changelog
+* Sat Jan 30 2021 Neal Gompa <ngompa13(a)gmail.com> - 3.2.35.1-1
+- Rebase to 3.2.35.1
+- Prepare for support for AArch64
+- Add configuration for Fedora GeoIP endpoints
+- Add patch to fix shim binary names
+- Minor spec cleanups
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
3.2.11-16
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index 62c2abf..e622c44 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (calamares-3.2.11.tar.gz) =
bd150a89b92a55e456e7a9facbaaaa5b0049e0a09b2b5fec6e53222804d2213d42e3bea51071fa8f89b180851090c644a618c24616ee3d13af3d907eee1d7aa0
+SHA512 (calamares-3.2.35.1.tar.gz) =
5c0c19fdfaeea85f467a6b59a3e088ad5709940a25521a28bbf8a9bb69a2e87d44f40a4500688c383036c48d4c4d70176bb170dcc39897fff3e09be3117de9ff