From 3c9773930253e39de1f90734fa1bcc010a7d4e40 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Jan 15 2017 02:22:34 +0000 Subject: Update to 2.5-alpha1 * Sun Jan 15 2017 Kevin Kofler - 2.5-0.1.alpha1 - Update to 2.5-alpha1 - Rebase default-settings and kdesu patches --- diff --git a/.gitignore b/.gitignore index 42a2b45..dc4b1cb 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /calamares-2.4.4.tar.gz /calamares-d6e0e09bc1472009e2bdabd4186979dbf4c2303e.tar.gz /calamares-34516e9477b2fd5e9b3e5823350d1efc2099573f.tar.gz +/calamares-2.5-alpha1.tar.gz diff --git a/calamares-2.4.80-default-settings.patch b/calamares-2.4.80-default-settings.patch deleted file mode 100644 index 3b3f97d..0000000 --- a/calamares-2.4.80-default-settings.patch +++ /dev/null @@ -1,220 +0,0 @@ -diff -ur calamares-2.4.80/settings.conf calamares-2.4.80-default-settings/settings.conf ---- calamares-2.4.80/settings.conf 2016-11-13 03:56:55.000000000 +0100 -+++ calamares-2.4.80-default-settings/settings.conf 2016-11-13 04:15:48.019218447 +0100 -@@ -78,21 +78,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 -@@ -107,7 +108,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-2.4.80/src/modules/bootloader/bootloader.conf calamares-2.4.80-default-settings/src/modules/bootloader/bootloader.conf ---- calamares-2.4.80/src/modules/bootloader/bootloader.conf 2016-11-13 03:56:55.000000000 +0100 -+++ calamares-2.4.80-default-settings/src/modules/bootloader/bootloader.conf 2016-11-13 04:12:11.974572738 +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-2.4.80/src/modules/keyboard/keyboard.conf calamares-2.4.80-default-settings/src/modules/keyboard/keyboard.conf ---- calamares-2.4.80/src/modules/keyboard/keyboard.conf 2016-11-13 03:56:55.000000000 +0100 -+++ calamares-2.4.80-default-settings/src/modules/keyboard/keyboard.conf 2016-11-13 04:12:12.174569633 +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-2.4.80/src/modules/license/license.conf calamares-2.4.80-default-settings/src/modules/license/license.conf ---- calamares-2.4.80/src/modules/license/license.conf 2016-11-13 03:56:55.000000000 +0100 -+++ calamares-2.4.80-default-settings/src/modules/license/license.conf 2016-11-13 04:12:12.175569617 +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_Combined_20100108_1657.pdf -- required: true -diff -ur calamares-2.4.80/src/modules/netinstall/netinstall.conf calamares-2.4.80-default-settings/src/modules/netinstall/netinstall.conf ---- calamares-2.4.80/src/modules/netinstall/netinstall.conf 2016-11-13 03:56:55.000000000 +0100 -+++ calamares-2.4.80-default-settings/src/modules/netinstall/netinstall.conf 2016-11-13 04:12:12.175569617 +0100 -@@ -1,2 +1,5 @@ - --- --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 -diff -ur calamares-2.4.80/src/modules/packages/packages.conf calamares-2.4.80-default-settings/src/modules/packages/packages.conf ---- calamares-2.4.80/src/modules/packages/packages.conf 2016-11-13 03:56:55.000000000 +0100 -+++ calamares-2.4.80-default-settings/src/modules/packages/packages.conf 2016-11-13 04:12:12.175569617 +0100 -@@ -11,9 +11,9 @@ - # - portage - Gentoo package manager - # - entropy - Sabayon package manager - # --backend: packagekit -+backend: dnf - --update_db: true -+update_db: false - - # - # List of maps with package operations such as install or remove. -@@ -29,20 +29,6 @@ - # storage called "packageOperations" and it is processed - # after the static list in the job configuration. - # --#operations: --# - install: --# - pkg1 --# - pkg2 --# - remove: --# - pkg3 --# - pkg4 --# - try_install: # no system install failure if a package cannot be installed --# - pkg5 --# - try_remove: # no system install failure if a package cannot be removed --# - pkg2 --# - pkg1 --# - install: --# - pkgs6 --# - pkg7 --# - localInstall: --# - /path/to/pkg8 -+operations: -+ - try_remove: -+ - calamares -diff -ur calamares-2.4.80/src/modules/partition/partition.conf calamares-2.4.80-default-settings/src/modules/partition/partition.conf ---- calamares-2.4.80/src/modules/partition/partition.conf 2016-11-13 03:56:55.000000000 +0100 -+++ calamares-2.4.80-default-settings/src/modules/partition/partition.conf 2016-11-13 04:12:12.175569617 +0100 -@@ -7,7 +7,7 @@ - ensureSuspendToDisk: true - - # 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-2.4.80/src/modules/services/services.conf calamares-2.4.80-default-settings/src/modules/services/services.conf ---- calamares-2.4.80/src/modules/services/services.conf 2016-11-13 03:56:55.000000000 +0100 -+++ calamares-2.4.80-default-settings/src/modules/services/services.conf 2016-11-13 04:12:12.176569602 +0100 -@@ -12,6 +12,4 @@ - - name: "graphical" - mandatory: true - --disable: -- - name: "pacman-init" -- mandatory: false -+disable: [] -diff -ur calamares-2.4.80/src/modules/umount/umount.conf calamares-2.4.80-default-settings/src/modules/umount/umount.conf ---- calamares-2.4.80/src/modules/umount/umount.conf 2016-11-13 03:56:55.000000000 +0100 -+++ calamares-2.4.80-default-settings/src/modules/umount/umount.conf 2016-11-13 04:12:12.176569602 +0100 -@@ -1,9 +1,6 @@ - --- --#scrLog: "/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" - #destLog: "/var/log/installation.log" -diff -ur calamares-2.4.80/src/modules/unpackfs/unpackfs.conf calamares-2.4.80-default-settings/src/modules/unpackfs/unpackfs.conf ---- calamares-2.4.80/src/modules/unpackfs/unpackfs.conf 2016-11-13 03:56:55.000000000 +0100 -+++ calamares-2.4.80-default-settings/src/modules/unpackfs/unpackfs.conf 2016-11-13 04:12:12.176569602 +0100 -@@ -1,8 +1,5 @@ - --- - unpack: -- - source: "/path/to/filesystem.img" -+ - source: "/dev/mapper/live-base" - sourcefs: "ext4" - destination: "" -- - source: "/path/to/another/filesystem.sqfs" -- sourcefs: "squashfs" -- destination: "" -diff -ur calamares-2.4.80/src/modules/users/users.conf calamares-2.4.80-default-settings/src/modules/users/users.conf ---- calamares-2.4.80/src/modules/users/users.conf 2016-11-13 03:56:55.000000000 +0100 -+++ calamares-2.4.80-default-settings/src/modules/users/users.conf 2016-11-13 04:12:12.176569602 +0100 -@@ -3,12 +3,11 @@ - - users - - lp - - video -- - network -- - storage -+ - dialout - - wheel - - audio - autologinGroup: autologin --doAutologin: true -+doAutologin: false - sudoersGroup: wheel - setRootPassword: true - doReusePassword: true diff --git a/calamares-2.4.80-kdesu.patch b/calamares-2.4.80-kdesu.patch deleted file mode 100644 index 98c32ca..0000000 --- a/calamares-2.4.80-kdesu.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -Nur calamares-2.4.80/calamares.desktop calamares-2.4.80-kdesu/calamares.desktop ---- calamares-2.4.80/calamares.desktop 2016-11-13 03:56:55.000000000 +0100 -+++ calamares-2.4.80-kdesu/calamares.desktop 2016-11-13 04:25:43.273974842 +0100 -@@ -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-2.4.80/CMakeLists.txt calamares-2.4.80-kdesu/CMakeLists.txt ---- calamares-2.4.80/CMakeLists.txt 2016-11-13 03:56:55.000000000 +0100 -+++ calamares-2.4.80-kdesu/CMakeLists.txt 2016-11-13 04:25:43.274974827 +0100 -@@ -53,7 +53,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( WITH_PYTHON "Enable Python modules support." ON ) - option( WITH_CRASHREPORTER "Build with CrashReporter" ON ) -@@ -219,13 +218,6 @@ - ) - - install( -- FILES -- com.github.calamares.calamares.policy -- DESTINATION -- "${POLKITQT-1_POLICY_FILES_INSTALL_DIR}" --) -- --install( - FILES - calamares.desktop - DESTINATION -diff -Nur calamares-2.4.80/com.github.calamares.calamares.policy calamares-2.4.80-kdesu/com.github.calamares.calamares.policy ---- calamares-2.4.80/com.github.calamares.calamares.policy 2016-11-13 03:56:55.000000000 +0100 -+++ calamares-2.4.80-kdesu/com.github.calamares.calamares.policy 1970-01-01 01:00:00.000000000 +0100 -@@ -1,22 +0,0 @@ -- -- -- -- -- Calamares -- https://github.com/calamares -- -- -- Run Installer -- Authentication is required to run the installation program -- drive-harddisk -- -- no -- no -- auth_admin -- -- /usr/bin/calamares -- true -- -- -\ No newline at end of file diff --git a/calamares-2.5-alpha1-default-settings.patch b/calamares-2.5-alpha1-default-settings.patch new file mode 100644 index 0000000..2698d29 --- /dev/null +++ b/calamares-2.5-alpha1-default-settings.patch @@ -0,0 +1,241 @@ +diff -ur calamares-2.5-alpha1/settings.conf calamares-2.5-alpha1-default-settings/settings.conf +--- calamares-2.5-alpha1/settings.conf 2017-01-12 16:53:01.000000000 +0100 ++++ calamares-2.5-alpha1-default-settings/settings.conf 2017-01-15 02:37:37.985645246 +0100 +@@ -61,7 +61,7 @@ + sequence: + - show: + - welcome +- - dummypythonqt ++# - dummypythonqt + - locale + - keyboard + - partition +@@ -71,7 +71,7 @@ + # - dummycpp + # - dummyprocess + # - dummypython +- - dummypythonqt ++# - dummypythonqt + - partition + - mount + - unpackfs +@@ -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-2.5-alpha1/src/modules/bootloader/bootloader.conf calamares-2.5-alpha1-default-settings/src/modules/bootloader/bootloader.conf +--- calamares-2.5-alpha1/src/modules/bootloader/bootloader.conf 2016-04-12 11:23:47.000000000 +0200 ++++ calamares-2.5-alpha1-default-settings/src/modules/bootloader/bootloader.conf 2017-01-15 02:36:17.060897220 +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-2.5-alpha1/src/modules/keyboard/keyboard.conf calamares-2.5-alpha1-default-settings/src/modules/keyboard/keyboard.conf +--- calamares-2.5-alpha1/src/modules/keyboard/keyboard.conf 2016-09-26 13:18:41.000000000 +0200 ++++ calamares-2.5-alpha1-default-settings/src/modules/keyboard/keyboard.conf 2017-01-15 02:36:17.325893119 +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-2.5-alpha1/src/modules/license/license.conf calamares-2.5-alpha1-default-settings/src/modules/license/license.conf +--- calamares-2.5-alpha1/src/modules/license/license.conf 2016-04-12 11:23:47.000000000 +0200 ++++ calamares-2.5-alpha1-default-settings/src/modules/license/license.conf 2017-01-15 02:36:17.326893104 +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_Combined_20100108_1657.pdf +- required: true +diff -ur calamares-2.5-alpha1/src/modules/netinstall/netinstall.conf calamares-2.5-alpha1-default-settings/src/modules/netinstall/netinstall.conf +--- calamares-2.5-alpha1/src/modules/netinstall/netinstall.conf 2016-07-19 13:04:14.000000000 +0200 ++++ calamares-2.5-alpha1-default-settings/src/modules/netinstall/netinstall.conf 2017-01-15 02:36:17.326893104 +0100 +@@ -1,2 +1,5 @@ + --- +-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 +diff -ur calamares-2.5-alpha1/src/modules/packages/packages.conf calamares-2.5-alpha1-default-settings/src/modules/packages/packages.conf +--- calamares-2.5-alpha1/src/modules/packages/packages.conf 2016-11-07 12:33:01.000000000 +0100 ++++ calamares-2.5-alpha1-default-settings/src/modules/packages/packages.conf 2017-01-15 02:36:17.326893104 +0100 +@@ -11,9 +11,9 @@ + # - portage - Gentoo package manager + # - entropy - Sabayon package manager + # +-backend: packagekit ++backend: dnf + +-update_db: true ++update_db: false + + # + # List of maps with package operations such as install or remove. +@@ -29,20 +29,6 @@ + # storage called "packageOperations" and it is processed + # after the static list in the job configuration. + # +-#operations: +-# - install: +-# - pkg1 +-# - pkg2 +-# - remove: +-# - pkg3 +-# - pkg4 +-# - try_install: # no system install failure if a package cannot be installed +-# - pkg5 +-# - try_remove: # no system install failure if a package cannot be removed +-# - pkg2 +-# - pkg1 +-# - install: +-# - pkgs6 +-# - pkg7 +-# - localInstall: +-# - /path/to/pkg8 ++operations: ++ - try_remove: ++ - calamares +diff -ur calamares-2.5-alpha1/src/modules/partition/partition.conf calamares-2.5-alpha1-default-settings/src/modules/partition/partition.conf +--- calamares-2.5-alpha1/src/modules/partition/partition.conf 2016-09-26 13:18:41.000000000 +0200 ++++ calamares-2.5-alpha1-default-settings/src/modules/partition/partition.conf 2017-01-15 02:36:17.514890195 +0100 +@@ -7,7 +7,7 @@ + ensureSuspendToDisk: true + + # 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-2.5-alpha1/src/modules/services/services.conf calamares-2.5-alpha1-default-settings/src/modules/services/services.conf +--- calamares-2.5-alpha1/src/modules/services/services.conf 2016-12-06 14:57:31.000000000 +0100 ++++ calamares-2.5-alpha1-default-settings/src/modules/services/services.conf 2017-01-15 02:42:24.239216666 +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-2.5-alpha1/src/modules/umount/umount.conf calamares-2.5-alpha1-default-settings/src/modules/umount/umount.conf +--- calamares-2.5-alpha1/src/modules/umount/umount.conf 2016-04-12 11:23:47.000000000 +0200 ++++ calamares-2.5-alpha1-default-settings/src/modules/umount/umount.conf 2017-01-15 02:36:17.515890180 +0100 +@@ -1,9 +1,6 @@ + --- +-#scrLog: "/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" + #destLog: "/var/log/installation.log" +diff -ur calamares-2.5-alpha1/src/modules/unpackfs/unpackfs.conf calamares-2.5-alpha1-default-settings/src/modules/unpackfs/unpackfs.conf +--- calamares-2.5-alpha1/src/modules/unpackfs/unpackfs.conf 2016-04-12 11:23:47.000000000 +0200 ++++ calamares-2.5-alpha1-default-settings/src/modules/unpackfs/unpackfs.conf 2017-01-15 02:36:17.515890180 +0100 +@@ -1,8 +1,5 @@ + --- + unpack: +- - source: "/path/to/filesystem.img" ++ - source: "/dev/mapper/live-base" + sourcefs: "ext4" + destination: "" +- - source: "/path/to/another/filesystem.sqfs" +- sourcefs: "squashfs" +- destination: "" +diff -ur calamares-2.5-alpha1/src/modules/users/users.conf calamares-2.5-alpha1-default-settings/src/modules/users/users.conf +--- calamares-2.5-alpha1/src/modules/users/users.conf 2016-04-12 11:23:47.000000000 +0200 ++++ calamares-2.5-alpha1-default-settings/src/modules/users/users.conf 2017-01-15 02:36:17.515890180 +0100 +@@ -3,12 +3,11 @@ + - users + - lp + - video +- - network +- - storage ++ - dialout + - wheel + - audio + autologinGroup: autologin +-doAutologin: true ++doAutologin: false + sudoersGroup: wheel + setRootPassword: true + doReusePassword: true diff --git a/calamares-2.5-alpha1-kdesu.patch b/calamares-2.5-alpha1-kdesu.patch new file mode 100644 index 0000000..d717c9f --- /dev/null +++ b/calamares-2.5-alpha1-kdesu.patch @@ -0,0 +1,64 @@ +diff -Nur calamares-2.5-alpha1/calamares.desktop calamares-2.5-alpha1-kdesu/calamares.desktop +--- calamares-2.5-alpha1/calamares.desktop 2017-01-12 16:53:01.000000000 +0100 ++++ calamares-2.5-alpha1-kdesu/calamares.desktop 2017-01-15 02:46:13.182674721 +0100 +@@ -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-2.5-alpha1/CMakeLists.txt calamares-2.5-alpha1-kdesu/CMakeLists.txt +--- calamares-2.5-alpha1/CMakeLists.txt 2017-01-12 16:53:01.000000000 +0100 ++++ calamares-2.5-alpha1-kdesu/CMakeLists.txt 2017-01-15 02:46:13.307672787 +0100 +@@ -53,7 +53,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( WITH_PYTHON "Enable Python modules API (requires Boost.Python)." ON ) + option( WITH_CRASHREPORTER "Build with CrashReporter" ON ) +@@ -244,13 +243,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-2.5-alpha1/com.github.calamares.calamares.policy calamares-2.5-alpha1-kdesu/com.github.calamares.calamares.policy +--- calamares-2.5-alpha1/com.github.calamares.calamares.policy 2016-04-12 11:23:47.000000000 +0200 ++++ calamares-2.5-alpha1-kdesu/com.github.calamares.calamares.policy 1970-01-01 01:00:00.000000000 +0100 +@@ -1,22 +0,0 @@ +- +- +- +- +- Calamares +- https://github.com/calamares +- +- +- Run Installer +- Authentication is required to run the installation program +- drive-harddisk +- +- no +- no +- auth_admin +- +- /usr/bin/calamares +- true +- +- +\ No newline at end of file diff --git a/calamares.spec b/calamares.spec index 6266491..6749844 100644 --- a/calamares.spec +++ b/calamares.spec @@ -1,5 +1,7 @@ -%global snapdate 20161119 -%global snaphash 34516e9477b2fd5e9b3e5823350d1efc2099573f +#global snapdate 20161119 +#global snaphash 34516e9477b2fd5e9b3e5823350d1efc2099573f + +%global prerelease alpha1 %ifarch %{?qt5_qtwebengine_arches}%{!?qt5_qtwebengine_arches:%{ix86} x86_64} # use QtWebEngine instead of QtWebKit for the optional webview module @@ -8,13 +10,13 @@ %endif Name: calamares -Version: 2.4.80 -Release: 0.4%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c -13)}%{?dist} +Version: 2.5 +Release: 0.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+ URL: https://calamares.io/ -Source0: https://github.com/calamares/calamares/%{?snaphash:archive}%{!?snaphash:releases/download}/%{?snaphash}%{!?snaphash:v%{version}}/calamares-%{?snaphash}%{!?snaphash:%{version}}.tar.gz +Source0: https://github.com/calamares/calamares/%{?snaphash:archive}%{!?snaphash:releases/download}/%{?snaphash}%{!?snaphash:v%{version}%{?prerelease:-%{prerelease}}}/calamares-%{?snaphash}%{!?snaphash:%{version}%{?prerelease:-%{prerelease}}}.tar.gz Source2: show.qml # Run: # lupdate-qt5 show.qml -ts calamares-auto_fr.ts @@ -30,10 +32,10 @@ Source4: calamares-auto_de.ts Source5: calamares-auto_it.ts # adjust some default settings (default shipped .conf files) -Patch0: calamares-2.4.80-default-settings.patch +Patch0: calamares-2.5-alpha1-default-settings.patch # use kdesu instead of pkexec (works around #1171779) -Patch1: calamares-2.4.80-kdesu.patch +Patch1: calamares-2.5-alpha1-kdesu.patch # Calamares is only supported where live images (and GRUB) are. (#1171380) # This list matches the livearches global from anaconda.spec @@ -167,7 +169,7 @@ developing custom modules for Calamares. %prep -%setup -q %{?snaphash:-n %{name}-%{snaphash}} +%setup -q %{?snaphash:-n %{name}-%{snaphash}} %{!?snaphash:%{?prerelease:-n %{name}-%{version}-%{prerelease}}} %patch0 -p1 -b .default-settings # delete backup files so they don't get installed rm -f src/modules/*/*.conf.default-settings @@ -316,6 +318,10 @@ fi %changelog +* Sun Jan 15 2017 Kevin Kofler - 2.5-0.1.alpha1 +- Update to 2.5-alpha1 +- Rebase default-settings and kdesu patches + * Mon Dec 19 2016 Miro Hrončok - 2.4.80-0.4.20161119git34516e9477b2f - Rebuild for Python 3.6 diff --git a/sources b/sources index 96f70cd..4455c98 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -858ea4cf3e2a7e9efe32a7249ae140f2 calamares-34516e9477b2fd5e9b3e5823350d1efc2099573f.tar.gz +SHA512 (calamares-2.5-alpha1.tar.gz) = 024eb67c5b286f8b40bd1b1dfae1afa7bc60c5dbfe75da57cba4d80c9b314b86f38fb80b72c4e42d2ae3a8c83604ca978de9600b97c23732241c1397a3c605af