sigrok-native-appimage: Bump to use Ubuntu 16.04 as base OS.

[sigrok-util.git] / cross-compile / appimage / sigrok-native-appimage

diff --git a/cross-compile/appimage/sigrok-native-appimage b/cross-compile/appimage/sigrok-native-appimage
index cc27c5901ade5eedf594d7eea55a69934ae6a2f2..01cf8479b11ef6714c8abfae65640e7e50851a3d 100755 (executable)
--- a/cross-compile/appimage/sigrok-native-appimage
+++ b/cross-compile/appimage/sigrok-native-appimage
@@ -10,12 +10,12 @@
 
 PREFIX=$HOME/sr
 
-APPIMAGEKIT_OUTDIR=$HOME/AppImageKit/out
+APPIMAGEKIT_OUTDIR=$HOME/AppImageKit/build/out
 
 # ARCH=i386
 ARCH=x86_64
 
-PYVER=3.4
+PYVER=3.5
 
 ########################################################################
 # You usually don't have to change anything below this line
@@ -28,6 +28,7 @@ else
 fi
 LOWERAPP=${APP,,} 
 
+export ARCH
 export STATIC_FILES=`pwd`/contrib
 
 # Add $APPIMAGEKIT_OUTDIR so we can find all the binaries there.
@@ -95,12 +96,15 @@ if [ "x$1" != "xsigrok-cli" ]; then
        # Get all Qt5 plugins (won't be copied automatically).
        QT5PLUGINS=/usr/lib/$ARCH-linux-gnu/qt5/plugins # Host (+ AppRun) path.
        mkdir -p .$QT5PLUGINS
-       cp -r $QT5PLUGINS/accessible .$QT5PLUGINS
+       cp -r $QT5PLUGINS/bearer .$QT5PLUGINS
+       cp -r $QT5PLUGINS/egldeviceintegrations .$QT5PLUGINS
        cp -r $QT5PLUGINS/generic .$QT5PLUGINS
        cp -r $QT5PLUGINS/iconengines .$QT5PLUGINS
        cp -r $QT5PLUGINS/imageformats .$QT5PLUGINS
        cp -r $QT5PLUGINS/platforminputcontexts .$QT5PLUGINS
        cp -r $QT5PLUGINS/platforms .$QT5PLUGINS
+       cp -r $QT5PLUGINS/printsupport .$QT5PLUGINS
+       cp -r $QT5PLUGINS/xcbglintegrations .$QT5PLUGINS
        
        # Get some additional dependencies of the Qt5 plugins.
        ldd .$QT5PLUGINS/platforms/libqxcb.so | grep "=>" | awk '{print $3}' | xargs -I '{}' cp -v '{}' ./usr/lib || true
@@ -128,11 +132,10 @@ delete_blacklisted
 rm -r ./home
 
 ########################################################################
-# Determine the version of the app; also include needed glibc version
+# Determine the version of the app
 ########################################################################
 
-GLIBC_NEEDED=$(glibc_needed)
-VERSION="NIGHTLY.glibc$GLIBC_NEEDED"
+VERSION="NIGHTLY"
 echo $VERSION
 
 ########################################################################