Skip to content

Commit

Permalink
snapcraft: environment and package fixes
Browse files Browse the repository at this point in the history 
* adjust environment to set PYTHONPATH to pick up site-packages
* add more required packages
* add script for subiquity-server, and set PYTHONPATH there,
  so that the PYTHONPATH takes effect
  • Loading branch information
@dbungert
dbungert committed Oct 1, 2021
1 parent 8de369e commit be158a3
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 28 deletions.
4 changes: 4 additions & 0 deletions bin/subiquity-server
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh

export PYTHONPATH=$PYTHONPATH:$SNAP/lib/python3.8/site-packages
$PYTHON -m subiquity.cmd.server
6 changes: 4 additions & 2 deletions bin/subiquity-service
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
#!/bin/sh
port=tty1
export PYTHONPATH=$SNAP/lib/python3.8/site-packages

if [ -n "$1" ]; then
port=$1
fi
/bin/dmesg -n 1
if [ "$port" = "tty1" ]; then
$SNAP/bin/subiquity-loadkeys
setfont $SNAP/subiquity.psf
exec /sbin/agetty -n --noclear -l $SNAP/usr/bin/python3 -o $SNAP/usr/bin/subiquity $port $TERM
exec /sbin/agetty -n --noclear -l $PYTHON -o $SNAP/usr/bin/subiquity $port $TERM
else
exec /sbin/agetty -n --keep-baud -l $SNAP/usr/bin/python3 -o "$SNAP/usr/bin/subiquity --serial" $port 115200,38400,9600 $TERM
exec /sbin/agetty -n --keep-baud -l $PYTHON -o "$SNAP/usr/bin/subiquity --serial" $port 115200,38400,9600 $TERM
fi
2 changes: 1 addition & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,10 @@ class build(distutils.command.build.build):
'bin/subiquity-configure-apt',
'bin/subiquity-loadkeys',
'bin/subiquity-service',
'bin/subiquity-server',
],
entry_points={
'console_scripts': [
'subiquity-server = subiquity.cmd.server:main',
'subiquity-tui = subiquity.cmd.tui:main',
'console-conf-tui = console_conf.cmd.tui:main',
'system-setup-server = system_setup.cmd.server:main',
Expand Down
92 changes: 67 additions & 25 deletions snapcraft.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,17 @@ apps:
environment:
PYTHONIOENCODING: utf-8
SUBIQUITY_ROOT: $SNAP
PYTHON: $SNAP/usr/bin/python3
PYTHON: $SNAP/usr/bin/python3.8
PY3OR2_PYTHON: $SNAP/usr/bin/python3.8
PATH: $PATH:$SNAP/bin
subiquity-service:
command: usr/bin/subiquity-service
daemon: simple
restart-condition: always
environment:
PYTHONIOENCODING: utf-8
SUBIQUITY_ROOT: $SNAP
PYTHON: $SNAP/usr/bin/python3.8

parts:
curtin:
Expand All @@ -39,55 +42,79 @@ parts:
source-type: git
source: https://git.launchpad.net/curtin
source-commit: 809817fdac257de1769e385a42aeaf3d5bcc2c60
build-packages:
- shared-mime-info
- zlib1g-dev
python-packages:
- pyyaml==5.3.1
- oauthlib
- jsonschema
- pyrsistent
- wheel
- setuptools
- pip
- bson
- urwid
- requests
- requests-unixsocket
organize:
'lib/python*/site-packages/usr/lib/curtin': 'usr/lib/'
stage:
- "*"
- "-lib/python*/site-packages/_yaml.*.so"
- "-lib/python*/site-packages/setuptools"
- "-lib/python*/site-packages/pip"
- "-lib/python*/site-packages/pkg_resources"
- "-lib/python*/site-packages/jsonschema"
apport:
plugin: nil
stage-packages:
- apport
stage:
- "lib/python*/site-packages/"
- "-lib/python*/site-packages/etc/*"
- "-lib/python*/site-packages/lib/*"
- "share/apport/general-hooks/"
- "usr/"
- "-lib/python*/site-packages/wheel*"
- "-lib/python*/site-packages/probert"
- "-bin/activate*"
- "-lib/python3.8/site-packages/__pycache__/six.cpython*"
- "-lib/python3.8/site-packages/pip-*.dist-info/RECORD"
- "-lib/python3.8/site-packages/wheel-*.dist-info/RECORD"
- "-lib/python3.8/site-packages/_distutils_hack"
subiquity:
plugin: python
build-packages:
- gettext
- libsystemd-dev
- lsb-release
- pkg-config
- python3-venv
- python3-yaml
- python3-attr
- python3-systemd
- python3-aiohttp
- python3-yarl
- python3-urwid
- python3-bson
- python3-requests-unixsocket
- python3-requests
stage-packages:
- cloud-init
- libsystemd0
- iso-codes
- lsb-release
- ssh-import-id
python-packages:
- attrs
- pyyaml==5.3.1
- systemd-python
- aiohttp
- yarl==1.5.1
- urwid
- requests
- bson
- requests-unixsocket
#- urwid
- libpython3.8-minimal
- libpython3.8-stdlib
- libpython3-stdlib
- python3.8-minimal
- python3-minimal
- python3-yaml
- python3-apport
- python3-attr
- python3-systemd
- python3-aiohttp
- python3-yarl
- python3-urwid
- python3-bson
- python3-requests-unixsocket
- python3-requests
- python3-pyudev
source: .
source-type: git
build-environment:
PATH: "/usr/bin:$PATH"
- PATH: "/usr/bin:$PATH"
organize:
'bin/subiquity-tui': usr/bin/subiquity
'bin/subiquity-service': usr/bin/subiquity-service
Expand Down Expand Up @@ -134,10 +161,25 @@ parts:
$SNAPCRAFT_PROJECT_DIR/scripts/make-language-lists $SNAPCRAFT_PROJECT_DIR/po > $SNAPCRAFT_PART_INSTALL/languagelist
stage:
- languagelist

probert:
plugin: python
build-packages: [python-setuptools, build-essential, libnl-3-dev, libnl-genl-3-dev, libnl-route-3-dev]
build-packages:
- python-setuptools
- build-essential
- libnl-3-dev
- libnl-genl-3-dev
- libnl-route-3-dev
source: https://github.com/canonical/probert.git
source-type: git
source-commit: 2bb505172b5f97372eb1abd12ced4629e852504b
requirements: [requirements.txt]
stage:
- "*"
- -bin/python3*
- -bin/activate*
- -lib/python3.8/site-packages/_distutils_hack
- -lib/python3.8/site-packages/pip*
- -lib/python3.8/site-packages/pkg_resources
- -lib/python3.8/site-packages/setuptools
- -lib/python3.8/site-packages/wheel*

0 comments on commit be158a3

Please sign in to comment.