-
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #104 from drauger-os-development/dev
Greater Wi-Fi card support, bug fixes, massive performance increases
- Loading branch information
Showing
49 changed files
with
474 additions
and
247 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| Package: edamame | ||
| Version: 2.7.8 | ||
| Version: 2.9.0 | ||
| Maintainer: Thomas Castleman <[email protected]> | ||
| Homepage: https://github.com/drauger-os-development/edamame | ||
| Section: admin | ||
| Architecture: amd64 | ||
| Priority: important | ||
| Replaces: system-installer (<=2.7.4) | ||
| Depends: arch-install-scripts, python3 (>=3.6.7-1~18.04), bash, gir1.2-gtk-3.0 (>=3.24.12-1ubuntu1), coreutils (>=8.28-1ubuntu1), apt (>=1.6.11), squashfs-tools (>=1:4.3-6ubuntu0.18.04.1), zenity (>=3.28.1-1), grub2-common (>=2.02-2ubuntu8.13), initramfs-tools (>=0.130ubuntu3.8), systemd (>=237-3ubuntu10.24), locales (>=2.27-3ubuntu1), procps (>=2:3.3.12-3ubuntu1.1), grep (>=3.1-2), keyboard-configuration, util-linux (>=2.34-0.1ubuntu2), python3-parted (>=3.11.2), python3-psutil (>=5.5.0), python3-apt (>=2.0.0), python3-urllib3 (>=1.26.5-1~exp1), python3-gnupg (>=0.4.5), python3-xmltodict (>=0.11.0), python3-dnspython, tzdata, laptop-detect (>=0.16) | ||
| Depends: arch-install-scripts, python3.11, bash, gir1.2-gtk-3.0 (>=3.24.12-1ubuntu1), coreutils (>=8.28-1ubuntu1), apt (>=1.6.11), squashfs-tools (>=1:4.3-6ubuntu0.18.04.1), grub2-common (>=2.02-2ubuntu8.13), initramfs-tools (>=0.130ubuntu3.8), systemd (>=237-3ubuntu10.24), locales (>=2.27-3ubuntu1), procps (>=2:3.3.12-3ubuntu1.1), grep (>=3.1-2), keyboard-configuration, util-linux (>=2.34-0.1ubuntu2), python3-parted (>=3.11.2), python3-psutil (>=5.5.0), python3-apt (>=2.0.0), python3-urllib3 (>=1.26.5-1~exp1), python3-gnupg (>=0.4.5), python3-xmltodict (>=0.11.0), python3-dnspython, tzdata, laptop-detect (>=0.16), libpython3.11 | ||
| Description: System Installation utility | ||
| System Installation utility for Debian-based Operating Systems. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| # Compilation options | ||
| global_options="--show-progress --show-memory --show-modules --remove-output" | ||
| mod_options="--no-pyi-file" | ||
| sa_options="--python-flag=no_site" | ||
| jobs=8 | ||
|
|
||
| # The below files will be compiled with Nuitka | ||
|
|
||
| # Edamame core files | ||
| mod usr/share/edamame/common.py | ||
| mod usr/share/edamame/auto_partitioner.py | ||
|
|
||
| # Edamame Module files | ||
| mod usr/share/edamame/modules/make_swap.py | ||
| mod usr/share/edamame/modules/set_time.py | ||
| mod usr/share/edamame/modules/auto_login_set.py | ||
| mod usr/share/edamame/modules/common.py | ||
| mod usr/share/edamame/modules/auto_partitioner.py | ||
|
|
||
| # UI files | ||
| mod usr/share/edamame/UI/common.py | ||
| mod usr/share/edamame/UI/auto_partitioner.py | ||
| mod usr/share/edamame/UI/main.py | ||
|
|
||
| # OEM files | ||
| mod usr/share/edamame/oem/auto_partitioner.py | ||
| mod usr/share/edamame/oem/post_install/configure/set_time.py | ||
| mod usr/share/edamame/oem/post_install/configure/auto_login_set.py | ||
|
|
||
| # Other files | ||
| mod usr/lib/python3/dist-packages/de_control/__init__.py | ||
| mod usr/lib/python3/dist-packages/de_control/_common.py | ||
| mod usr/lib/python3/dist-packages/de_control/immersion.py | ||
| mod usr/lib/python3/dist-packages/de_control/modify.py |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "rtl8111b": "r8168-dkms", | ||
| "rtl8111c": "r8168-dkms", | ||
| "rtl8111d": "r8168-dkms", | ||
| "rtl8111e": "r8168-dkms", | ||
| "rtl8111f": "r8168-dkms", | ||
| "rtl8111g(s)": "r8168-dkms", | ||
| "rtl8111h(s)": "r8168-dkms", | ||
| "rtl8118(a)(s)": "r8168-dkms", | ||
| "rtl8119i": "r8168-dkms", | ||
| "rtl8111l": "r8168-dkms", | ||
| "rtl8168b": "r8168-dkms", | ||
| "rtl8168e": "r8168-dkms", | ||
| "rtl8168h": "r8168-dkms", | ||
| "rtl8111dp": "r8168-dkms", | ||
| "rtl8111ep": "r8168-dkms", | ||
| "rtl8111fp": "r8168-dkms", | ||
| "rtl8411": "r8168-dkms", | ||
| "rtl8411b": "r8168-dkms", | ||
| "rtl8821ce": "rtl8821ce-dkms" | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| #!/usr/bin/bash | ||
| # Use this file to parse compile.conf, compile the files listed inside, then remove the source files | ||
| # This process requires Nuitka. | ||
|
|
||
| ### SETUP ### | ||
|
|
||
| if $(echo "$*" | grep -qE "\-\-help|\-h"); then | ||
| echo -e "Nuitka Compile Script, v0.0.5 | ||
| \t--dry-run Print what would be run if fully ran. | ||
| \t--force, -f Force running on raw Git repo. (Risk of potential data loss) | ||
| \t--help, -h Print this help dialog and exit. | ||
| \t--preserve-source Build, but do not delete source files after build. | ||
| \t--python-ver={python version} Compile with this Python version. If not used, will use the default system version. | ||
| " | ||
| exit | ||
| fi | ||
|
|
||
| if $(echo "$*" | grep -qE "\-\-dry\-run"); then | ||
| echo "NOTE: DRY RUN MODE ENGAGED!" | ||
| dry_run=1 | ||
| else | ||
| dry_run=0 | ||
| fi | ||
|
|
||
| if $(ls -a | grep -q ".git"); then | ||
| echo "ERROR: RUNNING ON RAW GIT REPOSITORY" | ||
| if $(echo "$*" | grep -qE "\-\-force|\-f"); then | ||
| echo "NOTE: OVERRIDING ERROR!!!!!" | ||
| echo "IF THIS IS A MISTAKE, RUN \`git reset --hard' to recover any lost data." | ||
| else | ||
| echo "EXITING TO PROTECT DATA!" | ||
| exit 1 | ||
| fi | ||
| fi | ||
|
|
||
| if $(echo "$*" | grep -qE "\-\-python\-ver"); then | ||
| for each in "$*"; do | ||
| if $(echo "$each" | grep -qE "\-\-python\-ver"); then | ||
| python_ver=$(echo "$each" | sed 's/=/ /g' | awk '{print $2}' | sed 's/python//g') | ||
| which python${python_ver} 1>/dev/null 2>/dev/null | ||
| if [ "$?" != "0" ]; then | ||
| echo "ERROR: Python version $python_ver not found. Defaulting to default system version." | ||
| python_ver="" | ||
| fi | ||
| break | ||
| fi | ||
| done | ||
| fi | ||
| if [ "$python_ver" == "" ]; then | ||
| python_ver=$(file $(which python3) | awk '{print $5}' | sed 's/python//g') | ||
| fi | ||
| pyver="python${python_ver}" | ||
|
|
||
| which nuitka 1>/dev/null 2>/dev/null | ||
| if [ "$?" == "1" ]; then | ||
| which nuitka3 1>/dev/null 2>/dev/null | ||
| if [ "$?" == "1" ]; then | ||
| echo "FATAL ERROR: Nuitka not found. Please install Nuitka from your package manager." | ||
| exit 2 | ||
| else | ||
| nuitka_command=$(which nuitka3) | ||
| fi | ||
| else | ||
| nuitka_command=$(which nuitka) | ||
| fi | ||
|
|
||
| # Read and parse settings file | ||
| settings=$(grep -v "^#" compile.conf) | ||
| module_files=$(echo "$settings" | grep "^mod " | awk '{print $2}') | ||
| module_settings=$(echo "$settings" | grep "^mod_options=" | sed 's/mod_options=//g' | sed 's/"//g') | ||
| standalone_files=$(echo "$settings" | grep "^sa " | awk '{print $2}') | ||
| standalone_settings=$(echo "$settings" | grep "^sa_options=" | sed 's/sa_options=//g' | sed 's/"//g') | ||
| global_settings=$(echo "$settings" | grep "^global_options=" | sed 's/global_options=//g' | sed 's/"//g') | ||
| job_count=$(echo "$settings" | grep "^jobs=" | sed 's/jobs=//g' | sed 's/"//g') | ||
|
|
||
| # Get Python version | ||
| if $(echo "$*" | grep -qE "\-\-python\-version"); then | ||
| for each in "$*"; do | ||
| if $(echo "$each" | grep -q "\-\-python\-version"); then | ||
| py_vert=$(echo "$each" | sed 's/=/ /g' | awk '{print $2}') | ||
| py_command="python$py_vert" | ||
| fi | ||
| done | ||
| if [ "$py_command" == "python" ]; then | ||
| py_command="" | ||
| else | ||
| echo "NOTE: USING PYTHON $py_vert!" | ||
| py_command=$py_command -m | ||
| fi | ||
| fi | ||
|
|
||
| ### COMPILATION ### | ||
|
|
||
| # Compile Modules | ||
| if [ "$module_files" != "" ]; then | ||
| if [ "$dry_run" == "0" ]; then | ||
| for each in $module_files; do | ||
| name=${each##*/} | ||
| echo -e "\t\t\t### BUILDING $name ###" | ||
| $pyver $nuitka_command --module $global_settings $module_settings $each | ||
| dest=${each%/*} | ||
| source=$(ls ${name%.py}*.so) | ||
| mv -v "$source" "$dest" | ||
| done | ||
| else | ||
| echo "Would run: $pyver $nuitka_command --module $global_settings $module_settings" | ||
| echo "On each of: $module_files" | ||
| fi | ||
| else | ||
| echo "NOTE: No module files defined for compilation. Skipping module compilation..." | ||
| fi | ||
|
|
||
| # Compile StandAlone | ||
| # Compile Modules | ||
| if [ "$sa_files" != "" ]; then | ||
| if [ "$dry_run" == "0" ]; then | ||
| $pyver $nuitka_command --standalone $global_settings $standalone_settings $standalone_files | ||
| else | ||
| echo "Would run: $pyver $nuitka_command --standalone $global_settings $standalone_settings $standalone_files" | ||
| fi | ||
| else | ||
| echo "NOTE: No standalone files defined for compilation. Skipping standalone compilation..." | ||
| fi | ||
|
|
||
| ### CLEAN UP ### | ||
| if [ "$dry_run" == "0" ]; then | ||
| if $(echo "$*" | grep -qE "\-\-preserve\-source"); then | ||
| echo "NOTE: Not deleting source files!" | ||
| else | ||
| rm -vf $module_files $standalone_files | ||
| fi | ||
| else | ||
| echo "Would run: rm -vf $module_files $standalone_files" | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.