Merge pull request #1072 from dbungert/core20-base
snapcraft: core20 base
This commit is contained in:
commit
46f671d14d
|
@ -0,0 +1,4 @@
|
|||
#!/bin/sh
|
||||
|
||||
export PYTHONPATH=$PYTHONPATH:$SNAP/lib/python3.8/site-packages
|
||||
$PYTHON -m subiquity.cmd.server
|
|
@ -1,5 +1,7 @@
|
|||
#!/bin/sh
|
||||
port=tty1
|
||||
export PYTHONPATH=$SNAP/lib/python3.8/site-packages
|
||||
|
||||
if [ -n "$1" ]; then
|
||||
port=$1
|
||||
fi
|
||||
|
@ -7,7 +9,7 @@ fi
|
|||
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
setup.py
2
setup.py
|
@ -111,10 +111,10 @@ setup(name='subiquity',
|
|||
'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',
|
||||
|
|
106
snapcraft.yaml
106
snapcraft.yaml
|
@ -1,5 +1,5 @@
|
|||
name: subiquity
|
||||
base: core18
|
||||
base: core20
|
||||
version: git
|
||||
summary: Ubuntu installer
|
||||
description: The Ubuntu server installer
|
||||
|
@ -20,7 +20,9 @@ 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
|
||||
|
@ -28,6 +30,7 @@ apps:
|
|||
environment:
|
||||
PYTHONIOENCODING: utf-8
|
||||
SUBIQUITY_ROOT: $SNAP
|
||||
PYTHON: $SNAP/usr/bin/python3.8
|
||||
|
||||
parts:
|
||||
curtin:
|
||||
|
@ -39,67 +42,80 @@ 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: python
|
||||
source-type: bzr
|
||||
source: lp:~ubuntu-core-dev/ubuntu/focal/apport/ubuntu
|
||||
build-packages:
|
||||
- python3-distutils-extra
|
||||
- python3-apt
|
||||
- python3-httplib2
|
||||
- python3-problem-report
|
||||
- python3-requests-unixsocket
|
||||
stage-packages:
|
||||
- python3-distutils-extra
|
||||
- python3-apt
|
||||
- python3-httplib2
|
||||
- python3-problem-report
|
||||
- python3-requests-unixsocket
|
||||
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-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
|
||||
- python3-bson
|
||||
- python3-urwid
|
||||
- python3-requests
|
||||
- python3-requests-unixsocket
|
||||
- ssh-import-id
|
||||
python-packages:
|
||||
- attrs
|
||||
- pyyaml==5.3.1
|
||||
- systemd-python
|
||||
- aiohttp
|
||||
- yarl==1.5.1
|
||||
#- 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"
|
||||
organize:
|
||||
'bin/console-conf-tui': usr/bin/console-conf
|
||||
'bin/subiquity-tui': usr/bin/subiquity
|
||||
'bin/subiquity-service': usr/bin/subiquity-service
|
||||
'bin/subiquity-server': usr/bin/subiquity-server
|
||||
|
@ -120,7 +136,6 @@ parts:
|
|||
build-packages:
|
||||
- console-setup
|
||||
- locales
|
||||
- xkb-data-i18n
|
||||
- python3-attr
|
||||
- python3-yaml
|
||||
override-build: PYTHONPATH=$SNAPCRAFT_PROJECT_DIR/ $SNAPCRAFT_PROJECT_DIR/scripts/make-kbd-info.py
|
||||
|
@ -146,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*
|
||||
|
|
Loading…
Reference in New Issue