diff --git a/system/installer/Calamares/actions.py b/system/installer/Calamares/actions.py index f8965f2bce..145da33140 100644 --- a/system/installer/Calamares/actions.py +++ b/system/installer/Calamares/actions.py @@ -20,17 +20,19 @@ def setup(): sourceDir=".." ) def build(): - shelltools.makedirs("build") + #shelltools.makedirs("build") shelltools.cd("build") cmaketools.make() def install(): - shelltools.makedirs("build") + #shelltools.makedirs("build") shelltools.cd("build") - cmaketools.install() + pisitools.insinto("/usr/share/calamares", "../settings.conf") + pisitools.insinto("/usr/share/calamares/modules", "src/modules/machineid/machineid.conf") + #dbus configuration for pisi pisitools.dosed("%s/usr/share/calamares/modules/machineid.conf" % get.installDIR(), "systemd: true", "systemd: false") pisitools.dosed("%s/usr/share/calamares/modules/machineid.conf" % get.installDIR(), "symlink: true", "symlink: false") diff --git a/system/installer/Calamares/files/no_fsck_and_pymouth2.patch b/system/installer/Calamares/files/no_fsck_and_pymouth2.patch new file mode 100644 index 0000000000..9fc52ab722 --- /dev/null +++ b/system/installer/Calamares/files/no_fsck_and_pymouth2.patch @@ -0,0 +1,11 @@ +diff -Nuar a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py +--- a/src/modules/initcpiocfg/main.py 2020-02-28 01:26:29.000000000 +0300 ++++ b/src/modules/initcpiocfg/main.py 2020-03-21 14:33:22.179730271 +0300 +@@ -185,8 +185,6 @@ + elif (btrfs == "yes" + and cpu['proc0']['vendor_id'].lower() == "genuineintel"): + modules.append("crc32c-intel") +- else: +- hooks.append("fsck") + + write_mkinitcpio_lines(hooks, modules, files, root_mount_point) diff --git a/system/installer/Calamares/files/pisi_set_hostname2.patch b/system/installer/Calamares/files/pisi_set_hostname2.patch new file mode 100644 index 0000000000..8ff40dbe06 --- /dev/null +++ b/system/installer/Calamares/files/pisi_set_hostname2.patch @@ -0,0 +1,12 @@ +diff -Nuar a/src/modules/users/SetHostNameJob.cpp b/src/modules/users/SetHostNameJob.cpp +--- a/src/modules/users/SetHostNameJob.cpp 2020-02-28 01:26:29.000000000 +0300 ++++ b/src/modules/users/SetHostNameJob.cpp 2020-03-21 14:05:55.674849075 +0300 +@@ -64,7 +64,7 @@ + setFileHostname( const QString& hostname ) + { + return CalamaresUtils::System::instance()->createTargetFile( +- QStringLiteral( "/etc/hostname" ), ( hostname + '\n' ).toUtf8(), WriteMode::Overwrite ); ++ QStringLiteral( "/etc/env.d/01hostname" ), ( hostname + '\n' ).toUtf8(), WriteMode::Overwrite ); + } + + STATICTEST bool diff --git a/system/installer/Calamares/files/pisilocalayar.patch b/system/installer/Calamares/files/pisilocalayar.patch index 0e8c959204..e08898ce50 100644 --- a/system/installer/Calamares/files/pisilocalayar.patch +++ b/system/installer/Calamares/files/pisilocalayar.patch @@ -1,6 +1,6 @@ -diff -Nuar calamares-3.2-rc3/src/modules/mudur/main.py calamares-3.2-rc31/src/modules/mudur/main.py ---- calamares-3.2-rc3/src/modules/mudur/main.py 1969-12-31 19:00:00.000000000 -0500 -+++ calamares-3.2-rc31/src/modules/mudur/main.py 2018-03-03 16:47:21.000000000 -0500 +diff -Nuar a/src/modules/mudur/main.py b/src/modules/mudur/main.py +--- a/src/modules/mudur/main.py 1970-01-01 02:00:00.000000000 +0200 ++++ b/src/modules/mudur/main.py 2020-03-21 13:48:02.731926493 +0300 @@ -0,0 +1,66 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- @@ -68,20 +68,21 @@ diff -Nuar calamares-3.2-rc3/src/modules/mudur/main.py calamares-3.2-rc31/src/mo + libcalamares.utils.target_env_call(['chmod', '440', '/etc/sudoers']) + + return None -diff -Nuar calamares-3.2-rc3/src/modules/mudur/module.desc calamares-3.2-rc31/src/modules/mudur/module.desc ---- calamares-3.2-rc3/src/modules/mudur/module.desc 1969-12-31 19:00:00.000000000 -0500 -+++ calamares-3.2-rc31/src/modules/mudur/module.desc 2018-02-24 08:15:23.000000000 -0500 -@@ -0,0 +1,5 @@ +diff -Nuar a/src/modules/mudur/module.desc b/src/modules/mudur/module.desc +--- a/src/modules/mudur/module.desc 1970-01-01 02:00:00.000000000 +0200 ++++ b/src/modules/mudur/module.desc 2020-03-21 13:49:51.631918635 +0300 +@@ -0,0 +1,6 @@ +--- +type: "job" +name: "mudur" +interface: "python" +script: "main.py" -diff -Nuar calamares-3.2-rc3/src/modules/packages/main.py calamares-3.2-rc31/src/modules/packages/main.py ---- calamares-3.2-rc3/src/modules/packages/main.py 2018-01-30 05:26:29.000000000 -0500 -+++ calamares-3.2-rc31/src/modules/packages/main.py 2018-03-03 16:45:20.000000000 -0500 -@@ -267,17 +267,17 @@ - check_target_env_call(["emerge", "--sync"]) ++ +diff -Nuar a/src/modules/packages/main.py b/src/modules/packages/main.py +--- a/src/modules/packages/main.py 2020-02-28 01:26:29.000000000 +0300 ++++ b/src/modules/packages/main.py 2020-03-21 13:54:17.751899433 +0300 +@@ -311,17 +311,17 @@ + pass -class PMEntropy(PackageManager): @@ -101,11 +102,11 @@ diff -Nuar calamares-3.2-rc3/src/modules/packages/main.py calamares-3.2-rc31/src - check_target_env_call(["equo", "update"]) + pass - - class PMDummy(PackageManager): -diff -Nuar calamares-3.2-rc3/src/modules/partition/gui/EncryptWidget.cpp calamares-3.2-rc31/src/modules/partition/gui/EncryptWidget.cpp ---- calamares-3.2-rc3/src/modules/partition/gui/EncryptWidget.cpp 2018-01-30 05:26:29.000000000 -0500 -+++ calamares-3.2-rc31/src/modules/partition/gui/EncryptWidget.cpp 2018-03-03 18:03:42.451021124 -0500 + def update_system(self): + # Doesn't need to update the system explicitly +diff -Nuar a/src/modules/partition/gui/EncryptWidget.cpp b/src/modules/partition/gui/EncryptWidget.cpp +--- a/src/modules/partition/gui/EncryptWidget.cpp 2020-02-28 01:26:29.000000000 +0300 ++++ b/src/modules/partition/gui/EncryptWidget.cpp 2020-03-21 13:57:03.877887447 +0300 @@ -31,6 +31,7 @@ m_passphraseLineEdit->hide(); m_confirmLineEdit->hide(); diff --git a/system/installer/Calamares/files/pisilocalayar.patch.old2 b/system/installer/Calamares/files/pisilocalayar.patch.old2 new file mode 100644 index 0000000000..0e8c959204 --- /dev/null +++ b/system/installer/Calamares/files/pisilocalayar.patch.old2 @@ -0,0 +1,116 @@ +diff -Nuar calamares-3.2-rc3/src/modules/mudur/main.py calamares-3.2-rc31/src/modules/mudur/main.py +--- calamares-3.2-rc3/src/modules/mudur/main.py 1969-12-31 19:00:00.000000000 -0500 ++++ calamares-3.2-rc31/src/modules/mudur/main.py 2018-03-03 16:47:21.000000000 -0500 +@@ -0,0 +1,66 @@ ++#!/usr/bin/env python3 ++# -*- coding: utf-8 -*- ++# ++# === This file is part of Calamares - === ++# ++# Copyright 2014, Anke Boersma ++# Copyright 2015, Philip Müller ++# ++# 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 . ++ ++import os ++import shutil ++ ++import libcalamares ++ ++ ++ ++def run(): ++ ++ install_path = libcalamares.globalstorage.value("rootMountPoint") ++ ++ ++ path = os.path.join(install_path, "etc/locale.conf") ++ ++ mloc = open(path,"r") ++ a=mloc.readline() ++ b=a.split("=")[1] ++ ++ languages = b.split("_")[0] ++ ++ ++ mudur_file_path = os.path.join(install_path, "etc/conf.d/mudur") ++ lines = [] ++ for l in open(mudur_file_path, "r").readlines(): ++ if l.strip().startswith('language=') or l.strip().startswith('# language='): ++ if languages == "pt": ++ l = 'language="pt_BR"\n' ++ else: ++ l = 'language="%s"\n' % languages ++ lines.append(l) ++ ++ open(mudur_file_path, "w").writelines(lines) ++ ++ if os.path.exists(os.path.join(install_path, "etc/sudoers")): ++ os.unlink(os.path.join(install_path, "etc/sudoers")) ++ ++ ++ source = os.path.join(install_path, "etc/sudoers.orig") ++ target = os.path.join(install_path, "etc/sudoers") ++ ++ shutil.copy(source, target) ++ ++ libcalamares.utils.target_env_call(['chmod', '440', '/etc/sudoers']) ++ ++ return None +diff -Nuar calamares-3.2-rc3/src/modules/mudur/module.desc calamares-3.2-rc31/src/modules/mudur/module.desc +--- calamares-3.2-rc3/src/modules/mudur/module.desc 1969-12-31 19:00:00.000000000 -0500 ++++ calamares-3.2-rc31/src/modules/mudur/module.desc 2018-02-24 08:15:23.000000000 -0500 +@@ -0,0 +1,5 @@ ++--- ++type: "job" ++name: "mudur" ++interface: "python" ++script: "main.py" +diff -Nuar calamares-3.2-rc3/src/modules/packages/main.py calamares-3.2-rc31/src/modules/packages/main.py +--- calamares-3.2-rc3/src/modules/packages/main.py 2018-01-30 05:26:29.000000000 -0500 ++++ calamares-3.2-rc31/src/modules/packages/main.py 2018-03-03 16:45:20.000000000 -0500 +@@ -267,17 +267,17 @@ + check_target_env_call(["emerge", "--sync"]) + + +-class PMEntropy(PackageManager): +- backend = "entropy" ++class PMpisi(PackageManager): ++ backend = "pisi" + + def install(self, pkgs, from_local=False): +- check_target_env_call(["equo", "i"] + pkgs) ++ check_target_env_call(["pisi", "it"] + pkgs) + + def remove(self, pkgs): +- check_target_env_call(["equo", "rm"] + pkgs) ++ check_target_env_call(["pisi", "rm","--ignore-comar"] + pkgs) + + def update_db(self): +- check_target_env_call(["equo", "update"]) ++ pass + + + class PMDummy(PackageManager): +diff -Nuar calamares-3.2-rc3/src/modules/partition/gui/EncryptWidget.cpp calamares-3.2-rc31/src/modules/partition/gui/EncryptWidget.cpp +--- calamares-3.2-rc3/src/modules/partition/gui/EncryptWidget.cpp 2018-01-30 05:26:29.000000000 -0500 ++++ calamares-3.2-rc31/src/modules/partition/gui/EncryptWidget.cpp 2018-03-03 18:03:42.451021124 -0500 +@@ -31,6 +31,7 @@ + m_passphraseLineEdit->hide(); + m_confirmLineEdit->hide(); + m_iconLabel->hide(); ++ m_encryptCheckBox->hide(); + + connect( m_encryptCheckBox, &QCheckBox::stateChanged, + this, &EncryptWidget::onCheckBoxStateChanged ); diff --git a/system/installer/Calamares/pspec.xml b/system/installer/Calamares/pspec.xml index d006e71ca9..d1728b7b79 100644 --- a/system/installer/Calamares/pspec.xml +++ b/system/installer/Calamares/pspec.xml @@ -11,7 +11,7 @@ LGPLv2 A distribution independent installer framework Calamares is a distribution-independent system installer, with an advanced partitioning feature for both manual and automated partitioning operations. - https://github.com/calamares/calamares/archive/v3.2-rc3.tar.gz + https://github.com/calamares/calamares/archive/v3.2.20.tar.gz gettext-devel yaml-cpp @@ -54,8 +54,8 @@ pisilocalayar.patch - pisi_set_hostname.patch - no_fsck_and_pymouth.patch + pisi_set_hostname2.patch + no_fsck_and_pymouth2.patch @@ -117,17 +117,10 @@ - - 2020-03-20 - 3.2.0 - Rebuild. - Mustafa Cinasal - muscnsl@gmail.com - - 2019-02-15 - 3.2.0 - Rebuild. + 2020-03-21 + 3.2.20 + Version bump. Mustafa Cinasal muscnsl@gmail.com