From 8de369ece2c49c470ad76667e9b15515d0e9825e Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Fri, 11 Jun 2021 15:38:54 +1200
Subject: [PATCH] snapcraft: change base to core20

---
 snapcraft.yaml | 32 ++++++++++----------------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index c8023500..8c4d0f56 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: subiquity
-base: core18
+base: core20
 version: git
 summary: Ubuntu installer
 description: The Ubuntu server installer
@@ -51,21 +51,9 @@ parts:
      - "-lib/python*/site-packages/_yaml.*.so"
      - "-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
+    plugin: nil
     stage-packages:
-      - python3-distutils-extra
-      - python3-apt
-      - python3-httplib2
-      - python3-problem-report
-      - python3-requests-unixsocket
+      - apport
     stage:
       - "lib/python*/site-packages/"
       - "-lib/python*/site-packages/etc/*"
@@ -78,16 +66,12 @@ parts:
       - libsystemd-dev
       - lsb-release
       - pkg-config
-      - python3-urwid
+      - python3-venv
     stage-packages:
       - cloud-init
       - libsystemd0
       - iso-codes
       - lsb-release
-      - python3-bson
-      - python3-urwid
-      - python3-requests
-      - python3-requests-unixsocket
       - ssh-import-id
     python-packages:
       - attrs
@@ -95,11 +79,16 @@ parts:
       - systemd-python
       - aiohttp
       - yarl==1.5.1
+      - urwid
+      - requests
+      - bson
+      - requests-unixsocket
       #- urwid
     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 +109,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