From d169848ea6adac84317e04fcb6390f442f890d4d Mon Sep 17 00:00:00 2001 From: Rmys Date: Sat, 3 Mar 2018 19:58:34 +0300 Subject: [PATCH] pisilocalayar.patch --- .../Calamares/files/pisilocalayar.patch | 135 +++++++----------- 1 file changed, 48 insertions(+), 87 deletions(-) diff --git a/system/installer/Calamares/files/pisilocalayar.patch b/system/installer/Calamares/files/pisilocalayar.patch index b62c166345..0e8c959204 100644 --- a/system/installer/Calamares/files/pisilocalayar.patch +++ b/system/installer/Calamares/files/pisilocalayar.patch @@ -1,19 +1,7 @@ -diff -Nuar a/src/modules/localecfg/main.py b/src/modules/localecfg/main.py ---- a/src/modules/localecfg/main.py 2017-12-20 12:22:06.000000000 +0300 -+++ b/src/modules/localecfg/main.py 2017-12-26 21:20:05.000000000 +0300 -@@ -83,7 +83,7 @@ - locale_conf_path = os.path.join(install_path, "etc/locale.conf") - with open(locale_conf_path, "w") as lcf: - for k, v in locale_conf.items(): -- lcf.write("{!s}={!s}\n".format(k, v)) -+ lcf.write("{!s}\n".format(v)) - - # write /etc/default/locale if /etc/default exists and is a dir - etc_default_path = os.path.join(install_path, "etc/default") -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 2017-11-25 06:15:16.000000000 +0300 -@@ -0,0 +1,64 @@ +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 -*- +# @@ -50,8 +38,10 @@ diff -Nuar a/src/modules/mudur/main.py b/src/modules/mudur/main.py + path = os.path.join(install_path, "etc/locale.conf") + + mloc = open(path,"r") -+ -+ languages = mloc.readline(2) ++ a=mloc.readline() ++ b=a.split("=")[1] ++ ++ languages = b.split("_")[0] + + + mudur_file_path = os.path.join(install_path, "etc/conf.d/mudur") @@ -78,78 +68,49 @@ diff -Nuar a/src/modules/mudur/main.py b/src/modules/mudur/main.py + libcalamares.utils.target_env_call(['chmod', '440', '/etc/sudoers']) + + return None -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 2016-05-09 14:24:30.000000000 +0300 +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 a/src/modules/sil/main.py b/src/modules/sil/main.py ---- a/src/modules/sil/main.py 1970-01-01 02:00:00.000000000 +0200 -+++ b/src/modules/sil/main.py 2017-12-31 15:05:16.622215846 +0300 -@@ -0,0 +1,53 @@ -+#!/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/calamares") -+ if os.path.exists(path): -+ shutil.rmtree(path) -+ path1 = os.path.join(install_path, "usr/lib/calamares") -+ if os.path.exists(path1): -+ shutil.rmtree(path1) -+ path2 = os.path.join(install_path, "usr/bin/calamares") -+ if os.path.exists(path2): -+ os.remove(path2) -+ path3 = os.path.join(install_path, "usr/share/man/man8/calamares.8") -+ if os.path.exists(path3): -+ os.remove(path3) -+ path4 = os.path.join(install_path, "usr/share/applications/calamares.desktop") -+ if os.path.exists(path4): -+ os.remove(path4) -+ path5 = os.path.join(install_path, "usr/share/calamares") -+ if os.path.exists(path5): -+ shutil.rmtree(path5) -+ return None -diff -Nuar a/src/modules/sil/module.desc b/src/modules/sil/module.desc ---- a/src/modules/sil/module.desc 1970-01-01 02:00:00.000000000 +0200 -+++ b/src/modules/sil/module.desc 2017-12-26 21:21:52.000000000 +0300 -@@ -0,0 +1,5 @@ -+--- -+type: "job" -+name: "sil" -+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 );