Optimize qt build and make the snap classic confined temporary

This commit is contained in:
Simon Stürz 2018-10-18 10:35:23 +02:00
parent f44657450d
commit 09420cac81

View File

@ -2,24 +2,28 @@ name: nymea-networkmanager
version: 0.1.0 version: 0.1.0
summary: Daemon for setup wireless connection using Bluetooth LE. summary: Daemon for setup wireless connection using Bluetooth LE.
description: | description: |
The nymea-networkmanager daemon provides a bluetooth low energy server and The nymea-networkmanager daemon provides a Bluetooth Low Energy server and
allowes to configure the wireless network using the network-manager DBus connection. allowes to configure the wireless network using the network-manager DBus connection.
The default behaviour of the daemon is the offline mode. If the device is not connected
to any LAN or WLAN connection, the Bluetooth server will start. Once the device is
connected to a network, the Bluetooth server will shut down automatically. The advertise name
is 'BT WLAN setup'.
grade: stable grade: stable
confinement: classic confinement: classic
apps: apps:
nymea-networkmanager: nymea-networkmanager:
command: env PATH=$PATH:$SNAP/bin nymea-networkmanager -a "BT WLAN setup" -m offline command: env PATH=$PATH:$SNAP/bin qt5-launch nymea-networkmanager -a "BT WLAN setup" -m offline
daemon: simple daemon: simple
restart-condition: always restart-condition: always
plugs: plugs:
- dbus
- bluez - bluez
- bluetooth-control - bluetooth-control
- network-manager - network-manager
parts: parts:
# nymea-networkmanager
nymea-networkmanager: nymea-networkmanager:
plugin: qmake plugin: qmake
source: https://github.com/guh/nymea-networkmanager.git source: https://github.com/guh/nymea-networkmanager.git
@ -28,23 +32,13 @@ parts:
source-branch: master source-branch: master
project-files: [ nymea-networkmanager.pro ] project-files: [ nymea-networkmanager.pro ]
after: [ qt-5-11-1 ] after: [ qt-5-11-1 ]
build-packages:
- qt5-default
- qt5-qmake
- qtbase5-dev
- qtconnectivity5-dev
stage-packages:
- libqt5gui5
- libqt5core5a
- libqt5bluetooth5
- libqt5network5
- libqt5dbus5
# Custom launcher to support also armhf # Custom launcher to support also armhf
qt5-launch: qt5-launch:
plugin: dump plugin: dump
build-attributes: [keep-execstack] build-attributes: [keep-execstack]
source: . source: snap/
organize: organize:
qt5-launch: bin/ qt5-launch: bin/
@ -81,26 +75,8 @@ parts:
- libssl-dev - libssl-dev
- libudev-dev - libudev-dev
- libbluetooth-dev - libbluetooth-dev
- libx11-dev
- libx11-xcb-dev
- libxcb-icccm4-dev
- libxcb-image0-dev
- libxcb-keysyms1-dev
- libxcb-randr0-dev
- libxcb-render-util0-dev
- libxcb-render0-dev
- libxcb-shape0-dev
- libxcb-shm0-dev
- libxcb-sync-dev
- libxcb-xfixes0-dev
- libxcb-xinerama0-dev
- libxcb-xkb-dev
- libxcb1-dev
- libxext-dev - libxext-dev
- libxi-dev - libxi-dev
- libxkbcommon-dev
- libxkbcommon-x11-dev
- libxrender-dev
- pkg-kde-tools - pkg-kde-tools
- publicsuffix - publicsuffix
- unixodbc-dev - unixodbc-dev
@ -117,12 +93,14 @@ parts:
- -no-rpath - -no-rpath
- -verbose - -verbose
- -silent - -silent
- -opengl - -no-gif
- es2 - -no-libpng
- -no-libjpeg
- -no-opengl
- -no-widgets - -no-widgets
- -xcb - -no-xcb
- -no-gtk - -no-gtk
- -fontconfig - -no-fontconfig
- -no-eglfs - -no-eglfs
- -no-cups - -no-cups
- -no-accessibility - -no-accessibility
@ -144,20 +122,42 @@ parts:
- -skip - -skip
- qtdatavis3d - qtdatavis3d
- -skip - -skip
- qtdeclarative
- -skip
- qtdoc - qtdoc
- -skip - -skip
- qtgamepad - qtgamepad
- -skip - -skip
- qtgraphicaleffects
- -skip
- qtimageformats
- -skip
- qtlocation - qtlocation
- -skip - -skip
- qtmacextras - qtmacextras
- -skip - -skip
- qtmultimedia
- -skip
- qtpurchasing - qtpurchasing
- -skip - -skip
- qtquickcontrols
- -skip
- qtquickcontrols2
- -skip
- qtremoteobjects
- -skip
- qtscxml - qtscxml
- -skip - -skip
- qtsensors - qtsensors
- -skip - -skip
- qtserialbus
- -skip
- qtserialport
- -skip
- qtspeech
- -skip
- qtsvg
- -skip
- qtvirtualkeyboard - qtvirtualkeyboard
- -skip - -skip
- qtwayland - qtwayland
@ -166,6 +166,10 @@ parts:
- -skip - -skip
- qtwebengine - qtwebengine
- -skip - -skip
- qtwebglplugin
- -skip
- qtwebsockets
- -skip
- qtwebview - qtwebview
- -skip - -skip
- qtwinextras - qtwinextras
@ -194,7 +198,6 @@ parts:
- libudev1 - libudev1
- libxext-dev - libxext-dev
- libxi6 - libxi6
- libxkbcommon0
- perl - perl
- zlib1g - zlib1g
- libdouble-conversion-dev - libdouble-conversion-dev