From 874b525b6f41ef15c95b6d020ffa576158d31b8b Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Thu, 16 Apr 2020 16:41:46 +1200
Subject: [PATCH 1/2] stop staging libc6 now we are core18 based

---
 snapcraft.yaml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 4c58d992..dfe1bcef 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -36,8 +36,6 @@ parts:
      - "*"
      - "-lib/python*/site-packages/_yaml.*.so"
      - "-lib/python*/site-packages/jsonschema"
-    stage-packages:
-     - libc6
   apport:
     plugin: python
     source-type: bzr
@@ -70,7 +68,6 @@ parts:
       - python3-urwid
     stage-packages:
       - cloud-init
-      - libc6
       - libsystemd0
       - iso-codes
       - lsb-release
@@ -103,7 +100,6 @@ parts:
         debconf-communicate user-setup | \
         cut -d ' ' -f 2- > $SNAPCRAFT_PART_INSTALL/users-and-groups
       cp /usr/lib/user-setup/reserved-usernames $SNAPCRAFT_PART_INSTALL/
-    stage-packages: [libc6]
     stage:
       - users-and-groups
       - reserved-usernames
@@ -113,7 +109,6 @@ parts:
       - console-setup
       - locales
       - xkb-data-i18n
-    stage-packages: [libc6]
     override-build: |
       /usr/share/console-setup/kbdnames-maker /usr/share/console-setup/KeyboardNames.pl > $SNAPCRAFT_PART_INSTALL/kbdnames.txt
     stage:
@@ -128,7 +123,7 @@ parts:
   probert:
     plugin: python
     build-packages: [python-setuptools, libnl-3-dev, libnl-genl-3-dev, libnl-route-3-dev]
-    stage-packages: [libc6, libnl-3-dev, libnl-genl-3-dev, libnl-route-3-dev]
+    stage-packages: [libnl-3-dev, libnl-genl-3-dev, libnl-route-3-dev]
     source: https://github.com/CanonicalLtd/probert.git
     source-type: git
     source-commit: 4793e16ea1c397c44e115dc90eafa60df0947d5c

From 73d1136eeeae47ca39218a0f35aa148672814015 Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Fri, 24 Apr 2020 13:43:31 +1200
Subject: [PATCH 2/2] do not stage libnl* packages, they are in the core snap

---
 snapcraft.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index dfe1bcef..447e965a 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -123,7 +123,6 @@ parts:
   probert:
     plugin: python
     build-packages: [python-setuptools, libnl-3-dev, libnl-genl-3-dev, libnl-route-3-dev]
-    stage-packages: [libnl-3-dev, libnl-genl-3-dev, libnl-route-3-dev]
     source: https://github.com/CanonicalLtd/probert.git
     source-type: git
     source-commit: 4793e16ea1c397c44e115dc90eafa60df0947d5c