diff options
Diffstat (limited to 'app-admin/calamares/files')
4 files changed, 17 insertions, 293 deletions
diff --git a/app-admin/calamares/files/calamares-dont-rely-on-plymouthcfg.patch b/app-admin/calamares/files/calamares-dont-rely-on-plymouthcfg.patch deleted file mode 100644 index 04f41a30..00000000 --- a/app-admin/calamares/files/calamares-dont-rely-on-plymouthcfg.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Nur a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py ---- a/src/modules/grubcfg/main.py 2018-01-02 14:37:36.000000000 +0000 -+++ b/src/modules/grubcfg/main.py 2019-01-26 22:47:25.005850844 +0000 -@@ -44,16 +44,20 @@ - dracut_bin = libcalamares.utils.target_env_call( - ["sh", "-c", "which dracut"] - ) -- have_dracut = dracut_bin == 0 # Shell exit value 0 means success -+ plymouth_bin = libcalamares.utils.target_env_call( -+ ["sh", "-c", "which plymouth"] -+ ) -+ # Shell exit value 0 means success -+ have_dracut = dracut_bin == 0 -+ have_plymouth = plymouth_bin == 0 - - use_splash = "" - swap_uuid = "" - swap_outer_uuid = "" - swap_outer_mappername = None - -- if libcalamares.globalstorage.contains("hasPlymouth"): -- if libcalamares.globalstorage.value("hasPlymouth"): -- use_splash = "splash" -+ if have_plymouth: -+ use_splash = "splash" - - cryptdevice_params = [] - diff --git a/app-admin/calamares/files/calamares-dont-run-locale-gen.patch b/app-admin/calamares/files/calamares-dont-run-locale-gen.patch index 29ca6a61..03314b12 100644 --- a/app-admin/calamares/files/calamares-dont-run-locale-gen.patch +++ b/app-admin/calamares/files/calamares-dont-run-locale-gen.patch @@ -1,42 +1,24 @@ diff -Nur a/src/modules/localecfg/main.py b/src/modules/localecfg/main.py ---- a/src/modules/localecfg/main.py 2017-11-14 15:18:58.000000000 +0000 -+++ b/src/modules/localecfg/main.py 2017-11-20 18:56:23.801595116 +0000 -@@ -47,38 +47,6 @@ - - install_path = libcalamares.globalstorage.value("rootMountPoint") +--- a/src/modules/localecfg/main.py 2020-05-11 19:53:23.000000000 +0100 ++++ b/src/modules/localecfg/main.py 2020-05-21 16:11:50.013845904 +0100 +@@ -149,20 +149,6 @@ + target_locale_conf_path = "{!s}/etc/locale.conf".format(install_path) + target_etc_default_path = "{!s}/etc/default".format(install_path) - # restore backup if available -- if os.path.exists('/etc/locale.gen.bak'): -- shutil.copy2("{!s}/etc/locale.gen.bak".format(install_path), -- "{!s}/etc/locale.gen".format(install_path)) -- -- # run locale-gen if detected +- if os.path.exists(target_locale_gen_bak): +- shutil.copy2(target_locale_gen_bak, target_locale_gen) +- libcalamares.utils.debug("Restored backup {!s} -> {!s}" +- .format(target_locale_gen_bak, target_locale_gen)) +- +- # run locale-gen if detected; this *will* cause an exception +- # if the live system has locale.gen, but the target does not: +- # in that case, fix your installation filesystem. - if os.path.exists('/etc/locale.gen'): -- text = [] -- -- with open("{!s}/etc/locale.gen".format(install_path), "r") as gen: -- text = gen.readlines() -- -- # we want unique values, so locale_values should have 1 or 2 items -- locale_values = set(locale_conf.values()) -- -- with open("{!s}/etc/locale.gen".format(install_path), "w") as gen: -- for line in text: -- # always enable en_US -- if en_us_locale in line and line[0] == "#": -- # uncomment line -- line = line[1:].lstrip() -- -- for locale_value in locale_values: -- if locale_value in line and line[0] == "#": -- # uncomment line -- line = line[1:].lstrip() -- -- gen.write(line) -- +- rewrite_locale_gen(target_locale_gen, target_locale_gen, locale_conf) - libcalamares.utils.target_env_call(['locale-gen']) -- print('locale.gen done') +- libcalamares.utils.debug('{!s} done'.format(target_locale_gen)) - # write /etc/locale.conf - locale_conf_path = os.path.join(install_path, "etc/locale.conf") - with open(locale_conf_path, "w") as lcf: + with open(target_locale_conf_path, "w") as lcf: + for k, v in locale_conf.items(): diff --git a/app-admin/calamares/files/calamares-kpmcore-3.2.patch b/app-admin/calamares/files/calamares-kpmcore-3.2.patch deleted file mode 100644 index 07e506ec..00000000 --- a/app-admin/calamares/files/calamares-kpmcore-3.2.patch +++ /dev/null @@ -1,146 +0,0 @@ -diff -Naur calamares-3.1.8/src/modules/partition/CMakeLists.txt calamares-3.1.8-p/src/modules/partition/CMakeLists.txt ---- calamares-3.1.8/src/modules/partition/CMakeLists.txt 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-p/src/modules/partition/CMakeLists.txt 2017-11-18 13:16:38.335840619 +0100 -@@ -5,14 +5,10 @@ - include(GenerateExportHeader) - find_package( KF5 REQUIRED CoreAddons ) - --# These are needed because KPMcore links publicly against ConfigCore, I18n, IconThemes, KIOCore and Service --find_package( KF5 REQUIRED Config I18n IconThemes KIO Service ) -+find_package( Qt5 REQUIRED DBus ) -+find_package( KF5 REQUIRED Config I18n WidgetsAddons Service ) - --find_package( KPMcore 3.1.50 QUIET ) --if ( KPMcore_FOUND ) -- add_definitions(-DWITH_KPMCORE22) --endif() --find_package( KPMcore 3.0.3 QUIET ) -+find_package( KPMcore 3.2 QUIET ) - # 3.0.3 and newer has fixes for NVMe support; allow 3.0.2, but warn - # about it .. needs to use a different feature name because it otherwise - # gets reported as KPMcore (the package). -@@ -25,15 +21,6 @@ - add_feature_info( KPMcoreNVMe KPMcore_FOUND "Older KPMcore with no NVMe support" ) - endif() - --find_library( atasmart_LIB atasmart ) --find_library( blkid_LIB blkid ) --if( NOT atasmart_LIB ) -- message( WARNING "atasmart library not found." ) --endif() --if( NOT blkid_LIB ) -- message( WARNING "blkid library not found." ) --endif() -- - - include_directories( ${KPMCORE_INCLUDE_DIR} ) - include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ) -diff -Naur calamares-3.1.8/src/modules/partition/core/KPMHelpers.cpp calamares-3.1.8-p/src/modules/partition/core/KPMHelpers.cpp ---- calamares-3.1.8/src/modules/partition/core/KPMHelpers.cpp 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-p/src/modules/partition/core/KPMHelpers.cpp 2017-11-18 13:11:35.255540490 +0100 -@@ -116,9 +116,7 @@ - PartitionTable::Flags flags ) - { - FileSystem* fs = FileSystemFactory::create( fsType, firstSector, lastSector --#ifdef WITH_KPMCORE22 - ,device.logicalSize() --#endif - ); - return new Partition( - parent, -@@ -153,9 +151,7 @@ - FileSystemFactory::create( FileSystem::Luks, - firstSector, - lastSector --#ifdef WITH_KPMCORE22 - ,device.logicalSize() --#endif - ) ); - if ( !fs ) - { -@@ -186,9 +182,7 @@ - partition->fileSystem().type(), - partition->firstSector(), - partition->lastSector() --#ifdef WITH_KPMCORE22 - ,device->logicalSize() --#endif - ); - return new Partition( partition->parent(), - *device, -diff -Naur calamares-3.1.8/src/modules/partition/jobs/FillGlobalStorageJob.cpp calamares-3.1.8-p/src/modules/partition/jobs/FillGlobalStorageJob.cpp ---- calamares-3.1.8/src/modules/partition/jobs/FillGlobalStorageJob.cpp 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-p/src/modules/partition/jobs/FillGlobalStorageJob.cpp 2017-11-18 13:11:35.256540518 +0100 -@@ -77,50 +77,6 @@ - return uuid; - } - --// TODO: this will be available from KPMCore soon --static const char* filesystem_labels[] = { -- "unknown", -- "extended", -- -- "ext2", -- "ext3", -- "ext4", -- "linuxswap", -- "fat16", -- "fat32", -- "ntfs", -- "reiser", -- "reiser4", -- "xfs", -- "jfs", -- "hfs", -- "hfsplus", -- "ufs", -- "unformatted", -- "btrfs", -- "hpfs", -- "luks", -- "ocfs2", -- "zfs", -- "exfat", -- "nilfs2", -- "lvm2 pv", -- "f2fs", -- "udf", -- "iso9660", --}; -- --Q_STATIC_ASSERT_X((sizeof(filesystem_labels) / sizeof(char *)) >= FileSystem::__lastType, "Mismatch in filesystem labels"); -- --static QString --untranslatedTypeName(FileSystem::Type t) --{ -- -- Q_ASSERT( t >= 0 ); -- Q_ASSERT( t <= FileSystem::__lastType ); -- -- return QLatin1String(filesystem_labels[t]); --} - - static QVariant - mapForPartition( Partition* partition, const QString& uuid ) -@@ -129,7 +85,7 @@ - map[ "device" ] = partition->partitionPath(); - map[ "mountPoint" ] = PartitionInfo::mountPoint( partition ); - map[ "fsName" ] = partition->fileSystem().name(); -- map[ "fs" ] = untranslatedTypeName( partition->fileSystem().type() ); -+ map[ "fs" ] = partition->fileSystem().name( { QStringLiteral("C") } ); // Untranslated - if ( partition->fileSystem().type() == FileSystem::Luks && - dynamic_cast< FS::luks& >( partition->fileSystem() ).innerFS() ) - map[ "fs" ] = dynamic_cast< FS::luks& >( partition->fileSystem() ).innerFS()->name(); -diff -Naur calamares-3.1.8/src/modules/partition/tests/PartitionJobTests.cpp calamares-3.1.8-p/src/modules/partition/tests/PartitionJobTests.cpp ---- calamares-3.1.8/src/modules/partition/tests/PartitionJobTests.cpp 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-p/src/modules/partition/tests/PartitionJobTests.cpp 2017-11-18 13:11:35.255540490 +0100 -@@ -219,9 +219,7 @@ - else - lastSector = freeSpacePartition->lastSector(); - FileSystem* fs = FileSystemFactory::create( type, firstSector, lastSector --#ifdef WITH_KPMCORE22 - ,m_device->logicalSize() --#endif - ); - - Partition* partition = new Partition( diff --git a/app-admin/calamares/files/calamares-openrc-dmcrypt-cfg-r1.patch b/app-admin/calamares/files/calamares-openrc-dmcrypt-cfg-r1.patch deleted file mode 100644 index 67279b7c..00000000 --- a/app-admin/calamares/files/calamares-openrc-dmcrypt-cfg-r1.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -Nur a/src/modules/openrcdmcryptcfg/main.py b/src/modules/openrcdmcryptcfg/main.py ---- a/src/modules/openrcdmcryptcfg/main.py 1970-01-01 01:00:00.000000000 +0100 -+++ b/src/modules/openrcdmcryptcfg/main.py 2017-12-02 19:40:18.212303089 +0000 -@@ -0,0 +1,65 @@ -+#!/usr/bin/env python3 -+# -*- coding: utf-8 -*- -+# -+# === This file is part of Calamares - <http://github.com/calamares> === -+# -+# Copyright 2017, Ghiunhan Mamut <venerix@redcorelinux.org> -+# -+# Calamares is free software: you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation, either version 3 of the License, or -+# (at your option) any later version. -+# -+# Calamares is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with Calamares. If not, see <http://www.gnu.org/licenses/>. -+ -+import libcalamares -+import os.path -+ -+def write_dmcrypt_conf(partitions, root_mount_point, dmcrypt_conf_path): -+ crypto_target = "" -+ crypto_source = "" -+ -+ for partition in partitions: -+ has_luks = "luksMapperName" in partition -+ skip_partitions = partition["mountPoint"] == "/" or partition["fs"] == "linuxswap" -+ -+ if not has_luks and not skip_partitions: -+ libcalamares.utils.debug( -+ "Skip writing OpenRC LUKS configuration for partition {!s}".format(partition["mountPoint"])) -+ -+ if has_luks and not skip_partitions: -+ crypto_target = partition["luksMapperName"] -+ crypto_source = "/dev/disk/by-uuid/{!s}".format(partition["uuid"]) -+ libcalamares.utils.debug( -+ "Writing OpenRC LUKS configuration for partition {!s}".format(partition["mountPoint"])) -+ -+ with open(os.path.join(root_mount_point, dmcrypt_conf_path), 'a+') as dmcrypt_file: -+ dmcrypt_file.write("\ntarget=" + crypto_target) -+ dmcrypt_file.write("\nsource=" + crypto_source) -+ dmcrypt_file.write("\nkey=/crypto_keyfile.bin") -+ dmcrypt_file.write("\n") -+ -+ if has_luks and skip_partitions: -+ pass # root and swap partitions should be handled by initramfs generators -+ -+ return None -+ -+def run(): -+ """ -+ This module configures OpenRC dmcrypt service for LUKS encrypted partitions. -+ :return: -+ """ -+ -+ root_mount_point = libcalamares.globalstorage.value("rootMountPoint") -+ dmcrypt_conf_path = libcalamares.job.configuration["configFilePath"] -+ partitions = libcalamares.globalstorage.value("partitions") -+ -+ dmcrypt_conf_path = dmcrypt_conf_path.lstrip('/') -+ -+ return write_dmcrypt_conf(partitions, root_mount_point, dmcrypt_conf_path) -diff -Nur a/src/modules/openrcdmcryptcfg/module.desc b/src/modules/openrcdmcryptcfg/module.desc ---- a/src/modules/openrcdmcryptcfg/module.desc 1970-01-01 01:00:00.000000000 +0100 -+++ b/src/modules/openrcdmcryptcfg/module.desc 2017-12-02 16:48:49.663145918 +0000 -@@ -0,0 +1,5 @@ -+--- -+type: "job" -+name: "openrcdmcryptcfg" -+interface: "python" -+script: "main.py" -diff -Nur a/src/modules/openrcdmcryptcfg/openrcdmcryptcfg.conf b/src/modules/openrcdmcryptcfg/openrcdmcryptcfg.conf ---- a/src/modules/openrcdmcryptcfg/openrcdmcryptcfg.conf 1970-01-01 01:00:00.000000000 +0100 -+++ b/src/modules/openrcdmcryptcfg/openrcdmcryptcfg.conf 2017-12-02 16:48:49.663145918 +0000 -@@ -0,0 +1,2 @@ -+--- -+configFilePath: /etc/conf.d/dmcrypt |