kopia lustrzana https://github.com/OpenDroneMap/ODM
Update to add some missing python packages in Snap
I think this was caused by the release of Snapcraft 4.4 recently which might have different behaviour. The snap is missing a few python packages/modules now, which were present when building earlier. * Add missing Python packages * Ensure libblas and liblapack can be found with an LD_LIBRARY_PATH override. * Rename reference to `python3.6` to `python3.8`. Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>pull/1202/head
rodzic
8e31d0e992
commit
c05035df80
|
@ -15,8 +15,8 @@ else:
|
||||||
|
|
||||||
for d in site_directories:
|
for d in site_directories:
|
||||||
if d:
|
if d:
|
||||||
site_dir = os.path.join(d, "lib/python3.6/site-packages")
|
site_dir = os.path.join(d, "lib/python3.8/site-packages")
|
||||||
site.addsitedir(site_dir)
|
site.addsitedir(site_dir)
|
||||||
|
|
||||||
if snap_dir:
|
if snap_dir:
|
||||||
site.ENABLE_USER_SITE = False
|
site.ENABLE_USER_SITE = False
|
|
@ -33,7 +33,6 @@ parts:
|
||||||
prereqs:
|
prereqs:
|
||||||
source: .
|
source: .
|
||||||
plugin: nil
|
plugin: nil
|
||||||
override-pull: exit 0
|
|
||||||
build-packages:
|
build-packages:
|
||||||
- build-essential
|
- build-essential
|
||||||
- cmake
|
- cmake
|
||||||
|
@ -67,7 +66,11 @@ parts:
|
||||||
- libssl1.1
|
- libssl1.1
|
||||||
- libusb-1.0-0
|
- libusb-1.0-0
|
||||||
- procps
|
- procps
|
||||||
|
- python3
|
||||||
|
- python3-distutils
|
||||||
- python3-gdal
|
- python3-gdal
|
||||||
|
- python3-pkg-resources # required base package for core20
|
||||||
|
- python3-requests # required base package for core20
|
||||||
- python3-setuptools
|
- python3-setuptools
|
||||||
stage:
|
stage:
|
||||||
# remove deb-based numpy because it conflicts with our pip-installed version
|
# remove deb-based numpy because it conflicts with our pip-installed version
|
||||||
|
@ -76,7 +79,6 @@ parts:
|
||||||
opencv:
|
opencv:
|
||||||
source: .
|
source: .
|
||||||
plugin: nil
|
plugin: nil
|
||||||
override-pull: exit 0
|
|
||||||
build-packages:
|
build-packages:
|
||||||
- libavcodec-dev
|
- libavcodec-dev
|
||||||
- libavformat-dev
|
- libavformat-dev
|
||||||
|
@ -114,7 +116,6 @@ parts:
|
||||||
openmvs:
|
openmvs:
|
||||||
source: .
|
source: .
|
||||||
plugin: nil
|
plugin: nil
|
||||||
override-pull: exit 0
|
|
||||||
build-packages:
|
build-packages:
|
||||||
- libcgal-dev
|
- libcgal-dev
|
||||||
- libboost-program-options-dev
|
- libboost-program-options-dev
|
||||||
|
@ -124,7 +125,6 @@ parts:
|
||||||
opensfm:
|
opensfm:
|
||||||
source: .
|
source: .
|
||||||
plugin: nil
|
plugin: nil
|
||||||
override-pull: exit 0
|
|
||||||
build-packages:
|
build-packages:
|
||||||
- libboost-date-time-dev
|
- libboost-date-time-dev
|
||||||
- libboost-filesystem-dev
|
- libboost-filesystem-dev
|
||||||
|
@ -226,6 +226,8 @@ parts:
|
||||||
snapcraft-preload:
|
snapcraft-preload:
|
||||||
source: https://github.com/sergiusens/snapcraft-preload.git
|
source: https://github.com/sergiusens/snapcraft-preload.git
|
||||||
plugin: cmake
|
plugin: cmake
|
||||||
|
cmake-parameters:
|
||||||
|
- -DCMAKE_INSTALL_PREFIX=/
|
||||||
build-packages:
|
build-packages:
|
||||||
- on amd64:
|
- on amd64:
|
||||||
- gcc-multilib
|
- gcc-multilib
|
||||||
|
@ -235,7 +237,10 @@ apps:
|
||||||
opendronemap:
|
opendronemap:
|
||||||
command: odm/run.sh
|
command: odm/run.sh
|
||||||
command-chain:
|
command-chain:
|
||||||
- usr/local/bin/snapcraft-preload # Fixes multiprocessing python module
|
- bin/snapcraft-preload # Fixes multiprocessing python module
|
||||||
|
environment:
|
||||||
|
# Ensure libraries are found
|
||||||
|
LD_LIBRARY_PATH: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/blas:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/lapack:$LD_LIBRARY_PATH
|
||||||
plugs:
|
plugs:
|
||||||
- home
|
- home
|
||||||
- network
|
- network
|
||||||
|
|
Ładowanie…
Reference in New Issue