calamares 3.2.20-3 (x86_64) 2020-11683
1

Submitter rugyada [@T] gmail.com
Platform 4.1
Repository main
URL https://abf.openmandriva.org/build_lists/762768
Packages
calamares-3.2.20-3.x86_64.binary
calamares-3.2.20-3.x86_64.source
calamares-debuginfo-3.2.20-3.x86_64.debuginfo
lib64calamares3-3.2.20-3.x86_64.binary
lib64calamares3-debuginfo-3.2.20-3.x86_64.debuginfo
lib64calamares-devel-3.2.20-3.x86_64.binary
Build Date 2020-04-30 13:40:10 +0000 UTC
Last Updated 2020-05-04 08:00:36.442198496 +0000 UTC
$ git diff --patch-with-stat --summary 2351d4cfc379727ca7c2e80716ff61c007683cb7..afe163df6ca0e8c83056172639e9364eb2a625ec

 .abf.yml                                    |  2 +-
 calamares-3.2.16-random-seed-location.patch | 12 ++++++------
 calamares-post-script                       |  5 +++++
 calamares.spec                              |  9 ++++-----
 fix-incomplete-type.patch                   | 12 ++++++++++++
 omv-displaymanager.conf                     |  2 ++
 omv-grubcfg.conf                            | 26 ++++++++++++++++++++++++--
 omv-packages.conf                           |  2 +-
 omv-services-systemd.conf                   | 10 +++++-----
 omv-users.conf                              | 13 +++++++++++++
 10 files changed, 73 insertions(+), 20 deletions(-)
 create mode 100644 fix-incomplete-type.patch

diff --git a/.abf.yml b/.abf.yml
index cef3e8c..8d3700e 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,4 +1,4 @@
 sources:
   OpenMandriva-adverts.tar.xz: d0833604f1ce5bdcc7a1560cc51f4c392a9ed665
   openmandriva-install.svg: a64c8fd2b0e11766cfdcc0c345664b99c4b108b7
-  calamares-3.2.18.tar.gz: fb77ce09ff2a0c468ccb4f2b4d9f6b787731c857
+  calamares-3.2.20.tar.gz: 6f23d53c68ca691dcbf6e1bdbd298c076b17e862 
diff --git a/calamares-3.2.16-random-seed-location.patch b/calamares-3.2.16-random-seed-location.patch
index 87b0e0d..d2d758a 100644
--- a/calamares-3.2.16-random-seed-location.patch
+++ b/calamares-3.2.16-random-seed-location.patch
@@ -1,12 +1,12 @@
-diff -up calamares-3.2.16/src/modules/machineid/MachineIdJob.cpp.omv~ calamares-3.2.16/src/modules/machineid/MachineIdJob.cpp
---- calamares-3.2.16/src/modules/machineid/MachineIdJob.cpp.omv~	2019-11-08 19:48:38.635552205 +0100
-+++ calamares-3.2.16/src/modules/machineid/MachineIdJob.cpp	2019-11-08 19:50:47.772021284 +0100
-@@ -66,7 +66,7 @@ MachineIdJob::exec()
+diff -Naur calamares-3.2.20/src/modules/machineid/MachineIdJob.cpp calamares-3.2.20.tpg/src/modules/machineid/MachineIdJob.cpp
+--- calamares-3.2.20/src/modules/machineid/MachineIdJob.cpp	2020-02-27 22:26:29.000000000 +0000
++++ calamares-3.2.20.tpg/src/modules/machineid/MachineIdJob.cpp	2020-03-12 10:32:28.661044992 +0000
+@@ -66,7 +66,7 @@
  
      QString target_systemd_machineid_file = QStringLiteral( "/etc/machine-id" );
      QString target_dbus_machineid_file = QStringLiteral( "/var/lib/dbus/machine-id" );
 -    QString target_entropy_file = QStringLiteral( "/var/lib/urandom/random-seed" );
 +    QString target_entropy_file = QStringLiteral( "/var/lib/systemd/random-seed" );
  
