Skip to content

Refactor to move Bluetooth Python packages to Core deps #176

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.

Sign up for GitHub

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

Draft
NeonDaniel wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

Refactor to move Bluetooth Python packages to Core deps #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...yBluez-0.23-cp310-cp310-linux_aarch64.whl → ...yBluez-0.23-cp310-cp310-linux_aarch64.whl
View file
Open in desktop
File renamed without changes.
0 ...65f88f0e750c9bb370c181f1ab40a/origin.json → ...65f88f0e750c9bb370c181f1ab40a/origin.json
View file
Open in desktop
File renamed without changes.
Binary file removed ...34509a9cc08470980d68fbfc972bd22a45c3f306d6/PyGObject-3.44.1-cp310-cp310-linux_aarch64.whl
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion ....cache/pip/wheels/33/99/2c/061d0c6934509a9cc08470980d68fbfc972bd22a45c3f306d6/origin.json
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions recipes/41-install-neon-core.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@ actions:
- unzip
- ffmpeg
- make
- action: apt
description: Install Audio Receiver Dependencies
packages:
- "bluez*" # Bluetooth
- libbluetooth-dev
- libcairo2-dev
- libgirepository1.0-dev
- action: overlay
description: Neon Core Overlay
source: ../overlays/41-neon-core
Expand Down
3 changes: 0 additions & 3 deletions recipes/46-audio-receiver.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ actions:
- curl
- uxplay # AirPlay
- kdeconnect # KDE Connect
- "bluez*" # Bluetooth
- libbluetooth-dev
- libcairo2-dev
- pulseaudio-module-bluetooth # PulseAudio Bluetooth Module
- action: overlay
description: Audio receiver scripts, configs, and service files
Expand Down
6 changes: 3 additions & 3 deletions scripts/41-install-neon-core.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ rm /boot/firmware/overlays/sj201-rev10-pwm-fan-overlay.dtbo
# Configure venv for deepspeech compat.
python3.10 -m venv "/home/neon/venv" || exit 10
. /home/neon/venv/bin/activate
pip install --upgrade pip wheel
pip install --upgrade pip wheel setuptools

mv /home/neon/pip /home/neon/venv/bin/pip
chmod ugo+x /home/neon/venv/bin/pip

# Install core and skills
export NEON_IN_SETUP="true"
# TODO: Normalize extras after NeonCore 24.2.x stable release
pip install --use-pep517 "neon-core[core_modules,skills_required,skills_essential,skills_default,skills_extended,pi] @ git+https://github.com/neongeckocom/neoncore@${CORE_REF}" || exit 11
pip install --use-pep517 "neon-core[core-modules,skills-required,skills-essential,skills-default,skills-extended,pi,audio-receiver] @ git+https://github.com/neongeckocom/neoncore@${CORE_REF}" || exit 11
echo "Core Installed"
neon install-default-skills && echo "Default git skills installed" || exit 2

Expand Down
7 changes: 0 additions & 7 deletions scripts/46-audio-receiver.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,5 @@ systemctl enable raspotify.service
systemctl enable update_bt_config.service

# Fix permissions
chown -R neon:neon /home/neon/.cache
chmod +x /opt/neon/*.sh

# Install packages for Bluetooth pairing script
# TODO: Python packages to NeonCore dependencies(?)
if [ -e /home/neon/venv/bin/python ]; then
/home/neon/venv/bin/python -m pip install /home/neon/.cache/pip/wheels/5a/83/f3/aa5c753e241ee76cc586065f88f0e750c9bb370c181f1ab40a/PyBluez-0.23-cp310-cp310-linux_aarch64.whl
/home/neon/venv/bin/python -m pip install /home/neon/.cache/pip/wheels/33/99/2c/061d0c6934509a9cc08470980d68fbfc972bd22a45c3f306d6/PyGObject-3.44.1-cp310-cp310-linux_aarch64.whl
fi