Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New PR for astroarch-onboarding #3

Open
wants to merge 31 commits into
base: calamares
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
750a961
Using QT6 and installing packages in CMakelists.txt. Configuring sett…
sc74 Mar 17, 2024
d40c4a1
slide activation
sc74 Mar 17, 2024
4258ab4
Add shellprocess-final.conf file in shellprocess folder to run update…
sc74 Mar 17, 2024
b1c3a76
Add folder src/.astroarch for the update.zsh script to be placed in /…
sc74 Mar 17, 2024
f9b28f4
adding path to netinstall-software.yaml file
sc74 Mar 17, 2024
5bbde81
Deletion of plasma file for locales
sc74 Mar 18, 2024
2648843
Revert "Deletion of plasma file for locales"
sc74 Mar 18, 2024
59fa1ac
Deletion of plasma file for locales
sc74 Mar 18, 2024
5116012
Calamares_AstroArch full version, install system for users. To be tes…
sc74 Mar 30, 2024
4f4b32a
Add gps-ublox and minor changes
sc74 Apr 14, 2024
12d583a
Add informations panel for users
sc74 Apr 28, 2024
8d193b3
Add power supplies panel
sc74 Apr 28, 2024
2b07037
add pictures branding
sc74 Jun 6, 2024
fa29752
update shellprocess-final
sc74 Sep 25, 2024
b7d56bc
reduction of files and configurations
sc74 Sep 26, 2024
ae139c4
reduction of files and configurations-2
sc74 Sep 26, 2024
a9f7b2d
update file for build make.sh
sc74 Sep 26, 2024
24bb1e7
update file netinstall_software.yaml
sc74 Sep 26, 2024
186bb5d
update file run-astroarch-onboarding.sh
sc74 Sep 27, 2024
d2bd1ff
update before installing package
sc74 Sep 27, 2024
8f1e410
Update for startup and remove files
sc74 Sep 27, 2024
61dc9d0
Set/Unset privileges and remove autostart file
sc74 Sep 27, 2024
b9d04db
Start sudo AstroArch-onboarding.desktop
sc74 Sep 27, 2024
3b9649d
Allow pkexec with no password for calamares
sc74 Sep 27, 2024
eb49cc6
update astroarch-onboarding.desktop
sc74 Sep 27, 2024
83491c6
update astroarch-onboarding.desktop
sc74 Sep 27, 2024
a4b1b89
update files run-astroarch-onboarding.sh shellprocess-final.conf
sc74 Sep 29, 2024
625c976
New fork with all changes following an update issue
sc74 Oct 4, 2024
b1cf7ee
Delete modules
sc74 Oct 4, 2024
0899084
update images
sc74 Oct 26, 2024
952c7b8
add url in readme.qml
sc74 Oct 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ set(CALAMARES_SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
#
option(INSTALL_POLKIT "Install Polkit configuration" ON)
option(INSTALL_COMPLETION "Install shell completions" OFF)
option(INSTALL_CONFIG "Install configuration files" OFF)
option(INSTALL_CONFIG "Install configuration files" ON)
# When adding WITH_* that affects the ABI offered by libcalamares,
# also update libcalamares/CalamaresConfig.h.in
option(WITH_PYBIND11 "Use bundled pybind11 instead of Boost::Python" ON)
option(WITH_PYTHON "Enable Python modules API." ON)
option(WITH_QML "Enable QML UI options." ON)
option(WITH_QT6 "Use Qt6 instead of Qt5" OFF)
option(WITH_QT6 "Use Qt6 instead of Qt5" ON)
#
# Additional parts to build that do not affect ABI
option(BUILD_SCHEMA_TESTING "Enable schema-validation-tests" ON)
Expand Down
5 changes: 5 additions & 0 deletions make-test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
mkdir -p build
cd build
cmake -DCMAKE_BUILD_TYPE=Debug -DWITH_QT6=ON ..
make -j$(nproc)
#sudo make install
5 changes: 5 additions & 0 deletions make.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
mkdir -p build
cd build
cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -DWITH_QT6=ON -DINSTALL_CONFIG=ON ..
make -j$(nproc)
sudo make install
32 changes: 32 additions & 0 deletions packagechooser_id
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
- id: stable
name: "Astro_stable"
description: "Kstars / Indi stable."
screenshot: ":/images/kstars_indi.jpg"
netinstall:
name: "Stable"
description: "Kstars-indi stable"
hidden: false
selected: true
critical: false
expanded: true
packages:
- kstars
- libindi
- indi-3rdparty-drivers
- indi-3rdparty-libs
- id: bleeding
name: "Astro_bleeding"
description: "Kstras / Indi bleeding"
screenshot: ":/images/kstars_indi_bleeding.jpg"
netinstall:
name: "Bleeding"
description: "Kstars-indi bleeding"
hidden: false
selected: true
critical: false
expanded: true
packages:
- kstars-git
- libindi-git
- indi-3rdparty-drivers-git
- indi-3rdparty-libs-git
51 changes: 49 additions & 2 deletions settings.conf
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,43 @@ modules-search: [ local ]
# module: packagechooserq
# config: licenseq.conf

instances:
- id: softwares
module: netinstall
config: netinstall-software.conf

- id: update
module: shellprocess
config: shellprocess-update.conf

- id: final
module: shellprocess
config: shellprocess-final.conf

- id: kstars_indi
module: packagechooserq
config: packagechooserq_kstars_indi.conf

- id: gps
module: packagechooser
config: packagechooser_gps.conf

- id: ftp
module: packagechooser
config: packagechooser_ftp.conf

- id: bluetooth
module: packagechooser
config: packagechooser_bluetooth.conf

- id: power
module: packagechooser
config: packagechooser_power.conf

- id: readme
module: notesqml
config: readme.conf

# Sequence section. This section describes the sequence of modules, both
# viewmodules and jobmodules, as they should appear and/or run.
#
Expand Down Expand Up @@ -117,11 +154,21 @@ sequence:
- welcome
- locale
- keyboard
- packagechooserq@kstars_indi
- netinstall@softwares
- packagechooser@gps
- packagechooser@ftp
- packagechooser@bluetooth
- packagechooser@power
- notesqml@readme
- exec:
- locale
- keyboard
- localecfg
- hwclock
- shellprocess@update
- contextualprocess
- packages
- shellprocess@final
- show:
- finished

Expand All @@ -137,7 +184,7 @@ sequence:
# here, Calamares then takes care of finding it and loading the contents.
#
# YAML: string.
branding: AstroArch
branding: astroarch

# If this is set to true, Calamares will show an "Are you sure?" prompt right
# before each execution phase, i.e. at points of no return. If this is set to
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[Desktop Entry]
Categories=Qt;System;
Comment[en_US]=AstroArch - configure system
Comment=AstroArch - configure system
Exec=pkexec calamares
GenericName[en_US]=AstroArch onboarding
GenericName=AstroArch onboarding
Icon=calamares
Keywords=calamares;system;configurer;
MimeType=
Name[en_US]=AstroArch onboarding
Name=AstroArch onboarding
Path=
StartupNotify=true
Terminal=false
TerminalOptions=\s--noclose
TryExec=calamares
Type=Application
Version=1.0
X-AppStream-Ignore=true
X-KDE-SubstituteUID=false
X-KDE-Username=
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- SPDX-FileCopyrightText: no
SPDX-License-Identifier: CC0-1.0
-->
<!DOCTYPE policyconfig PUBLIC
"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
<policyconfig>

<vendor>Calamares</vendor>
<vendor_url>https://github.com/calamares</vendor_url>

<action id="com.github.calamares.calamares.pkexec.run">
<description>Run Installer</description>
<message>Authentication is required to run the installation program</message>
<icon_name>drive-harddisk</icon_name>
<defaults>
<allow_any>yes</allow_any>
<allow_inactive>yes</allow_inactive>
<allow_active>yes</allow_active>
</defaults>
<annotate key="org.freedesktop.policykit.exec.path">/usr/bin/calamares</annotate>
<annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
</action>
</policyconfig>
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
- name: "Astronomy"
description: "Astronomy softwares"
hidden: false
selected: false
critical: false
expanded: true
subgroups:
- name: "Siril"
description: "Siril is an astronomical image processing tool"
selected: false
packages:
- siril
- name: "Firecapture"
description: "FireCapture is a free JAVA-based software package primarily intended for planetary and lunar image capture"
selected: false
packages:
- firecapture
- name: "Libcamera"
description: "A complex camera support library"
selected: false
packages:
- libcamera
- name: "Rpicam-apps"
description: "This is a small suite of libcamera-based applications to drive the cameras on a Raspberry Pi platform"
selected: false
packages:
- rpicam-apps
- name: "Indi-pylibcamera"
description: "This project implements a Raspberry Pi camera driver for INDI"
selected: false
packages:
- pylibcamera
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/bin/sh

# Add folders to .astroarch
cp -R "/usr/share/calamares/.astroarch/configs/calamares_astroarch" "/home/astronaut/.astroarch/configs/"
cp -R "/usr/share/calamares/.astroarch/plugins/power_max_current" "/home/astronaut/.astroarch/plugins/"

# Link folders to root folder
rm -f /root/.oh-my-zsh
ln -s /home/astronaut/.oh-my-zsh /root
rm -f /root/.astroarch
ln -s /home/astronaut/.astroarch /root
rm -f /root/.zshrc
ln -s /home/astronaut/.astroarch/configs/.zshrc /root/.zshrc
chsh -s /usr/bin/zsh root

# link to folder autostart
ln -s /usr/share/calamares/.astroarch/configs/calamares_astroarch/AstroArch-onboarding.desktop /home/astronaut/.config/autostart/AstroArch-onboarding.desktop

# Allow root access with no password to astroarch-onboarding.desktop
rm -f /usr/share/polkit-1/actions/com.github.calamares.calamares.policy
ln -s /usr/share/calamares/.astroarch/configs/calamares_astroarch/com.github.calamares.calamares.policy /usr/share/polkit-1/actions/com.github.calamares.calamares.policy
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
function power_max_current()
{
if grep 'usb_max_current_enable=1' /boot/config.txt > /dev/null ; then
echo "Maximum current is already activated"
else
sudo sed -i '$ausb_max_current_enable=1' /boot/config.txt
echo "Maximum current activation for the Pi 5 USB ports is done after restart"
fi
}

Loading