snapcraft: use new snapcraft rules to clean up wrapping of executables (#2056)

Snapcraft has an improved mechanism for wrapping python executables.
Remove all the older snapcraft legacy cruft and update for the new
snapcraft tooling.
Signed-off-by: Colin Ian King <colin.king@canonical.com>

snapcraft/Makefile

@@ -29,7 +29,7 @@ all: set_version
 	snapcraft
 
 set_version:
-	cat snapcraft.yaml | sed 's/version: .*/version: $(V)/' > snapcraft-tmp.yaml
+	cat snapcraft.yaml | sed 's/^version: .*/version: $(V)/' > snapcraft-tmp.yaml
 	mv snapcraft-tmp.yaml snapcraft.yaml
 
 install:

snapcraft/snapcraft.yaml

@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 name: bcc
-version: 0.3.0-20170401-1747-c5f48c9
+version: 0.7.0-20181122-2831-166fba57
 summary: BPF Compiler Collection (BCC)
 description: A toolkit for creating efficient kernel tracing and manipulation programs
 confinement: strict
@@ -26,349 +26,248 @@ plugs:
     system-observe: null
     system-trace: null
 assumes: [snapd2.23]
+
+parts:
+    bcc:
+        plugin: cmake
+        configflags:
+            - '-DCMAKE_INSTALL_PREFIX=/usr'
+        source: ..
+        source-type: git
+        build-packages:
+            - bison
+            - build-essential
+            - cmake
+            - flex
+            - libedit-dev
+            - libllvm4.0
+            - llvm-4.0-dev
+            - libclang-4.0-dev
+            - python
+            - zlib1g-dev
+            - libelf-dev
+            - iperf
+        stage-packages:
+            - libc6
+        prime:
+            - usr/share/bcc/tools
+            - usr/lib/*/lib*.so*
+            - usr/lib/python2.7
+
+            - -usr/share/bcc/tools/doc
+
+    python-deps:
+        plugin: python
+        python-version: python2
+        stage-packages:
+            - libc6
+
 apps:
     argdist:
-        command: wrapper argdist
-        aliases: [argdist]
+        command: usr/share/bcc/tools/argdist
     bashreadline:
-        command: wrapper bashreadline
-        aliases: [bashreadline]
+        command: usr/share/bcc/tools/bashreadline
     biolatency:
-        command: wrapper biolatency
-        aliases: [biolatency]
+        command: usr/share/bcc/tools/biolatency
     biosnoop:
-        command: wrapper biosnoop
-        aliases: [biosnoop]
+        command: usr/share/bcc/tools/biosnoop
     biotop:
-        command: wrapper biotop
-        aliases: [biotop]
+        command: usr/share/bcc/tools/biotop
     bitesize:
-        command: wrapper bitesize
-        aliases: [bitesize]
+        command: usr/share/bcc/tools/bitesize
     bpflist:
-        command: wrapper bpflist
-        aliases: [bpflist]
+        command: usr/share/bcc/tools/bpflist
     btrfsdist:
-        command: wrapper btrfsdist
-        aliases: [btrfsdist]
+        command: usr/share/bcc/tools/btrfsdist
     btrfsslower:
-        command: wrapper btrfsslower
-        aliases: [btrfsslower]
+        command: usr/share/bcc/tools/btrfsslower
     cachestat:
-        command: wrapper cachestat
-        aliases: [cachestat]
+        command: usr/share/bcc/tools/cachestat
     cachetop:
-        command: wrapper cachetop
-        aliases: [cachetop]
+        command: usr/share/bcc/tools/cachetop
     capable:
-        command: wrapper capable
-        aliases: [capable]
+        command: usr/share/bcc/tools/capable
     cobjnew:
-        command: wrapper cobjnew
-        aliases: [cobjnew]
+        command: usr/share/bcc/tools/cobjnew
     cpudist:
-        command: wrapper cpudist
-        aliases: [cpudist]
+        command: usr/share/bcc/tools/cpudist
     cpuunclaimed:
-        command: wrapper cpuunclaimed
-        aliases: [cpuunclaimed]
+        command: usr/share/bcc/tools/cpuunclaimed
     dbslower:
-        command: wrapper dbslower
-        aliases: [dbslower]
+        command: usr/share/bcc/tools/dbslower
     dbstat:
-        command: wrapper dbstat
-        aliases: [dbstat]
+        command: usr/share/bcc/tools/dbstat
     dcsnoop:
-        command: wrapper dcsnoop
-        aliases: [dcsnoop]
+        command: usr/share/bcc/tools/dcsnoop
     dcstat:
-        command: wrapper dcstat
-        aliases: [dcstat]
+        command: usr/share/bcc/tools/dcstat
     deadlock-detector:
-        command: wrapper deadlock_detector
-        aliases: [deadlock-detector]
+        command: usr/share/bcc/tools/deadlock_detector
     execsnoop:
-        command: wrapper execsnoop
-        aliases: [execsnoop]
+        command: usr/share/bcc/tools/execsnoop
     ext4dist:
-        command: wrapper ext4dist
-        aliases: [ext4dist]
+        command: usr/share/bcc/tools/ext4dist
     ext4slower:
-        command: wrapper ext4slower
-        aliases: [ext4slower]
+        command: usr/share/bcc/tools/ext4slower
     filelife:
-        command: wrapper filelife
-        aliases: [filelife]
+        command: usr/share/bcc/tools/filelife
     fileslower:
-        command: wrapper fileslower
-        aliases: [fileslower]
+        command: usr/share/bcc/tools/fileslower
     filetop:
-        command: wrapper filetop
-        aliases: [filetop]
+        command: usr/share/bcc/tools/filetop
     funccount:
-        command: wrapper funccount
-        aliases: [funccount]
+        command: usr/share/bcc/tools/funccount
     funclatency:
-        command: wrapper funclatency
-        aliases: [funclatency]
+        command: usr/share/bcc/tools/funclatency
     funcslower:
-        command: wrapper funcslower
-        aliases: [funcslower]
+        command: usr/share/bcc/tools/funcslower
     gethostlatency:
-        command: wrapper gethostlatency
-        aliases: [gethostlatency]
+        command: usr/share/bcc/tools/gethostlatency
     hardirqs:
-        command: wrapper hardirqs
-        aliases: [hardirqs]
+        command: usr/share/bcc/tools/hardirqs
     javacalls:
-        command: wrapper javacalls
-        aliases: [javacalls]
+        command: usr/share/bcc/tools/javacalls
     javaflow:
-        command: wrapper javaflow
-        aliases: [javaflow]
+        command: usr/share/bcc/tools/javaflow
     javagc:
-        command: wrapper javagc
-        aliases: [javagc]
+        command: usr/share/bcc/tools/javagc
     javaobjnew:
-        command: wrapper javaobjnew
-        aliases: [javaobjnew]
+        command: usr/share/bcc/tools/javaobjnew
     javastat:
-        command: wrapper javastat
-        aliases: [javastat]
+        command: usr/share/bcc/tools/javastat
     javathreads:
-        command: wrapper javathreads
-        aliases: [javathreads]
+        command: usr/share/bcc/tools/javathreads
     killsnoop:
-        command: wrapper killsnoop
-        aliases: [killsnoop]
+        command: usr/share/bcc/tools/killsnoop
     llcstat:
-        command: wrapper llcstat
-        aliases: [llcstat]
+        command: usr/share/bcc/tools/llcstat
     mdflush:
-        command: wrapper mdflush
-        aliases: [mdflush]
+        command: usr/share/bcc/tools/mdflush
     memleak:
-        command: wrapper memleak
-        aliases: [memleak]
+        command: usr/share/bcc/tools/memleak
     mountsnoop:
-        command: wrapper mountsnoop
-        aliases: [mountsnoop]
+        command: usr/share/bcc/tools/mountsnoop
     mysqld-qslower:
-        command: wrapper mysqld_qslower
-        aliases: [mysqld-qslower]
+        command: usr/share/bcc/tools/mysqld_qslower
     nfsdist:
-        command: wrapper nfsdist
-        aliases: [nfsdist]
+        command: usr/share/bcc/tools/nfsdist
     nfsslower:
-        command: wrapper nfsslower
-        aliases: [nfsslower]
+        command: usr/share/bcc/tools/nfsslower
     nodegc:
-        command: wrapper nodegc
-        aliases: [nodegc]
+        command: usr/share/bcc/tools/nodegc
     nodestat:
-        command: wrapper nodestat
-        aliases: [nodestat]
+        command: usr/share/bcc/tools/nodestat
     offcputime:
-        command: wrapper offcputime
-        aliases: [offcputime]
+        command: usr/share/bcc/tools/offcputime
     offwaketime:
-        command: wrapper offwaketime
-        aliases: [offwaketime]
+        command: usr/share/bcc/tools/offwaketime
     oomkill:
-        command: wrapper oomkill
-        aliases: [oomkill]
+        command: usr/share/bcc/tools/oomkill
     opensnoop:
-        command: wrapper opensnoop
-        aliases: [opensnoop]
+        command: usr/share/bcc/tools/opensnoop
     perlcalls:
-        command: wrapper perlcalls
-        aliases: [perlcalls]
+        command: usr/share/bcc/tools/perlcalls
     perlflow:
-        command: wrapper perlflow
-        aliases: [perlflow]
+        command: usr/share/bcc/tools/perlflow
     perlstat:
-        command: wrapper perlstat
-        aliases: [perlstat]
+        command: usr/share/bcc/tools/perlstat
     shmsnoop:
-        command: wrapper shmsnoop
-        aliases: [shmsnoop]
+        command: usr/share/bcc/tools/shmsnoop
     sofdsnoop:
-        command: wrapper sofdsnoop
-        aliases: [sofdsnoop]
+        command: usr/share/bcc/tools/sofdsnoop
     phpcalls:
-        command: wrapper phpcalls
-        aliases: [phpcalls]
+        command: usr/share/bcc/tools/phpcalls
     phpflow:
-        command: wrapper phpflow
-        aliases: [phpflow]
+        command: usr/share/bcc/tools/phpflow
     phpstat:
-        command: wrapper phpstat
-        aliases: [phpstat]
+        command: usr/share/bcc/tools/phpstat
     pidpersec:
-        command: wrapper pidpersec
-        aliases: [pidpersec]
+        command: usr/share/bcc/tools/pidpersec
     profile:
-        command: wrapper profile
-        aliases: [profile]
+        command: usr/share/bcc/tools/profile
     pythoncalls:
-        command: wrapper pythoncalls
-        aliases: [pythoncalls]
+        command: usr/share/bcc/tools/pythoncalls
     pythonflow:
-        command: wrapper pythonflow
-        aliases: [pythonflow]
+        command: usr/share/bcc/tools/pythonflow
     pythongc:
-        command: wrapper pythongc
-        aliases: [pythongc]
+        command: usr/share/bcc/tools/pythongc
     pythonstat:
-        command: wrapper pythonstat
-        aliases: [pythonstat]
+        command: usr/share/bcc/tools/pythonstat
     rubycalls:
-        command: wrapper rubycalls
-        aliases: [rubycalls]
+        command: usr/share/bcc/tools/rubycalls
     rubyflow:
-        command: wrapper rubyflow
-        aliases: [rubyflow]
+        command: usr/share/bcc/tools/rubyflow
     rubygc:
-        command: wrapper rubygc
-        aliases: [rubygc]
+        command: usr/share/bcc/tools/rubygc
     rubyobjnew:
-        command: wrapper rubyobjnew
-        aliases: [rubyobjnew]
+        command: usr/share/bcc/tools/rubyobjnew
     rubystat:
-        command: wrapper rubystat
-        aliases: [rubystat]
+        command: usr/share/bcc/tools/rubystat
     runqlat:
-        command: wrapper runqlat
-        aliases: [runqlat]
+        command: usr/share/bcc/tools/runqlat
     runqlen:
-        command: wrapper runqlen
-        aliases: [runqlen]
+        command: usr/share/bcc/tools/runqlen
     slabratetop:
-        command: wrapper slabratetop
-        aliases: [slabratetop]
+        command: usr/share/bcc/tools/slabratetop
     softirqs:
-        command: wrapper softirqs
-        aliases: [softirqs]
+        command: usr/share/bcc/tools/softirqs
     solisten:
-        command: wrapper solisten
-        aliases: [solisten]
+        command: usr/share/bcc/tools/solisten
     sslsniff:
-        command: wrapper sslsniff
-        aliases: [sslsniff]
+        command: usr/share/bcc/tools/sslsniff
     stackcount:
-        command: wrapper stackcount
-        aliases: [stackcount]
-    stacksnoop:
-        command: wrapper stacksnoop
-        aliases: [stacksnoop]
+        command: usr/share/bcc/tools/stackcount
     statsnoop:
-        command: wrapper statsnoop
-        aliases: [statsnoop]
+        command: usr/share/bcc/tools/statsnoop
     syncsnoop:
-        command: wrapper syncsnoop
-        aliases: [syncsnoop]
+        command: usr/share/bcc/tools/syncsnoop
     syscount:
-        command: wrapper syscount
-        aliases: [syscount]
+        command: usr/share/bcc/tools/syscount
     tcpaccept:
-        command: wrapper tcpaccept
-        aliases: [tcpaccept]
+        command: usr/share/bcc/tools/tcpaccept
     tcpconnect:
-        command: wrapper tcpconnect
-        aliases: [tcpconnect]
+        command: usr/share/bcc/tools/tcpconnect
     tcpconnlat:
-        command: wrapper tcpconnlat
-        aliases: [tcpconnlat]
+        command: usr/share/bcc/tools/tcpconnlat
     tcplife:
-        command: wrapper tcplife
-        aliases: [tcplife]
+        command: usr/share/bcc/tools/tcplife
     tcpretrans:
-        command: wrapper tcpretrans
-        aliases: [tcpretrans]
+        command: usr/share/bcc/tools/tcpretrans
     tcptop:
-        command: wrapper tcptop
-        aliases: [tcptop]
+        command: usr/share/bcc/tools/tcptop
     tcptracer:
-        command: wrapper tcptracer
-        aliases: [tcptracer]
+        command: usr/share/bcc/tools/tcptracer
     tplist:
-        command: wrapper tplist
-        aliases: [tplist]
+        command: usr/share/bcc/tools/tplist
     trace:
-        command: wrapper trace
-        aliases: [trace]
+        command: usr/share/bcc/tools/trace
     ttysnoop:
-        command: wrapper ttysnoop
-        aliases: [ttysnoop]
+        command: usr/share/bcc/tools/ttysnoop
     ucalls:
-        command: wrapper lib/ucalls
-        aliases: [ucalls]
+        command: usr/share/bcc/tools/lib/ucalls
     uflow:
-        command: wrapper lib/uflow
-        aliases: [uflow]
+        command: usr/share/bcc/tools/lib/uflow
     ugc:
-        command: wrapper lib/ugc
-        aliases: [ugc]
+        command: usr/share/bcc/tools/lib/ugc
     uobjnew:
-        command: wrapper lib/uobjnew
-        aliases: [uobjnew]
+        command: usr/share/bcc/tools/lib/uobjnew
     ustat:
-        command: wrapper lib/ustat
-        aliases: [ustat]
+        command: usr/share/bcc/tools/lib/ustat
     uthreads:
-        command: wrapper lib/uthreads
-        aliases: [uthreads]
+        command: usr/share/bcc/tools/lib/uthreads
     vfscount:
-        command: wrapper vfscount
-        aliases: [vfscount]
+        command: usr/share/bcc/tools/vfscount
     vfsstat:
-        command: wrapper vfsstat
-        aliases: [vfsstat]
+        command: usr/share/bcc/tools/vfsstat
     wakeuptime:
-        command: wrapper wakeuptime
-        aliases: [wakeuptime]
+        command: usr/share/bcc/tools/wakeuptime
     xfsdist:
-        command: wrapper xfsdist
-        aliases: [xfsdist]
+        command: usr/share/bcc/tools/xfsdist
     xfsslower:
-        command: wrapper xfsslower
-        aliases: [xfsslower]
+        command: usr/share/bcc/tools/xfsslower
     zfsdist:
-        command: wrapper zfsdist
-        aliases: [zfsdist]
+        command: usr/share/bcc/tools/zfsdist
     zfsslower:
-        command: wrapper zfsslower
-        aliases: [zfsslower]
-parts:
-    bcc:
-        plugin: cmake
-        configflags:
-            - -DCMAKE_INSTALL_PREFIX=/usr
-        source: ..
-        build-packages:
-            - bison
-            - build-essential
-            - cmake
-            - flex
-            - libedit-dev
-            - libllvm4.0
-            - llvm-4.0-dev
-            - libclang-4.0-dev
-            - python
-            - zlib1g-dev
-            - libelf-dev
-        stage-packages:
-            - python
-        snap:
-            - usr/bin/python*
-            - usr/share/bcc/tools
-            - usr/lib/*/lib*.so*
-            - usr/lib/python2.7
-            - -usr/share/bcc/tools/doc
-    wrapper:
-        source: .
-        plugin: copy
-        files:
-            wrapper: bin/wrapper
+        command: usr/share/bcc/tools/zfsslower
 
 # vim: set ai et sts=4 tabstop=4 sw=4: