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=a41aa300....
Change:
-%ifarch %{?qt5_qtwebengine_arches}%{!?qt5_qtwebengine_arches:%{ix86} x86_64}
Thanks.
Full change:
============
commit 82ed993d2bc9e85601cf6a85823f277cfdec9faa
Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org>
Date: Mon May 6 00:50:36 2019 +0200
unpackfs-dev patch: Fix Python syntax
diff --git a/calamares-3.2.7-unpackfs-dev.patch b/calamares-3.2.7-unpackfs-dev.patch
index 059ef94..5950ce7 100644
--- a/calamares-3.2.7-unpackfs-dev.patch
+++ b/calamares-3.2.7-unpackfs-dev.patch
@@ -1,12 +1,12 @@
diff -ur calamares-3.2.7/src/modules/unpackfs/main.py
calamares-3.2.7-unpackfs-dev/src/modules/unpackfs/main.py
--- calamares-3.2.7/src/modules/unpackfs/main.py 2019-04-27 20:12:03.000000000 +0200
-+++ calamares-3.2.7-unpackfs-dev/src/modules/unpackfs/main.py 2019-05-06
00:00:55.302325577 +0200
++++ calamares-3.2.7-unpackfs-dev/src/modules/unpackfs/main.py 2019-05-06
00:49:55.325039262 +0200
@@ -252,13 +252,19 @@
subprocess.check_call(["mount",
"--bind", entry.source,
imgmountdir])
- else:
-+ else if os.path.isfile(entry.source):
++ elif os.path.isfile(entry.source):
subprocess.check_call(["mount",
entry.source,
imgmountdir,
commit bd20b19c17987d0f6c2eb84c8590a15d688aec57
Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org>
Date: Mon May 6 00:38:33 2019 +0200
unpackfs: do not use -o loop if the source is a device (fails on F29+)
* Sun May 05 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 3.2.7-4
- unpackfs: do not use -o loop if the source is a device (fails on F29+)
diff --git a/calamares-3.2.7-unpackfs-dev.patch b/calamares-3.2.7-unpackfs-dev.patch
new file mode 100644
index 0000000..059ef94
--- /dev/null
+++ b/calamares-3.2.7-unpackfs-dev.patch
@@ -0,0 +1,24 @@
+diff -ur calamares-3.2.7/src/modules/unpackfs/main.py
calamares-3.2.7-unpackfs-dev/src/modules/unpackfs/main.py
+--- calamares-3.2.7/src/modules/unpackfs/main.py 2019-04-27 20:12:03.000000000 +0200
++++ calamares-3.2.7-unpackfs-dev/src/modules/unpackfs/main.py 2019-05-06
00:00:55.302325577 +0200
+@@ -252,13 +252,19 @@
+ subprocess.check_call(["mount",
+ "--bind", entry.source,
+ imgmountdir])
+- else:
++ else if os.path.isfile(entry.source):
+ subprocess.check_call(["mount",
+ entry.source,
+ imgmountdir,
+ "-t", entry.sourcefs,
+ "-o", "loop"
+ ])
++ else: # entry.source is a device
++ subprocess.check_call(["mount",
++ entry.source,
++ imgmountdir,
++ "-t", entry.sourcefs
++ ])
+
+ def unpack_image(self, entry, imgmountdir):
+ """
diff --git a/calamares.spec b/calamares.spec
index c849218..0f88828 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -23,7 +23,7 @@
Name: calamares
Version: 3.2.7
-Release: 3%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c
-13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist}
+Release: 4%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c
-13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist}
Summary: Installer from a live CD/DVD/USB to disk
License: GPLv3+
@@ -52,6 +52,9 @@ Patch1: calamares-3.2.7-kdesu.patch
# fix finding Boost::Python3 on Fedora >= 30
Patch2: calamares-3.2.7-boost-python3.patch
+# unpackfs: do not use -o loop if the source is a device (fails on F29+)
+Patch3: calamares-3.2.7-unpackfs-dev.patch
+
# Calamares is only supported where live images (and GRUB) are. (#1171380)
# This list matches the livearches global from anaconda.spec
ExclusiveArch: %{ix86} x86_64
@@ -222,6 +225,7 @@ developing custom modules for Calamares.
rm -f src/modules/*/*.conf.default-settings
%patch1 -p1 -b .kdesu
%patch2 -p1 -b .boost-python3
+%patch3 -p1 -b .unpackfs-dev
%build
mkdir -p %{_target_platform}
@@ -369,6 +373,9 @@ EOF
%changelog
+* Sun May 05 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 3.2.7-4
+- unpackfs: do not use -o loop if the source is a device (fails on F29+)
+
* Sun May 05 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 3.2.7-3
- Add BuildRequires: parted-devel (used in welcome to check storage requirement)
commit 057e097ca0a1732aaef415333368c2130a69d8e7
Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org>
Date: Sun May 5 20:01:23 2019 +0200
Add BuildRequires: parted-devel (used in welcome to check storage requirement)
* Sun May 05 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 3.2.7-3
- Add BuildRequires: parted-devel (used in welcome to check storage requirement)
diff --git a/calamares.spec b/calamares.spec
index 158ffd8..c849218 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -23,7 +23,7 @@
Name: calamares
Version: 3.2.7
-Release: 2%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c
-13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist}
+Release: 3%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c
-13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist}
Summary: Installer from a live CD/DVD/USB to disk
License: GPLv3+
@@ -112,6 +112,7 @@ BuildRequires: boost-python3-devel >= 1.55.0
# Other libraries
BuildRequires: libpwquality-devel
BuildRequires: libxcrypt-devel
+BuildRequires: parted-devel
BuildRequires: yaml-cpp-devel >= 0.5.1
# for automatic branding setup
@@ -368,6 +369,9 @@ EOF
%changelog
+* Sun May 05 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 3.2.7-3
+- Add BuildRequires: parted-devel (used in welcome to check storage requirement)
+
* Sun May 05 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 3.2.7-2
- Fix finding Boost::Python3 on F30+
- Only BuildRequire libatasmart-devel and libblkid-devel on F29-
commit bfd07ae3e2bf600985083a9e6757af04dde5788f
Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org>
Date: Sun May 5 19:50:16 2019 +0200
Actually bump Release
diff --git a/calamares.spec b/calamares.spec
index 5b67a51..158ffd8 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -23,7 +23,7 @@
Name: calamares
Version: 3.2.7
-Release: 1%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c
-13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist}
+Release: 2%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c
-13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist}
Summary: Installer from a live CD/DVD/USB to disk
License: GPLv3+
commit 9d1fb4dc09096d3e7540c86ea3417d37c1e674e9
Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org>
Date: Sun May 5 19:48:34 2019 +0200
Only BuildRequire libatasmart-devel and libblkid-devel on F29-
diff --git a/calamares.spec b/calamares.spec
index 8a70166..5b67a51 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -17,6 +17,10 @@
%global webview_qtwebengine 1
%endif
+%if 0%{?fedora} > 29
+%global kpmcore4 1
+%endif
+
Name: calamares
Version: 3.2.7
Release: 1%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c
-13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist}
@@ -92,13 +96,13 @@ BuildRequires: kf5-kwidgetsaddons-devel
BuildRequires: kf5-plasma-devel
# KPMCore
+%if 0%{?kpmcore4}
+BuildRequires: kpmcore-devel >= 4.0
+%else
BuildRequires: kpmcore-devel >= 3.3
-# This one should definitely not be required anymore with kpmcore 4.0, it is not
-# used there anymore:
BuildRequires: libatasmart-devel
-# This one may or may not be still required with kpmcore 4.0, it should not be
-# in the public link interface:
BuildRequires: libblkid-devel
+%endif
# Python 3
BuildRequires: python3-devel >= 3.3
@@ -365,7 +369,8 @@ EOF
%changelog
* Sun May 05 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 3.2.7-2
-- Fix finding Boost::Python3 on Fedora >= 30
+- Fix finding Boost::Python3 on F30+
+- Only BuildRequire libatasmart-devel and libblkid-devel on F29-
* Sun May 05 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 3.2.7-1
- Update to 3.2.7 and update BuildRequires and Requires
commit 970a5d230c6086fd3ad74558c8de210b5c7397bd
Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org>
Date: Sun May 5 19:46:07 2019 +0200
Fix finding Boost::Python3 on Fedora >= 30
* Sun May 05 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 3.2.7-2
- Fix finding Boost::Python3 on Fedora >= 30
diff --git a/calamares-3.2.7-boost-python3.patch b/calamares-3.2.7-boost-python3.patch
new file mode 100644
index 0000000..5f4de2f
--- /dev/null
+++ b/calamares-3.2.7-boost-python3.patch
@@ -0,0 +1,26 @@
+diff -ur calamares-3.2.7/CMakeModules/BoostPython3.cmake
calamares-3.2.7-boost-python3/CMakeModules/BoostPython3.cmake
+--- calamares-3.2.7/CMakeModules/BoostPython3.cmake 2019-04-27 20:12:03.000000000 +0200
++++ calamares-3.2.7-boost-python3/CMakeModules/BoostPython3.cmake 2019-05-05
19:42:40.290272157 +0200
+@@ -15,6 +15,11 @@
+ # libboost_python-3.4.so
+ # depending on what python's targets you selected during install
+ #
++# On Fedora >= 30 instead, the boost-python3-devel provides boost library with a
++# name like:
++# libboost_python37.so
++# depending on what python's targets you selected during install
++#
+ # find_boost_python3() tries to find the package with different component
+ # names. By default it tries "python3", "python-py$suffix" and
+ # "python-$dotsuffix", where suffix is based on the `python_version`
argument.
+@@ -47,6 +52,10 @@
+ _find_boost_python3_int( ${boost_version} python-py${_fbp_python_short_version}
_fbp_found )
+
+ if (NOT _fbp_found)
++ _find_boost_python3_int( ${boost_version} python${_fbp_python_short_version}
_fbp_found )
++ endif()
++
++ if (NOT _fbp_found)
+ # The following loop changes the searched name for Gentoo based distributions
+ # turns "3.4.123abc" into "3.4"
+ string( REGEX REPLACE "([0-9]+)\\.([0-9]+)\\..*" "\\1.\\2"
_fbp_python_short_version ${python_version} )
diff --git a/calamares.spec b/calamares.spec
index fa6fcb4..8a70166 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -45,6 +45,9 @@ Patch0: calamares-3.2.7-default-settings.patch
# use kdesu instead of pkexec (works around #1171779)
Patch1: calamares-3.2.7-kdesu.patch
+# fix finding Boost::Python3 on Fedora >= 30
+Patch2: calamares-3.2.7-boost-python3.patch
+
# Calamares is only supported where live images (and GRUB) are. (#1171380)
# This list matches the livearches global from anaconda.spec
ExclusiveArch: %{ix86} x86_64
@@ -213,6 +216,7 @@ 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 .boost-python3
%build
mkdir -p %{_target_platform}
@@ -360,6 +364,9 @@ EOF
%changelog
+* Sun May 05 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 3.2.7-2
+- Fix finding Boost::Python3 on Fedora >= 30
+
* Sun May 05 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 3.2.7-1
- Update to 3.2.7 and update BuildRequires and Requires
- Add plasmalnf subpackage for the new plasmalnf module requiring plasma-desktop
commit 699951531edf58924b8e11d7b333bbad9ce9c68a
Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org>
Date: Sun May 5 19:02:54 2019 +0200
Readd BR libatasmart-devel libblkid-devel for now
These have no business being in the public link interface of KPMCore,
especially without a Requires in kpmcore-devel, and libatasmart is no
longer used in KPMCore 4.0.
diff --git a/calamares.spec b/calamares.spec
index a8c8693..fa6fcb4 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -88,13 +88,21 @@ BuildRequires: kf5-kservice-devel
BuildRequires: kf5-kwidgetsaddons-devel
BuildRequires: kf5-plasma-devel
+# KPMCore
+BuildRequires: kpmcore-devel >= 3.3
+# This one should definitely not be required anymore with kpmcore 4.0, it is not
+# used there anymore:
+BuildRequires: libatasmart-devel
+# This one may or may not be still required with kpmcore 4.0, it should not be
+# in the public link interface:
+BuildRequires: libblkid-devel
+
# Python 3
BuildRequires: python3-devel >= 3.3
BuildRequires: boost-python3-devel >= 1.55.0
%global __python %{__python3}
# Other libraries
-BuildRequires: kpmcore-devel >= 3.3
BuildRequires: libpwquality-devel
BuildRequires: libxcrypt-devel
BuildRequires: yaml-cpp-devel >= 0.5.1
commit 5ffac0a78261fc55101be8cdcb1cafc5f2cab372
Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org>
Date: Sun May 5 18:52:38 2019 +0200
Fix weekday in 2017-12-26 changelog entry
diff --git a/calamares.spec b/calamares.spec
index d20783c..a8c8693 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -397,7 +397,7 @@ EOF
* Sun Jan 07 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 3.1.8-4
- Remove obsolete scriptlets
-* Mon Dec 26 2017 Mattia Verga <mattia.verga(a)email.it> - 3.1.8-3
+* Tue Dec 26 2017 Mattia Verga <mattia.verga(a)email.it> - 3.1.8-3
- Rebuild for libkpmcore soname bump in rawhide
* Sun Dec 03 2017 Mattia Verga <mattia.verga(a)email.it> - 3.1.8-2
commit eaef09ddd033f17231f7dcacb20b1a8128502d8b
Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org>
Date: Sun May 5 18:51:44 2019 +0200
Fix BuildRequires package names
diff --git a/calamares.spec b/calamares.spec
index e7f58db..d20783c 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -63,9 +63,9 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
# Qt 5
+BuildRequires: qt5-linguist >= 5.10
BuildRequires: qt5-qtbase-devel >= 5.10
BuildRequires: qt5-qtdeclarative-devel >= 5.10
-BuildRequires: qt5-qtlinguist >= 5.10
BuildRequires: qt5-qtsvg-devel >= 5.10
%if 0%{?webview_qtwebengine}
BuildRequires: qt5-qtwebengine-devel >= 5.10
@@ -85,7 +85,7 @@ BuildRequires: kf5-ki18n-devel
BuildRequires: kf5-kpackage-devel
BuildRequires: kf5-kparts-devel
BuildRequires: kf5-kservice-devel
-BuildRequires: kf5-kwidgetaddons-devel
+BuildRequires: kf5-kwidgetsaddons-devel
BuildRequires: kf5-plasma-devel
# Python 3
commit a41aa30005421d49419f655ba721bd17d1c9c9c0
Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org>
Date: Sun May 5 18:44:25 2019 +0200
Update to 3.2.7, disable QtWebEngine, rebase patches
* Sun May 05 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 3.2.7-1
- Update to 3.2.7 and update BuildRequires and Requires
- Add plasmalnf subpackage for the new plasmalnf module requiring plasma-desktop
- Switch webview from QtWebEngine to QtWebKit to work around upstream issue 1051
- Rebase default-settings patch and update some settings:
- enable INSTALL_CONFIG by default (we patch it in place, so install it)
- disable plymouthcfg by default (now only needed to change the default theme)
- bootloader.conf: enable sb-shim (UEFI "Secure Boot" support)
- plasmalnf.conf (note: module disabled by default): fix default liveuser
- plasmalnf.conf (note: module disabled by default): default: show all themes
- tracking.conf (note: module disabled by default): default tracking to none
- users.conf: default to honoring the default shell from /etc/default/useradd
- welcome.conf: use https for internetCheckUrl (catches more captive portals)
- Rebase kdesu patch
diff --git a/.gitignore b/.gitignore
index 3b17288..0b4fab2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@
/calamares-3.1.6.tar.gz
/calamares-3.1.7.tar.gz
/calamares-3.1.8.tar.gz
+/calamares-3.2.7.tar.gz
diff --git a/calamares-3.1.5-kdesu.patch b/calamares-3.1.5-kdesu.patch
deleted file mode 100644
index c18fb9f..0000000
--- a/calamares-3.1.5-kdesu.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -Nur calamares-3.1.5/calamares.desktop calamares-3.1.5-kdesu/calamares.desktop
---- calamares-3.1.5/calamares.desktop 2017-09-25 17:13:33.000000000 +0200
-+++ calamares-3.1.5-kdesu/calamares.desktop 2017-09-27 03:30:14.647027258 +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.1.5/CMakeLists.txt calamares-3.1.5-kdesu/CMakeLists.txt
---- calamares-3.1.5/CMakeLists.txt 2017-09-25 17:13:33.000000000 +0200
-+++ calamares-3.1.5-kdesu/CMakeLists.txt 2017-09-27 03:30:15.121020240 +0200
-@@ -110,7 +110,6 @@
-
- find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Core Gui Widgets LinguistTools Svg Quick
QuickWidgets )
- find_package( YAMLCPP 0.5.1 REQUIRED )
--find_package( PolkitQt5-1 REQUIRED )
-
- option( INSTALL_CONFIG "Install configuration files" ON )
- option( WITH_PYTHON "Enable Python modules API (requires Boost.Python)." ON )
-@@ -332,13 +331,6 @@
-
- install(
- FILES
-- com.github.calamares.calamares.policy
-- DESTINATION
-- "${POLKITQT-1_POLICY_FILES_INSTALL_DIR}"
--)
--
--install(
-- FILES
- calamares.desktop
- DESTINATION
- ${CMAKE_INSTALL_DATADIR}/applications
-diff -Nur calamares-3.1.5/com.github.calamares.calamares.policy
calamares-3.1.5-kdesu/com.github.calamares.calamares.policy
---- calamares-3.1.5/com.github.calamares.calamares.policy 2017-09-25 17:13:33.000000000
+0200
-+++ calamares-3.1.5-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.1.8-default-settings.patch
b/calamares-3.1.8-default-settings.patch
deleted file mode 100644
index 3cc0875..0000000
--- a/calamares-3.1.8-default-settings.patch
+++ /dev/null
@@ -1,243 +0,0 @@
-diff -ur calamares-3.1.8/settings.conf calamares-3.1.8-default-settings/settings.conf
---- calamares-3.1.8/settings.conf 2017-11-14 16:18:58.000000000 +0100
-+++ calamares-3.1.8-default-settings/settings.conf 2017-11-14 16:53:50.562464805 +0100
-@@ -80,21 +80,22 @@
- - locale
- - keyboard
- - localecfg
--# - luksbootkeyfile
-+ - luksbootkeyfile
- # - luksopenswaphookcfg
--# - dracutlukscfg
--# - plymouthcfg
-- - initcpiocfg
-- - initcpio
-+ - dracutlukscfg
-+ - plymouthcfg
-+# - initcpiocfg
-+# - initcpio
- - users
- - displaymanager
- - networkcfg
- - hwclock
- - services
--# - dracut
-- - initramfs
--# - grubcfg
-+ - dracut
-+# - initramfs
-+ - grubcfg
- - bootloader
-+ - packages
- - umount
- - show:
- # - webview@owncloud
-@@ -109,7 +110,7 @@
- # Only the name of the branding component (directory) should be specified 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 false, no prompt
-diff -ur calamares-3.1.8/src/modules/bootloader/bootloader.conf
calamares-3.1.8-default-settings/src/modules/bootloader/bootloader.conf
---- calamares-3.1.8/src/modules/bootloader/bootloader.conf 2017-11-14 16:18:58.000000000
+0100
-+++ calamares-3.1.8-default-settings/src/modules/bootloader/bootloader.conf 2017-11-14
16:53:50.641463674 +0100
-@@ -17,11 +17,13 @@
-
- # GRUB 2 binary names and boot directory
- # Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.
--grubInstall: "grub-install"
--grubMkconfig: "grub-mkconfig"
--grubCfg: "/boot/grub/grub.cfg"
-+grubInstall: "grub2-install"
-+grubMkconfig: "grub2-mkconfig"
-+grubCfg: "/boot/grub2/grub.cfg"
- # Optionally set the --bootloader-id to use for EFI. If not set, this defaults
- # to the bootloaderEntryName from branding.desc with problematic characters
- # replaced. If an efiBootloaderId is specified here, it is taken to already be a
- # valid directory name, so no such postprocessing is done in this case.
--# 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"
-diff -ur calamares-3.1.8/src/modules/keyboard/keyboard.conf
calamares-3.1.8-default-settings/src/modules/keyboard/keyboard.conf
---- calamares-3.1.8/src/modules/keyboard/keyboard.conf 2017-11-14 16:18:58.000000000
+0100
-+++ calamares-3.1.8-default-settings/src/modules/keyboard/keyboard.conf 2017-11-14
16:53:50.721462529 +0100
-@@ -11,4 +11,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.1.8/src/modules/license/license.conf
calamares-3.1.8-default-settings/src/modules/license/license.conf
---- calamares-3.1.8/src/modules/license/license.conf 2017-11-14 16:18:58.000000000 +0100
-+++ calamares-3.1.8-default-settings/src/modules/license/license.conf 2017-11-14
16:53:50.721462529 +0100
-@@ -3,21 +3,9 @@
- ---
- # YAML: list of maps.
- entries:
--- id: nvidia # Entry identifier, must be unique. Not user visible. YAML:
string.
-- name: Nvidia # Pretty name for the software product, user visible and
untranslatable. YAML: string.
-- vendor: Nvidia Corporation # Pretty name for the software vendor, user visible and
untranslatable. YAML: string, optional, default is empty.
-+- id: evil # Entry identifier, must be unique. Not user visible. YAML:
string.
-+ name: Evil # Pretty name for the software product, user visible and
untranslatable. YAML: string.
-+ vendor: Evil Corporation # Pretty name for the software vendor, user visible and
untranslatable. YAML: string, optional, default is empty.
- type: driver # Package type for presentation, not user visible but affects
user visible strings. YAML: string, allowed values: driver, gpudriver, browserplugin,
codec, package, software; optional, default is software.
-- url:
http://developer.download.nvidia.com/cg/Cg_3.0/license.pdf # Url of license
text to display in a web view. YAML: string.
-+ url:
http://www.example.com/evil_666.0/license.pdf # Url of license text to
display in a web view. YAML: string.
- required: false # If set to true, the user cannot proceed without accepting this
license. YAML: boolean, optional, default is 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
-diff -ur calamares-3.1.8/src/modules/netinstall/netinstall.conf
calamares-3.1.8-default-settings/src/modules/netinstall/netinstall.conf
---- calamares-3.1.8/src/modules/netinstall/netinstall.conf 2017-11-14 16:18:58.000000000
+0100
-+++ calamares-3.1.8-default-settings/src/modules/netinstall/netinstall.conf 2017-11-14
16:53:50.787461586 +0100
-@@ -1,7 +1,10 @@
- ---
- # This is the URL that is retrieved to get the netinstall groups-and-packages
- # data (which should be in the format described in netinstall.yaml).
--groupsUrl:
http://chakraos.org/netinstall.php
-+# 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
-+#groupsUrl:
http://example.com/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.1.8/src/modules/packages/packages.conf
calamares-3.1.8-default-settings/src/modules/packages/packages.conf
---- calamares-3.1.8/src/modules/packages/packages.conf 2017-11-14 16:18:58.000000000
+0100
-+++ calamares-3.1.8-default-settings/src/modules/packages/packages.conf 2017-11-14
16:53:50.788461571 +0100
-@@ -12,12 +12,12 @@
- # - entropy - Sabayon package manager
- # - dummy - Dummy manager, only logs
- #
--backend: dummy
-+backend: dnf
-
- # If set to true, a package-manager specific update procedure
- # is run first (only if there is internet) to update the list
- # of packages and dependencies.
--update_db: true
-+update_db: false
-
- #
- # List of maps with package operations such as install or remove.
-@@ -112,11 +112,5 @@
- # of packages, this can lead to a considerable time savings.
- #
- operations:
-- - install:
-- - vi
-- - wget
-- - binutils
-- - remove:
-- - vi
-- - wget
-- - binutils
-+ - try_remove:
-+ - calamares
-diff -ur calamares-3.1.8/src/modules/partition/partition.conf
calamares-3.1.8-default-settings/src/modules/partition/partition.conf
---- calamares-3.1.8/src/modules/partition/partition.conf 2017-11-14 16:18:58.000000000
+0100
-+++ calamares-3.1.8-default-settings/src/modules/partition/partition.conf 2017-11-14
16:53:50.862460511 +0100
-@@ -21,7 +21,7 @@
- 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.1.8/src/modules/services/services.conf
calamares-3.1.8-default-settings/src/modules/services/services.conf
---- calamares-3.1.8/src/modules/services/services.conf 2017-11-14 16:18:58.000000000
+0100
-+++ calamares-3.1.8-default-settings/src/modules/services/services.conf 2017-11-14
16:53:50.863460497 +0100
-@@ -12,9 +12,4 @@
- - name: "graphical"
- mandatory: true
-
--disable:
-- - name: "pacman-init"
-- mandatory: false
--
--# Example to express an empty list:
--# disable: []
-+disable: []
-diff -ur calamares-3.1.8/src/modules/umount/umount.conf
calamares-3.1.8-default-settings/src/modules/umount/umount.conf
---- calamares-3.1.8/src/modules/umount/umount.conf 2017-11-14 16:18:58.000000000 +0100
-+++ calamares-3.1.8-default-settings/src/modules/umount/umount.conf 2017-11-14
16:53:50.863460497 +0100
-@@ -1,9 +1,6 @@
- ---
--#srcLog: "/path/to/installation.log"
--#destLog: "/var/log/installation.log"
--# example when using the Calamares created log:
--#srcLog: "/root/.cache/Calamares/Calamares/Calamares.log"
--#destLog: "/var/log/Calamares.log"
-+srcLog: "/root/.cache/Calamares/Calamares/Calamares.log"
-+destLog: "/var/log/calamares.log"
- # example when creating with a sudo calamares -d log:
--#srcLog: "/home/live/installation.log"
-+#srcLog: "/home/liveuser/installation.log"
- #destLog: "/var/log/installation.log"
-diff -ur calamares-3.1.8/src/modules/unpackfs/unpackfs.conf
calamares-3.1.8-default-settings/src/modules/unpackfs/unpackfs.conf
---- calamares-3.1.8/src/modules/unpackfs/unpackfs.conf 2017-11-14 16:18:58.000000000
+0100
-+++ calamares-3.1.8-default-settings/src/modules/unpackfs/unpackfs.conf 2017-11-14
16:53:50.863460497 +0100
-@@ -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.1.8/src/modules/users/users.conf
calamares-3.1.8-default-settings/src/modules/users/users.conf
---- calamares-3.1.8/src/modules/users/users.conf 2017-11-14 16:18:58.000000000 +0100
-+++ calamares-3.1.8-default-settings/src/modules/users/users.conf 2017-11-14
16:53:50.863460497 +0100
-@@ -15,15 +15,15 @@
- - users
- - lp
- - video
-- - network
-- - storage
-+ - dialout
- - wheel
- - audio
- autologinGroup: autologin
--doAutologin: true
-+doAutologin: false
-
--# remove the following line to avoid creating /etc/sudoers.d/10-installer
--sudoersGroup: wheel
-+# this is already the default in /etc/sudoers, so do NOT set it here, as that
-+# would create a confusing /etc/sudoers.d/10-installer file that sets it again
-+# sudoersGroup: wheel
-
- setRootPassword: true
- doReusePassword: true
-diff -ur calamares-3.1.8/src/modules/welcome/welcome.conf
calamares-3.1.8-default-settings/src/modules/welcome/welcome.conf
---- calamares-3.1.8/src/modules/welcome/welcome.conf 2017-11-14 16:18:58.000000000 +0100
-+++ calamares-3.1.8-default-settings/src/modules/welcome/welcome.conf 2017-11-14
16:53:50.864460483 +0100
-@@ -6,7 +6,7 @@
- requirements:
- requiredStorage: 5.5
- requiredRam: 1.0
-- internetCheckUrl:
http://google.com
-+ internetCheckUrl:
http://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
diff --git a/calamares-3.1.8-fix-version.patch b/calamares-3.1.8-fix-version.patch
deleted file mode 100644
index 40bb192..0000000
--- a/calamares-3.1.8-fix-version.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 848d532a5800de40ca398a6d06cb91edef12c92b Mon Sep 17 00:00:00 2001
-Message-Id:
<848d532a5800de40ca398a6d06cb91edef12c92b.1510674994.git.kevin.kofler(a)chello.at>
-From: Adriaan de Groot <groot(a)kde.org>
-Date: Tue, 14 Nov 2017 10:18:58 -0500
-Subject: [PATCH] CMake: drop -rc status
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9913436..7c0af9c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -167,7 +167,7 @@ set( CALAMARES_TRANSLATION_LANGUAGES ar ast bg ca cs_CZ da de el en
en_GB es_MX
- set( CALAMARES_VERSION_MAJOR 3 )
- set( CALAMARES_VERSION_MINOR 1 )
- set( CALAMARES_VERSION_PATCH 8 )
--set( CALAMARES_VERSION_RC 1 )
-+set( CALAMARES_VERSION_RC 0 )
-
- set( CALAMARES_VERSION
${CALAMARES_VERSION_MAJOR}.${CALAMARES_VERSION_MINOR}.${CALAMARES_VERSION_PATCH} )
- set( CALAMARES_VERSION_SHORT "${CALAMARES_VERSION}" )
---
-2.9.5
-
diff --git a/calamares-3.2.7-default-settings.patch
b/calamares-3.2.7-default-settings.patch
new file mode 100644
index 0000000..5b6d4d5
--- /dev/null
+++ b/calamares-3.2.7-default-settings.patch
@@ -0,0 +1,335 @@
+diff -ur calamares-3.2.7/CMakeLists.txt calamares-3.2.7-default-settings/CMakeLists.txt
+--- calamares-3.2.7/CMakeLists.txt 2019-04-27 20:12:03.000000000 +0200
++++ calamares-3.2.7-default-settings/CMakeLists.txt 2019-05-05 13:36:50.504240246 +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.7/settings.conf calamares-3.2.7-default-settings/settings.conf
+--- calamares-3.2.7/settings.conf 2019-04-27 20:12:03.000000000 +0200
++++ calamares-3.2.7-default-settings/settings.conf 2019-05-05 15:49:51.132001547 +0200
+@@ -92,21 +92,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
+@@ -124,7 +125,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
+diff -ur calamares-3.2.7/src/modules/bootloader/bootloader.conf
calamares-3.2.7-default-settings/src/modules/bootloader/bootloader.conf
+--- calamares-3.2.7/src/modules/bootloader/bootloader.conf 2019-04-27 20:12:03.000000000
+0200
++++ calamares-3.2.7-default-settings/src/modules/bootloader/bootloader.conf 2019-05-05
14:59:12.992331162 +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.7/src/modules/keyboard/keyboard.conf
calamares-3.2.7-default-settings/src/modules/keyboard/keyboard.conf
+--- calamares-3.2.7/src/modules/keyboard/keyboard.conf 2019-04-27 20:12:03.000000000
+0200
++++ calamares-3.2.7-default-settings/src/modules/keyboard/keyboard.conf 2019-05-05
13:38:14.200062500 +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.7/src/modules/license/license.conf
calamares-3.2.7-default-settings/src/modules/license/license.conf
+--- calamares-3.2.7/src/modules/license/license.conf 2019-04-27 20:12:03.000000000 +0200
++++ calamares-3.2.7-default-settings/src/modules/license/license.conf 2019-05-05
17:44:32.369155950 +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.7/src/modules/netinstall/netinstall.conf
calamares-3.2.7-default-settings/src/modules/netinstall/netinstall.conf
+--- calamares-3.2.7/src/modules/netinstall/netinstall.conf 2019-04-27 20:12:03.000000000
+0200
++++ calamares-3.2.7-default-settings/src/modules/netinstall/netinstall.conf 2019-05-05
15:19:42.480153258 +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.7/src/modules/packages/packages.conf
calamares-3.2.7-default-settings/src/modules/packages/packages.conf
+--- calamares-3.2.7/src/modules/packages/packages.conf 2019-04-27 20:12:03.000000000
+0200
++++ calamares-3.2.7-default-settings/src/modules/packages/packages.conf 2019-05-05
15:29:59.264557922 +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.7/src/modules/partition/partition.conf
calamares-3.2.7-default-settings/src/modules/partition/partition.conf
+--- calamares-3.2.7/src/modules/partition/partition.conf 2019-04-27 20:12:03.000000000
+0200
++++ calamares-3.2.7-default-settings/src/modules/partition/partition.conf 2019-05-05
13:38:14.201062486 +0200
+@@ -40,7 +40,7 @@
+ # 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.7/src/modules/plasmalnf/plasmalnf.conf
calamares-3.2.7-default-settings/src/modules/plasmalnf/plasmalnf.conf
+--- calamares-3.2.7/src/modules/plasmalnf/plasmalnf.conf 2019-04-27 20:12:03.000000000
+0200
++++ calamares-3.2.7-default-settings/src/modules/plasmalnf/plasmalnf.conf 2019-05-05
18:40:21.937760778 +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.7/src/modules/tracking/tracking.conf
calamares-3.2.7-default-settings/src/modules/tracking/tracking.conf
+--- calamares-3.2.7/src/modules/tracking/tracking.conf 2019-04-27 20:12:03.000000000
+0200
++++ calamares-3.2.7-default-settings/src/modules/tracking/tracking.conf 2019-05-05
17:18:29.470734115 +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.7/src/modules/umount/umount.conf
calamares-3.2.7-default-settings/src/modules/umount/umount.conf
+--- calamares-3.2.7/src/modules/umount/umount.conf 2019-04-27 20:12:03.000000000 +0200
++++ calamares-3.2.7-default-settings/src/modules/umount/umount.conf 2019-05-05
17:20:19.852211125 +0200
+@@ -35,8 +35,8 @@
+ ---
+ # example when using the normal Calamares log:
+ srcLog: "/root/.cache/Calamares/Calamares/Calamares.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.7/src/modules/unpackfs/unpackfs.conf
calamares-3.2.7-default-settings/src/modules/unpackfs/unpackfs.conf
+--- calamares-3.2.7/src/modules/unpackfs/unpackfs.conf 2019-04-27 20:12:03.000000000
+0200
++++ calamares-3.2.7-default-settings/src/modules/unpackfs/unpackfs.conf 2019-05-05
13:38:42.980657503 +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.7/src/modules/users/users.conf
calamares-3.2.7-default-settings/src/modules/users/users.conf
+--- calamares-3.2.7/src/modules/users/users.conf 2019-04-27 20:12:03.000000000 +0200
++++ calamares-3.2.7-default-settings/src/modules/users/users.conf 2019-05-05
17:34:39.281336143 +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
+@@ -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.7/src/modules/welcome/welcome.conf
calamares-3.2.7-default-settings/src/modules/welcome/welcome.conf
+--- calamares-3.2.7/src/modules/welcome/welcome.conf 2019-04-27 20:12:03.000000000 +0200
++++ calamares-3.2.7-default-settings/src/modules/welcome/welcome.conf 2019-05-05
17:40:52.754174665 +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,6 +44,6 @@
+ # If any of these conditions are not met, the user cannot
+ # continue past the welcome page.
+ required:
+- # - storage
++ - storage
+ - ram
+- # - root
++ - root
diff --git a/calamares-3.2.7-kdesu.patch b/calamares-3.2.7-kdesu.patch
new file mode 100644
index 0000000..fec2800
--- /dev/null
+++ b/calamares-3.2.7-kdesu.patch
@@ -0,0 +1,97 @@
+diff -Nur calamares-3.2.7/calamares.desktop calamares-3.2.7-kdesu/calamares.desktop
+--- calamares-3.2.7/calamares.desktop 2019-04-27 20:12:03.000000000 +0200
++++ calamares-3.2.7-kdesu/calamares.desktop 2019-05-05 13:30:15.193847592 +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.7/calamares.desktop.in
calamares-3.2.7-kdesu/calamares.desktop.in
+--- calamares-3.2.7/calamares.desktop.in 2019-04-27 20:12:03.000000000 +0200
++++ calamares-3.2.7-kdesu/calamares.desktop.in 2019-05-05 13:31:41.331620769 +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.7/CMakeLists.txt calamares-3.2.7-kdesu/CMakeLists.txt
+--- calamares-3.2.7/CMakeLists.txt 2019-04-27 20:12:03.000000000 +0200
++++ calamares-3.2.7-kdesu/CMakeLists.txt 2019-05-05 13:33:35.673992717 +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)." ON )
+@@ -244,18 +243,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
+@@ -534,15 +521,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.7/com.github.calamares.calamares.policy
calamares-3.2.7-kdesu/com.github.calamares.calamares.policy
+--- calamares-3.2.7/com.github.calamares.calamares.policy 2019-04-27 20:12:03.000000000
+0200
++++ calamares-3.2.7-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.spec b/calamares.spec
index afdb869..e7f58db 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -7,15 +7,19 @@
#global prerelease beta2
-%ifarch %{?qt5_qtwebengine_arches}%{!?qt5_qtwebengine_arches:%{ix86} x86_64}
+# 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
+%if 0
+#ifarch %{?qt5_qtwebengine_arches}%{!?qt5_qtwebengine_arches:%{ix86} x86_64}
# use QtWebEngine instead of QtWebKit for the optional webview module
# only possible on qt5_qtwebengine_arches, which for livearches means only x86
%global webview_qtwebengine 1
%endif
Name: calamares
-Version: 3.1.8
-Release: 13%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c
-13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist}
+Version: 3.2.7
+Release: 1%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c
-13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist}
Summary: Installer from a live CD/DVD/USB to disk
License: GPLv3+
@@ -36,57 +40,64 @@ Source4: calamares-auto_de.ts
Source5: calamares-auto_it.ts
# adjust some default settings (default shipped .conf files)
-Patch0: calamares-3.1.8-default-settings.patch
+Patch0: calamares-3.2.7-default-settings.patch
# use kdesu instead of pkexec (works around #1171779)
-Patch1: calamares-3.1.5-kdesu.patch
+Patch1: calamares-3.2.7-kdesu.patch
# Calamares is only supported where live images (and GRUB) are. (#1171380)
# This list matches the livearches global from anaconda.spec
ExclusiveArch: %{ix86} x86_64
+# Macros
BuildRequires: kf5-rpm-macros
-BuildRequires: gcc-c++ >= 4.9.0
+# Compilation tools
BuildRequires: cmake >= 3.2
-BuildRequires: extra-cmake-modules >= 0.0.13
+BuildRequires: extra-cmake-modules >= 5.18
+BuildRequires: gcc-c++ >= 4.9.0
+BuildRequires: pkgconfig
+
+# Other build-time tools
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
-BuildRequires: qt5-qtbase-devel >= 5.6
-BuildRequires: qt5-qtdeclarative-devel >= 5.6
-BuildRequires: qt5-qtsvg-devel >= 5.6
-BuildRequires: qt5-qttools-devel >= 5.6
+# Qt 5
+BuildRequires: qt5-qtbase-devel >= 5.10
+BuildRequires: qt5-qtdeclarative-devel >= 5.10
+BuildRequires: qt5-qtlinguist >= 5.10
+BuildRequires: qt5-qtsvg-devel >= 5.10
%if 0%{?webview_qtwebengine}
-BuildRequires: qt5-qtwebengine-devel >= 5.6
+BuildRequires: qt5-qtwebengine-devel >= 5.10
%global webview_force_webkit OFF
%global webview_engine QtWebEngine
%else
-BuildRequires: qt5-qtwebkit-devel >= 5.6
+BuildRequires: qt5-qtwebkit-devel >= 5.212
%global webview_force_webkit ON
%global webview_engine Qt5WebKit
%endif
+# KF5
BuildRequires: kf5-kconfig-devel
BuildRequires: kf5-kcoreaddons-devel
+BuildRequires: kf5-kcrash-devel
BuildRequires: kf5-ki18n-devel
-BuildRequires: kf5-kiconthemes-devel
-BuildRequires: kf5-kio-devel
+BuildRequires: kf5-kpackage-devel
BuildRequires: kf5-kparts-devel
BuildRequires: kf5-kservice-devel
+BuildRequires: kf5-kwidgetaddons-devel
+BuildRequires: kf5-plasma-devel
-BuildRequires: pkgconfig
-BuildRequires: gettext
-
+# Python 3
BuildRequires: python3-devel >= 3.3
-BuildRequires: boost-python3-devel >= 1.54.0
+BuildRequires: boost-python3-devel >= 1.55.0
%global __python %{__python3}
+# Other libraries
+BuildRequires: kpmcore-devel >= 3.3
+BuildRequires: libpwquality-devel
+BuildRequires: libxcrypt-devel
BuildRequires: yaml-cpp-devel >= 0.5.1
-BuildRequires: libblkid-devel
-BuildRequires: libatasmart-devel
-BuildRequires: parted-devel
-BuildRequires: kpmcore-devel >= 3.0.3
-
-BuildRequires: desktop-file-utils
# for automatic branding setup
Requires(post): system-release
@@ -95,7 +106,6 @@ Requires: system-logos
Requires: coreutils
Requires: util-linux
-Requires: dmidecode
Requires: upower
Requires: NetworkManager
Requires: dracut
@@ -118,7 +128,6 @@ Requires: grub2-efi-modules
%endif
Requires: console-setup
Requires: xorg-x11-xkb-utils
-Requires: NetworkManager
Requires: os-prober
Requires: e2fsprogs
Requires: dosfstools
@@ -160,6 +169,17 @@ Optional interactiveterminal module for the Calamares installer,
based on the
KonsolePart (from Konsole 5)
+%package plasmalnf
+Summary: Calamares plasmalnf module
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: plasma-desktop
+
+%description plasmalnf
+Optional plasmalnf module for the Calamares installer, based on the KDE Plasma
+Desktop Workspace and its KDE Frameworks (KConfig, KPackage, Plasma)
+
+
%package webview
Summary: Calamares webview module
Requires: %{name} = %{version}-%{release}
@@ -189,7 +209,7 @@ rm -f src/modules/*/*.conf.default-settings
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
-%{cmake_kf5} -DWEBVIEW_FORCE_WEBKIT:BOOL="%{webview_force_webkit}"
-DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" ..
+%{cmake_kf5} -DBUILD_TESTING:BOOL=OFF -DWITH_PYTHONQT:BOOL=OFF
-DWEBVIEW_FORCE_WEBKIT:BOOL="%{webview_force_webkit}"
-DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" ..
popd
make %{?_smp_mflags} -C %{_target_platform}
@@ -294,6 +314,7 @@ EOF
%{_datadir}/calamares/branding/auto/lang/
%{_datadir}/calamares/modules/
%exclude %{_datadir}/calamares/modules/interactiveterminal.conf
+%exclude %{_datadir}/calamares/modules/plasmalnf.conf
%exclude %{_datadir}/calamares/modules/webview.conf
%{_datadir}/calamares/qml/
%{_datadir}/applications/calamares.desktop
@@ -308,12 +329,17 @@ EOF
%{_libdir}/libcalamaresui.so.*
%{_libdir}/calamares/
%exclude %{_libdir}/calamares/modules/interactiveterminal/
+%exclude %{_libdir}/calamares/modules/plasmalnf/
%exclude %{_libdir}/calamares/modules/webview/
%files interactiveterminal
%{_datadir}/calamares/modules/interactiveterminal.conf
%{_libdir}/calamares/modules/interactiveterminal/
+%files plasmalnf
+%{_datadir}/calamares/modules/plasmalnf.conf
+%{_libdir}/calamares/modules/plasmalnf/
+
%files webview
%{_datadir}/calamares/modules/webview.conf
%{_libdir}/calamares/modules/webview/
@@ -326,6 +352,21 @@ EOF
%changelog
+* Sun May 05 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 3.2.7-1
+- Update to 3.2.7 and update BuildRequires and Requires
+- Add plasmalnf subpackage for the new plasmalnf module requiring plasma-desktop
+- Switch webview from QtWebEngine to QtWebKit to work around upstream issue 1051
+- Rebase default-settings patch and update some settings:
+ - enable INSTALL_CONFIG by default (we patch it in place, so install it)
+ - disable plymouthcfg by default (now only needed to change the default theme)
+ - bootloader.conf: enable sb-shim (UEFI "Secure Boot" support)
+ - plasmalnf.conf (note: module disabled by default): fix default liveuser
+ - plasmalnf.conf (note: module disabled by default): default: show all themes
+ - tracking.conf (note: module disabled by default): default tracking to none
+ - users.conf: default to honoring the default shell from /etc/default/useradd
+ - welcome.conf: use https for internetCheckUrl (catches more captive portals)
+- Rebase kdesu patch
+
* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1.8-13
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index 0cb03e5..03b2364 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (calamares-3.1.8.tar.gz) =
f5fe3e92357d2f7492298b26826da420862438e55f91be6f8d9414d332c2f4b74d382d1c128d78e453609a9a2bc79b423c5e331a295479d169ed76a7028f0375
+SHA512 (calamares-3.2.7.tar.gz) =
b7b8b54254f629056b3b074b47275752672046342e19db876a9807108bf0b66481fec1db2225ddea2f7c0cd1bfe83901e5cea5c3e8fe907bef1bf6a8ba890d60
commit 8f5917b0f065059041e389ac592328fc08a0aedc
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jan 31 15:11:15 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/calamares.spec b/calamares.spec
index 3523433..afdb869 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -15,7 +15,7 @@
Name: calamares
Version: 3.1.8
-Release: 12%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c
-13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist}
+Release: 13%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c
-13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist}
Summary: Installer from a live CD/DVD/USB to disk
License: GPLv3+
@@ -326,6 +326,9 @@ EOF
%changelog
+* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1.8-13
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Thu Jan 24 2019 Jonathan Wakely <jwakely(a)redhat.com> - 3.1.8-12
- Rebuilt for Boost 1.69
commit 9a318aee6b2940dcfd493fd23086d681d642fac8
Author: Jonathan Wakely <jwakely(a)redhat.com>
Date: Thu Jan 24 21:43:54 2019 +0000
Rebuilt for Boost 1.69
diff --git a/calamares.spec b/calamares.spec
index 8ad2c1a..3523433 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -15,7 +15,7 @@
Name: calamares
Version: 3.1.8
-Release: 11%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c
-13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist}
+Release: 12%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c
-13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist}
Summary: Installer from a live CD/DVD/USB to disk
License: GPLv3+
@@ -326,6 +326,9 @@ EOF
%changelog
+* Thu Jan 24 2019 Jonathan Wakely <jwakely(a)redhat.com> - 3.1.8-12
+- Rebuilt for Boost 1.69
+
* Mon Jan 14 2019 Bjrn Esser <besser82(a)fedoraproject.org> - 3.1.8-11
- Rebuilt for libcrypt.so.2 (#1666033)
commit 209530f34ece783cb43bddab22f6b8d9e02c9cb3
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Tue Jan 22 18:38:35 2019 +0100
Remove obsolete ldconfig scriptlets
References:
https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/calamares.spec b/calamares.spec
index 1454948..8ad2c1a 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -301,8 +301,7 @@ EOF
%{_mandir}/man8/calamares.8*
%{_sysconfdir}/calamares/
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%ldconfig_scriptlets libs
%files libs
%{_libdir}/libcalamares.so.*
commit 910394b57d259c46a717d22e1d9b2cd822a4d637
Author: Bjrn Esser <besser82(a)fedoraproject.org>
Date: Mon Jan 14 18:56:58 2019 +0100
Rebuilt for libcrypt.so.2 (#1666033)
diff --git a/calamares.spec b/calamares.spec
index 3148ecc..1454948 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -15,7 +15,7 @@
Name: calamares
Version: 3.1.8
-Release: 10%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c
-13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist}
+Release: 11%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c
-13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist}
Summary: Installer from a live CD/DVD/USB to disk
License: GPLv3+
@@ -327,6 +327,9 @@ EOF
%changelog
+* Mon Jan 14 2019 Bjrn Esser <besser82(a)fedoraproject.org> - 3.1.8-11
+- Rebuilt for libcrypt.so.2 (#1666033)
+
* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1.8-10
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
commit 49878c9358d749604673604d3ebc07a6f60f582e
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Thu Nov 15 12:53:54 2018 +0100
https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompi...
diff --git a/calamares.spec b/calamares.spec
index 399c6ed..3148ecc 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -1,3 +1,7 @@
+# This package depends on automagic byte compilation
+#
https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompi...
+%global _python_bytecompile_extra 1
+
#global snapdate 20161119
#global snaphash 34516e9477b2fd5e9b3e5823350d1efc2099573f