-     // Clear existing files
-     if ( m_entropy )
+     const CalamaresUtils::System* system = CalamaresUtils::System::instance();
+ 
diff --git a/calamares-post-script b/calamares-post-script
index 8c13a27..45d66dc 100755
--- a/calamares-post-script
+++ b/calamares-post-script
@@ -66,6 +66,11 @@ iso_stuff()
 	    rm -rf /root/tmp
 	fi
 
+## /live
+	if [ -d /live ]; then
+	    rm -rf /live
+	fi
+
 ## clean .bak .rpmsave files .. strange to have
 ## an fresh installed system with the on it
 	for i in $(ls /etc/*.{bak,rpmsave})
diff --git a/calamares.spec b/calamares.spec
index 205887e..e93a5ce 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -5,12 +5,12 @@
 
 Summary:	Distribution-independent installer framework
 Name:		calamares
-Version:	3.2.18
+Version:	3.2.20
 %if "%{git}" != ""
 Release:	0.%{git}.1
 Source0:	calamares-%{version}-%{git}.tar.xz
 %else
-Release:	2
+Release:	3
 # git archive --format=tar --prefix=calamares-1.1.0-$(date +%Y%m%d)/ HEAD | xz -vf > calamares-1.1.0-$(date +%Y%m%d).tar.xz
 #Source0:	calamares-%{version}-%{calamdate}.tar.xz
 Source0:	https://github.com/calamares/calamares/releases/download/v%{version}/%{name}-%{version}.tar.gz
@@ -50,7 +50,6 @@ Patch1:		calamares-0.17.0-20150112-openmandriva-desktop-file.patch
 # (crazy) why we need this?
 Patch2:		calamares-libparted-detection.patch
 # (crazy) patches from Frugalware
-Patch3:		0001-Try-to-guess-suggested-hostname-from-dmi.patch
 Patch4:		0001-locale-fixes.patch
 # (crazy) we do some strange things in iso repo , here a way to undo
 Patch5:		0001-services-systemd-support-sockets-timers-and-unmask.patch
@@ -59,8 +58,8 @@ Patch5:		0001-services-systemd-support-sockets-timers-and-unmask.patch
 Patch6:		0003-disable-lvm.patch
 Patch7:		calamares-3.2.16-random-seed-location.patch
 Patch10:	esp-to-boot-flag.patch
-Patch11:	kpmcore4-api-1.patch
-Patch12:	http://frugalware.eu/cala-luks-sucker1.patch
+Patch11:	fix-incomplete-type.patch
+#Patch12:	http://frugalware.eu/cala-luks-sucker1.patch
 
 BuildRequires:	pkgconfig(Qt5Core)
 BuildRequires:	pkgconfig(Qt5DBus)
diff --git a/fix-incomplete-type.patch b/fix-incomplete-type.patch
new file mode 100644
index 0000000..e3ecb6e
--- /dev/null
+++ b/fix-incomplete-type.patch
@@ -0,0 +1,12 @@
+diff --git a/src/modules/partition/gui/PartitionSplitterWidget.cpp b/src/modules/partition/gui/PartitionSplitterWidget.cpp
+index bcc80b6..50f7871 100644
+--- a/src/modules/partition/gui/PartitionSplitterWidget.cpp
++++ b/src/modules/partition/gui/PartitionSplitterWidget.cpp
+@@ -32,6 +32,7 @@
+ 
+ #include <QApplication>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QMouseEvent>
+ #include <QStyleOption>
+ 
diff --git a/omv-displaymanager.conf b/omv-displaymanager.conf
index f775123..c16f40e 100644
--- a/omv-displaymanager.conf
+++ b/omv-displaymanager.conf
@@ -6,6 +6,8 @@
 #The displaymanagers list can also be set in globalstorage, and in that case it overrides anything set up here.
 displaymanagers:
   - sddm
+  - lightdm
+  - gdm
 
 #Enable the following settings to force a desktop environment in your displaymanager configuration file:
 #defaultDesktopEnvironment:
diff --git a/omv-grubcfg.conf b/omv-grubcfg.conf
index 869b4f1..09a1c9c 100644
--- a/omv-grubcfg.conf
+++ b/omv-grubcfg.conf
@@ -1,9 +1,31 @@
+# Create, overwrite or update /etc/default/grub in the target system.
+#
+# Write lines to /etc/default/grub (in the target system) based
+# on calculated values and the values set in the *defaults* key
+# in this configuration file.
+#
+# Calculated values are:
+#   - GRUB_DISTRIBUTOR,   branding module, *bootloaderEntryName* (this
+#     string is sanitized, and see also setting *keepDistributor*)
+#   - GRUB_ENABLE_CRYPTODISK, based on the presence of filesystems
+#     that use LUKS
+#   - GRUB_CMDLINE_LINUX_DEFAULT, adding LUKS setup and plymouth
+#     support to the kernel.
+
+---
 # If set to true, always creates /etc/default/grub from scratch even if the file
 # already existed. If set to false, edits the existing file instead.
 overwrite: false
+
+# If set to true, an **existing** setting for GRUB_DISTRIBUTOR is
+# kept, not updated to the *bootloaderEntryName* from the branding file.
+# Use this if the GRUB_DISTRIBUTOR setting in the file is "smart" in
+# some way (e.g. uses shell-command substitution).
+keepDistributor: false
+
 # Default entries to write to /etc/default/grub if it does not exist yet or if
-# we are overwriting it. Note that in addition, GRUB_CMDLINE_LINUX_DEFAULT and
-# GRUB_DISTRIBUTOR will always be written, with automatically detected values.
+# we are overwriting it.
+#
 defaults:
     GRUB_TIMEOUT: 10
     GRUB_DEFAULT: "saved"
diff --git a/omv-packages.conf b/omv-packages.conf
index cbec8cb..434dd31 100644
--- a/omv-packages.conf
+++ b/omv-packages.conf
@@ -145,5 +145,5 @@ update_system: false
 operations:
   - remove:
       - calamares
-      - console-setup
+#     - console-setup
       - squashfs-tools
diff --git a/omv-services-systemd.conf b/omv-services-systemd.conf
index 858b8c1..679b862 100644
--- a/omv-services-systemd.conf
+++ b/omv-services-systemd.conf
@@ -67,6 +67,9 @@
 # (crazy) NONE of these are mandatory
 # please to NOT ADD true to any.
 services:
+  - name: "dbus-broker"
+    mandatory: false
+
   - name: "NetworkManager"
     mandatory: false
 
@@ -82,13 +85,10 @@ services:
   - name: "systemd-timesyncd"
     mandatory: false
 
-  - name: "acpid"
-    mandatory: false
-
   - name: "avahi-daemon"
     mandatory: false
 
-  - name: "firewalld"
+  - name: "ufw"
     mandatory: false
 
   - name: "irqbalance"
@@ -100,7 +100,7 @@ services:
   - name: "lvm2-monitor"
     mandatory: false
 
-  - name: "nftables"
+  - name: "iptables"
     mandatory: false
 
 targets:
diff --git a/omv-users.conf b/omv-users.conf
index a07f783..12ed9c3 100644
--- a/omv-users.conf
+++ b/omv-users.conf
@@ -56,3 +56,16 @@ allowWeakPasswordsDefault: false
 # (crazy) FIXME: add UI options  for that
 userShell: /bin/bash
 
+# Hostname setting
+#
+# The user can enter a hostname; this is configured into the system
+# in some way; pick one of:
+#   - *None*, to not set the hostname at all
+#   - *EtcFile*, to write to `/etc/hostname` directly
+#   - *Hostnamed*, to use systemd hostnamed(1) over DBus
+# The default is *EtcFile*.
+setHostname: EtcFile
+
+# Should /etc/hosts be written with a hostname for this machine
+# (also adds localhost and some ipv6 standard entries).
+writeHostsFile: true
Not Available
rugyada [@T] gmail.comNo Comment.22d 01hrs
benbullard79 [@T] cox.netNo Comment.21d 10hrs