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

calamares ver. bump

Browse Source
This commit is contained in:
Rmys
2023-10-31 14:54:34 +03:00
parent d2e0991bb3
commit c3cad0dda0
3 changed files with 66 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/installer/Calamares/actions.py
+4
View File
@@ -10,6 +10,10 @@ from pisi.actionsapi import shelltools
from pisi.actionsapi import get from pisi.actionsapi import get
def setup(): def setup():
shelltools.system("""sed -i 's|Fancy GNU/Linux 2020.2 LTS "Turgid Tuba"|Pisi GNU/Linux 2.3.4 LTS "Pisi Linux"|g' src/branding/default/branding.desc""")
shelltools.system("sed -i 's|2020.2|2.3.4|g' src/branding/default/branding.desc")
shelltools.system("sed -i 's|FancyGL|Pisilinux|g' src/branding/default/branding.desc")
shelltools.makedirs("build") shelltools.makedirs("build")
shelltools.cd("build") shelltools.cd("build")
system/installer/Calamares/files/pisilocalayar.patch
+29 -29
View File
@@ -1,6 +1,6 @@
diff -Nuar a/src/modules/mudur/main.py b/src/modules/mudur/main.py 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 --- 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 +++ b/src/modules/mudur/main.py 2021-10-30 12:34:17.000000000 +0300
@@ -0,0 +1,66 @@ @@ -0,0 +1,66 @@
+#!/usr/bin/env python3 +#!/usr/bin/env python3
+# -*- coding: utf-8 -*- +# -*- coding: utf-8 -*-
@@ -33,17 +33,17 @@ diff -Nuar a/src/modules/mudur/main.py b/src/modules/mudur/main.py
+def run(): +def run():
+ +
+ install_path = libcalamares.globalstorage.value("rootMountPoint") + install_path = libcalamares.globalstorage.value("rootMountPoint")
+ +
+ +
+ path = os.path.join(install_path, "etc/locale.conf") + path = os.path.join(install_path, "etc/locale.conf")
+ +
+ mloc = open(path,"r") + mloc = open(path,"r")
+ a=mloc.readline() + a=mloc.readline()
+ b=a.split("=")[1] + b=a.split("=")[1]
+ +
+ languages = b.split("_")[0] + languages = b.split("_")[0]
+ +
+ +
+ mudur_file_path = os.path.join(install_path, "etc/conf.d/mudur") + mudur_file_path = os.path.join(install_path, "etc/conf.d/mudur")
+ lines = [] + lines = []
+ for l in open(mudur_file_path, "r").readlines(): + for l in open(mudur_file_path, "r").readlines():
@@ -55,63 +55,63 @@ diff -Nuar a/src/modules/mudur/main.py b/src/modules/mudur/main.py
+ lines.append(l) + lines.append(l)
+ +
+ open(mudur_file_path, "w").writelines(lines) + open(mudur_file_path, "w").writelines(lines)
+ +
+ if os.path.exists(os.path.join(install_path, "etc/sudoers")): + if os.path.exists(os.path.join(install_path, "etc/sudoers")):
+ os.unlink(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") + source = os.path.join(install_path, "etc/sudoers.orig")
+ target = os.path.join(install_path, "etc/sudoers") + target = os.path.join(install_path, "etc/sudoers")
+ +
+ shutil.copy(source, target) + shutil.copy(source, target)
+ +
+ libcalamares.utils.target_env_call(['chmod', '440', '/etc/sudoers']) + libcalamares.utils.target_env_call(['chmod', '440', '/etc/sudoers'])
+ +
+ return None + return None
diff -Nuar a/src/modules/mudur/module.desc b/src/modules/mudur/module.desc 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 --- 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 +++ b/src/modules/mudur/module.desc 2021-10-30 12:34:17.000000000 +0300
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
+--- +---
+type: "job" +type: "job"
+name: "mudur" +name: "mudur"
+interface: "python" +interface: "python"
+script: "main.py" +script: "main.py"
+ +
diff -Nuar a/src/modules/packages/main.py b/src/modules/packages/main.py 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 --- a/src/modules/packages/main.py 2023-04-24 23:33:41.000000000 +0300
+++ b/src/modules/packages/main.py 2020-03-21 13:54:17.751899433 +0300 +++ b/src/modules/packages/main.py 2023-10-31 14:05:35.506720508 +0300
@@ -311,17 +311,17 @@ @@ -321,17 +321,17 @@
pass libcalamares.utils.debug("Dummy backend: Running script '" + str(script) + "'")
-class PMEntropy(PackageManager): -class PMEntropy(PackageManager):
- backend = "entropy" - backend = "entropy"
+class PMpisi(PackageManager): +class PMpisi(PackageManager):
+ backend = "pisi" + backend = "pisi"
def install(self, pkgs, from_local=False): def install(self, pkgs, from_local=False):
- check_target_env_call(["equo", "i"] + pkgs) - check_target_env_call(["equo", "i"] + pkgs)
+ check_target_env_call(["pisi", "it"] + pkgs) + check_target_env_call(["pisi", "it"] + pkgs)
def remove(self, pkgs): def remove(self, pkgs):
- check_target_env_call(["equo", "rm"] + pkgs) - check_target_env_call(["equo", "rm"] + pkgs)
+ check_target_env_call(["pisi", "rm","--ignore-comar"] + pkgs) + check_target_env_call(["pisi", "rm","--ignore-comar"] + pkgs)
def update_db(self): def update_db(self):
- check_target_env_call(["equo", "update"]) - check_target_env_call(["equo", "update"])
+ pass + pass
def update_system(self): def update_system(self):
# Doesn't need to update the system explicitly # Doesn't need to update the system explicitly
diff -Nuar a/src/modules/partition/gui/EncryptWidget.cpp b/src/modules/partition/gui/EncryptWidget.cpp diff -Nuar a/src/modules/partition/gui/EncryptWidget.cpp b/src/modules/partition/gui/EncryptWidget.cpp
--- a/src/modules/partition/gui/EncryptWidget.cpp 2020-03-28 01:43:50.000000000 +0300 --- a/src/modules/partition/gui/EncryptWidget.cpp 2023-04-24 23:33:41.000000000 +0300
+++ b/src/modules/partition/gui/EncryptWidget.cpp 2020-04-06 12:08:51.169929059 +0300 +++ b/src/modules/partition/gui/EncryptWidget.cpp 2023-10-31 14:07:10.411534035 +0300
@@ -36,6 +36,7 @@ @@ -45,6 +45,7 @@
m_ui->m_passphraseLineEdit->hide(); m_ui->m_passphraseLineEdit->hide();
m_ui->m_confirmLineEdit->hide(); m_ui->m_confirmLineEdit->hide();
m_ui->m_iconLabel->hide(); m_ui->m_iconLabel->hide();
+ m_ui->m_encryptCheckBox->hide(); + m_ui->m_encryptCheckBox->hide();
// TODO: this deserves better rendering, an icon or something, but that will
connect( m_ui->m_encryptCheckBox, &QCheckBox::stateChanged, this, &EncryptWidget::onCheckBoxStateChanged ); // depend on having a non-bogus implementation of systemSupportsEncryptionAcceptably
connect( m_ui->m_passphraseLineEdit, &QLineEdit::textEdited, this, &EncryptWidget::onPassphraseEdited ); if ( systemSupportsEncryptionAcceptably() )
system/installer/Calamares/pspec.xml
+33 -6
View File
@@ -11,14 +11,13 @@
<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="d387eb46c8713f15c173c9a287ded118b5e8436e" type="targz">https://github.com/calamares/calamares/archive/v3.2.39.3.tar.gz</Archive> <Archive sha1sum="d2a3a7b96531ba51ec2c569cab11aaa565970149" type="targz">https://github.com/calamares/calamares/archive/v3.2.62.tar.gz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>gettext-devel</Dependency> <Dependency>gettext-devel</Dependency>
<Dependency>yaml-cpp</Dependency> <Dependency>yaml-cpp</Dependency>
<Dependency versionFrom="1.60">boost-devel</Dependency> <Dependency versionFrom="1.83.0">boost-devel</Dependency>
<Dependency versionFrom="1.60">boost-python3</Dependency> <Dependency versionFrom="1.83.0">boost-python3</Dependency>
<Dependency>ki18n-devel</Dependency> <Dependency>ki18n-devel</Dependency>
<Dependency>kcoreaddons</Dependency>
<Dependency>solid-devel</Dependency> <Dependency>solid-devel</Dependency>
<Dependency>parted-devel</Dependency> <Dependency>parted-devel</Dependency>
<Dependency>qt5-linguist</Dependency> <Dependency>qt5-linguist</Dependency>
@@ -50,6 +49,10 @@
<Dependency>kservice-devel</Dependency> <Dependency>kservice-devel</Dependency>
<Dependency>kconfig-devel</Dependency> <Dependency>kconfig-devel</Dependency>
<Dependency>kparts-devel</Dependency> <Dependency>kparts-devel</Dependency>
<Dependency>kcrash-devel</Dependency>
<Dependency>kcompletion-devel</Dependency>
<Dependency>kbookmarks-devel</Dependency>
<Dependency>kwidgetsaddons-devel</Dependency>
<Dependency>plasma-framework-devel</Dependency> <Dependency>plasma-framework-devel</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
@@ -63,8 +66,8 @@
<Name>Calamares</Name> <Name>Calamares</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>libgcc</Dependency> <Dependency>libgcc</Dependency>
<Dependency versionFrom="1.60">boost</Dependency> <Dependency>boost</Dependency>
<Dependency versionFrom="1.60">boost-python3</Dependency> <Dependency>boost-python3</Dependency>
<Dependency>python3</Dependency> <Dependency>python3</Dependency>
<Dependency>kcrash</Dependency> <Dependency>kcrash</Dependency>
<Dependency>parted</Dependency> <Dependency>parted</Dependency>
@@ -98,6 +101,23 @@
<Dependency>kparts</Dependency> <Dependency>kparts</Dependency>
<Dependency>kpackage</Dependency> <Dependency>kpackage</Dependency>
<Dependency>calamares-theme-pisilinux</Dependency> <Dependency>calamares-theme-pisilinux</Dependency>
<Dependency>icu4c</Dependency>
<Dependency>kauth</Dependency>
<Dependency>libX11</Dependency>
<Dependency>sonnet</Dependency>
<Dependency>kcodecs</Dependency>
<Dependency>kxmlgui</Dependency>
<Dependency>yaml-cpp</Dependency>
<Dependency>kcompletion</Dependency>
<Dependency>kjobwidgets</Dependency>
<Dependency>ktextwidgets</Dependency>
<Dependency>libpwquality</Dependency>
<Dependency>qt5-location</Dependency>
<Dependency>kwindowsystem</Dependency>
<Dependency>kconfigwidgets</Dependency>
<Dependency>kwidgetsaddons</Dependency>
<Dependency>qt5-webchannel</Dependency>
<Dependency>plasma-framework</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="executable">/usr/bin</Path> <Path fileType="executable">/usr/bin</Path>
@@ -117,6 +137,13 @@
</Package> </Package>
<History> <History>
<Update release="20">
<Date>2023-10-29</Date>
<Version>3.2.62</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="19"> <Update release="19">
<Date>2021-10-30</Date> <Date>2021-10-30</Date>
<Version>3.2.39.3</Version> <Version>3.2.39.3</Version>