From 0f96b8d1d8296a8706ac3156a0fb3259f4be243b Mon Sep 17 00:00:00 2001 From: sss Date: Tue, 19 Dec 2017 17:58:44 +0300 Subject: [PATCH] calamares-3.1.10:ver.bump --- .../Calamares/files/pisilocalayar.patch | 96 +++++++++++++++++++ system/installer/Calamares/pspec.xml | 9 +- 2 files changed, 101 insertions(+), 4 deletions(-) create mode 100644 system/installer/Calamares/files/pisilocalayar.patch diff --git a/system/installer/Calamares/files/pisilocalayar.patch b/system/installer/Calamares/files/pisilocalayar.patch new file mode 100644 index 0000000000..0b701141ec --- /dev/null +++ b/system/installer/Calamares/files/pisilocalayar.patch @@ -0,0 +1,96 @@ +diff -Nuar a/src/modules/localecfg/main.py b/src/modules/localecfg/main.py +--- a/src/modules/localecfg/main.py 2017-11-29 16:58:32.000000000 +0300 ++++ b/src/modules/localecfg/main.py 2017-12-19 17:15:30.000000000 +0300 +@@ -83,13 +83,13 @@ + 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") + if os.path.isdir(etc_default_path): + with open(os.path.join(etc_default_path, "locale"), "w") as edl: + for k, v in locale_conf.items(): +- edl.write("{!s}={!s}\n".format(k, v)) ++ edl.write("{!s}\n".format(v)) + + return None +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 @@ ++#!/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") ++ ++ languages = mloc.readline(2) ++ ++ ++ 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 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 +@@ -0,0 +1,5 @@ ++--- ++type: "job" ++name: "mudur" ++interface: "python" ++script: "main.py" diff --git a/system/installer/Calamares/pspec.xml b/system/installer/Calamares/pspec.xml index 53620a5d88..447d3ab96d 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://sourceforge.net/projects/pisilinux/files/source/calamares-3.1.7.zip + https://github.com/calamares/calamares/releases/download/v3.1.10/calamares-3.1.10.tar.gz gettext-devel yaml-cpp @@ -52,7 +52,7 @@ kparts-devel - + pisilocalayar.patch pisi_set_hostname.patch no_fsck_and_pymouth.patch @@ -66,6 +66,7 @@ boost boost-python3 python3 + kcrash parted solid ki18n @@ -117,8 +118,8 @@ 2017-12-19 - 3.1.7 - Rebuild partitionmanager. + 3.1.10 + Version Bump. Mustafa Cinasal muscnsl@gmail.com