Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8199 from Rmys/master

Browse Source 
calamares ver. bump
This commit is contained in:
Rmys
2020-03-21 15:35:51 +03:00
committed by GitHub
parent 1ac5fe1fe9 08e47155ca
commit c83e2c3be9
6 changed files with 168 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/installer/Calamares/actions.py
+5 -3
View File
@@ -20,17 +20,19 @@ def setup():
sourceDir=".." ) sourceDir=".." )
def build(): def build():
shelltools.makedirs("build") #shelltools.makedirs("build")
shelltools.cd("build") shelltools.cd("build")
cmaketools.make() cmaketools.make()
def install(): def install():
shelltools.makedirs("build") #shelltools.makedirs("build")
shelltools.cd("build") shelltools.cd("build")
cmaketools.install() cmaketools.install()
pisitools.insinto("/usr/share/calamares", "../settings.conf")
pisitools.insinto("/usr/share/calamares/modules", "src/modules/machineid/machineid.conf")
#dbus configuration for pisi #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(), "systemd: true", "systemd: false")
pisitools.dosed("%s/usr/share/calamares/modules/machineid.conf" % get.installDIR(), "symlink: true", "symlink: false") pisitools.dosed("%s/usr/share/calamares/modules/machineid.conf" % get.installDIR(), "symlink: true", "symlink: false")
system/installer/Calamares/files/no_fsck_and_pymouth2.patch
+11
View File
@@ -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)
system/installer/Calamares/files/pisi_set_hostname2.patch
+12
View File
@@ -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
system/installer/Calamares/files/pisilocalayar.patch
+18 -17
View File
@@ -1,6 +1,6 @@
diff -Nuar calamares-3.2-rc3/src/modules/mudur/main.py calamares-3.2-rc31/src/modules/mudur/main.py diff -Nuar a/src/modules/mudur/main.py b/src/modules/mudur/main.py
--- calamares-3.2-rc3/src/modules/mudur/main.py 1969-12-31 19:00:00.000000000 -0500 --- a/src/modules/mudur/main.py 1970-01-01 02:00:00.000000000 +0200
+++ calamares-3.2-rc31/src/modules/mudur/main.py 2018-03-03 16:47:21.000000000 -0500 +++ b/src/modules/mudur/main.py 2020-03-21 13:48:02.731926493 +0300
@@ -0,0 +1,66 @@ @@ -0,0 +1,66 @@
+#!/usr/bin/env python3 +#!/usr/bin/env python3
+# -*- coding: utf-8 -*- +# -*- 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']) + libcalamares.utils.target_env_call(['chmod', '440', '/etc/sudoers'])
+ +
+ return None + return None
diff -Nuar calamares-3.2-rc3/src/modules/mudur/module.desc calamares-3.2-rc31/src/modules/mudur/module.desc diff -Nuar a/src/modules/mudur/module.desc b/src/modules/mudur/module.desc
--- calamares-3.2-rc3/src/modules/mudur/module.desc 1969-12-31 19:00:00.000000000 -0500 --- a/src/modules/mudur/module.desc 1970-01-01 02:00:00.000000000 +0200
+++ calamares-3.2-rc31/src/modules/mudur/module.desc 2018-02-24 08:15:23.000000000 -0500 +++ b/src/modules/mudur/module.desc 2020-03-21 13:49:51.631918635 +0300
@@ -0,0 +1,5 @@ @@ -0,0 +1,6 @@
+--- +---
+type: "job" +type: "job"
+name: "mudur" +name: "mudur"
+interface: "python" +interface: "python"
+script: "main.py" +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 diff -Nuar a/src/modules/packages/main.py b/src/modules/packages/main.py
+++ calamares-3.2-rc31/src/modules/packages/main.py 2018-03-03 16:45:20.000000000 -0500 --- a/src/modules/packages/main.py 2020-02-28 01:26:29.000000000 +0300
@@ -267,17 +267,17 @@ +++ b/src/modules/packages/main.py 2020-03-21 13:54:17.751899433 +0300
check_target_env_call(["emerge", "--sync"]) @@ -311,17 +311,17 @@
pass
-class PMEntropy(PackageManager): -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"]) - check_target_env_call(["equo", "update"])
+ pass + pass
def update_system(self):
class PMDummy(PackageManager): # Doesn't need to update the system explicitly
diff -Nuar calamares-3.2-rc3/src/modules/partition/gui/EncryptWidget.cpp calamares-3.2-rc31/src/modules/partition/gui/EncryptWidget.cpp diff -Nuar a/src/modules/partition/gui/EncryptWidget.cpp b/src/modules/partition/gui/EncryptWidget.cpp
--- calamares-3.2-rc3/src/modules/partition/gui/EncryptWidget.cpp 2018-01-30 05:26:29.000000000 -0500 --- a/src/modules/partition/gui/EncryptWidget.cpp 2020-02-28 01:26:29.000000000 +0300
+++ calamares-3.2-rc31/src/modules/partition/gui/EncryptWidget.cpp 2018-03-03 18:03:42.451021124 -0500 +++ b/src/modules/partition/gui/EncryptWidget.cpp 2020-03-21 13:57:03.877887447 +0300
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
m_passphraseLineEdit->hide(); m_passphraseLineEdit->hide();
m_confirmLineEdit->hide(); m_confirmLineEdit->hide();
system/installer/Calamares/files/pisilocalayar.patch.old2
+116
View File
@@ -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 - <http://github.com/calamares> ===
+#
+# Copyright 2014, Anke Boersma <demm@kaosx.us>
+# Copyright 2015, Philip Müller <philm@manjaro.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 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 );
system/installer/Calamares/pspec.xml
+6 -13
View File
@@ -11,7 +11,7 @@
<License>LGPLv2</License> <License>LGPLv2</License>
<Summary>A distribution independent installer framework</Summary> <Summary>A distribution independent installer framework</Summary>
<Description>Calamares is a distribution-independent system installer, with an advanced partitioning feature for both manual and automated partitioning operations.</Description> <Description>Calamares is a distribution-independent system installer, with an advanced partitioning feature for both manual and automated partitioning operations.</Description>
<Archive sha1sum="4c3fbb60f0844031e6669d0631b624b522f4a4ce" type="targz">https://github.com/calamares/calamares/archive/v3.2-rc3.tar.gz</Archive> <Archive sha1sum="6f23d53c68ca691dcbf6e1bdbd298c076b17e862" type="targz">https://github.com/calamares/calamares/archive/v3.2.20.tar.gz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>gettext-devel</Dependency> <Dependency>gettext-devel</Dependency>
<Dependency>yaml-cpp</Dependency> <Dependency>yaml-cpp</Dependency>
@@ -54,8 +54,8 @@
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<Patch level="1">pisilocalayar.patch</Patch> <Patch level="1">pisilocalayar.patch</Patch>
<Patch level="1">pisi_set_hostname.patch</Patch> <Patch level="1">pisi_set_hostname2.patch</Patch>
<Patch level="1">no_fsck_and_pymouth.patch</Patch> <Patch level="1">no_fsck_and_pymouth2.patch</Patch>
</Patches> </Patches>
</Source> </Source>
@@ -117,17 +117,10 @@
</Package> </Package>
<History> <History>
<Update release="15">
<Date>2020-03-20</Date>
<Version>3.2.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="14"> <Update release="14">
<Date>2019-02-15</Date> <Date>2020-03-21</Date>
<Version>3.2.0</Version> <Version>3.2.20</Version>
<Comment>Rebuild.</Comment> <Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name> <Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email> <Email>muscnsl@gmail.com</Email>
</Update> </Update>