projects
/
sigrok-util.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9b458ff
)
sigrok-native-appimage: Fix order of delete_blacklisted() call.
author
Uwe Hermann
<uwe@hermann-uwe.de>
Sun, 19 Mar 2017 23:46:12 +0000
(
00:46
+0100)
committer
Uwe Hermann
<uwe@hermann-uwe.de>
Mon, 20 Mar 2017 01:56:07 +0000
(
02:56
+0100)
This was being called too early, resulting in not all files being
deleted that should be deleted.
cross-compile/appimage/sigrok-native-appimage
patch
|
blob
|
history
diff --git
a/cross-compile/appimage/sigrok-native-appimage
b/cross-compile/appimage/sigrok-native-appimage
index f1d74c8cc4b606122371af410062e4f87aa8b7a4..39845bdbb5ba2b815d30c6fd2c93f3bf27cea745 100755
(executable)
--- a/
cross-compile/appimage/sigrok-native-appimage
+++ b/
cross-compile/appimage/sigrok-native-appimage
@@
-82,11
+82,12
@@
cp -r $QT5PLUGINS/platforms .$QT5PLUGINS
# Delete stuff that should not go into the AppImage
########################################################################
-delete_blacklisted
move_lib
mv ./usr/lib/x86_64-linux-gnu/* usr/lib/
rm -r ./usr/lib/x86_64-linux-gnu/
+delete_blacklisted
+
# Remove some incorrectly/unintentionally copied files.
rm -r ./home