snap: update and cleanup snapcraft.yaml

A couple of issues fixed:

- put snapcraft.yaml in the snap directory so it is
  picked up by snapcraft when run from the project root.
- use snap/local for local snapcraft assets.
- setup.py.in should not add root for sdist targets
- cleanup snap/README.md.
- re-arrange parts in snapcraft.yaml and move to python3.

Signed-off-by: Sergio Schvezov <[email protected]>

Author: Sergio Schvezov

snapcraft/README.md snap/README.mdsnapcraft/README.md renamed to snap/README.md

@@ -5,31 +5,28 @@ creating efficient kernel tracing and manipulation programs.
 
 First, install snapcraft, e.g. on Ubuntu:
 
-sudo apt install snapcraft
+sudo snap install snapcraft --classic
 
 Clone the bcc repo (if you haven't done so already) and create the snap:
 
-git clone https://github.com/iovisor/bcc.git
-cd snapcraft
-make
+    git clone https://github.com/iovisor/bcc.git
+    snapcraft
 
-Note: running `make` just gets the version from the current bcc gito
-repository and uses this in the snapcraft yaml file to version the bcc
-snap. The Makefile basically runs snapcraft to snap up bcc.
+Install the snap by running (`--dangerous` is required as the snap is
+not coming from the Snap Store):
 
-Install the snap by running:
+    sudo snap install --dangerous bcc_*.snap
 
-sudo snap install --devmode bcc_*.snap
+One may need to ensure the snap interfaces are connected for the snap
+using:
 
-One may need to ensure the snap plugins are enabled for the snap using:
-
-sudo snap connect bcc:mount-observe
-sudo snap connect bcc:system-observe
-sudo snap connect bcc:system-trace
+    sudo snap connect bcc:mount-observe
+    sudo snap connect bcc:system-observe
+    sudo snap connect bcc:system-trace
 
 Now run a bcc tool, for example, to run opensnoop use:
 
-sudo bcc.opensnoop
+    sudo bcc.opensnoop
 
 Note that this may fail to build and run if you do not have the kernel
 headers installed or perhaps the kernel config is not set up correctly.

snapcraft/bcc-wrapper snap/local/bcc-wrappersnapcraft/bcc-wrapper renamed to snap/local/bcc-wrapper

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2016 Canonical
+# Copyright (C) 2016,2020 Canonical
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 name: bcc
-version: 0.9.0-20190318-2991-6cf63612
 summary: BPF Compiler Collection (BCC)
 description: A toolkit for creating efficient kernel tracing and manipulation programs
 confinement: strict
@@ -27,52 +26,70 @@ plugs:
     system-trace: null
 assumes: [snapd2.37]
 base: core18
+adopt-info: bcc
 
 parts:
     bcc:
         plugin: cmake
         override-pull: |
             snapcraftctl pull
-            find . -type f -exec sed -i 's|^#\!/usr/bin/python|#\!/usr/bin/env python|' {} \;
+
+            find . -type f -exec sed -i 's|^#\!/usr/bin/python|#\!/usr/bin/env python3|' {} \;
+
+            version=$(git tag | sort -V | tail -1 | cut -c2-)
+            commits=$(git log --oneline | wc -l)
+            sha=$(git log -1 --oneline | cut -d' ' -f1)
+            date=$(date +'%Y%m%d')
+            snapcraftctl set-version "$version-$date-$commits-$sha"
         configflags:
             - '-DCMAKE_INSTALL_PREFIX=/usr'
-        source: ..
-        source-type: git
-        stage-packages:
-            - libbz2-1.0
-            - liblzma5
-            - libncursesw5
-            - libtinfo5
-            - libzzip-0-13
+            - '-DPYTHON_CMD=$SNAPCRAFT_STAGE/usr/bin/python3'
+            - '-DCMAKE_VERBOSE_MAKEFILE=ON'
+        source: .
         build-packages:
             - bison
             - build-essential
-            - cmake
             - flex
+            - git
+            - iperf
+            - libclang-4.0-dev
             - libedit-dev
+            - libelf-dev
             - libllvm4.0
             - llvm-4.0-dev
-            - libclang-4.0-dev
-            - python
             - zlib1g-dev
-            - libelf-dev
-            - iperf
         prime:
-            - usr/share/bcc/tools
-            - usr/lib/python2.7
-            - usr/lib/*/lib*.so*
             - -usr/share/bcc/tools/doc
+            - usr/lib/*/lib*.so*
+            - usr/lib/python3
+            - usr/lib/python3.6*
+            - usr/share/bcc/tools
+        after:
+          - stage
 
-    python-deps:
-        plugin: python
-        python-version: python2
+    stage:
+        plugin: nil
+        stage-packages:
+            - libbz2-1.0
+            - liblzma5
+            - libncursesw5
+            - libtinfo5
+            - libzzip-0-13
+            - python3
+            - python3-distutils
+            - python3-distutils-extra
+            - python3-pip
+            - python3-setuptools
+        prime:
+            - -usr/lib/*/perl
+            - -usr/lib/*/perl5
+            - usr/bin
+            - usr/lib
 
     wrapper:
         plugin: dump
         after: [bcc]
-        source: .
-        organize:
-            wrapper: bin/bcc-wrapper
+        source: snap/local
 
 apps:
     argdist:

snapcraft/snapcraft.yaml snap/snapcraft.yamlsnapcraft/snapcraft.yaml renamed to snap/snapcraft.yaml

@@ -4,7 +4,8 @@ from distutils.core import setup
 import os
 import sys
 
-if os.environ.get('DESTDIR'):
+# sdist does not support --root.
+if "sdist" not in sys.argv and os.environ.get('DESTDIR'):
     sys.argv += ['--root', os.environ['DESTDIR']]
 
 setup(name='bcc',