Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

correct requirements debian/ubuntu 12 & 13 #17

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

correct requirements debian/ubuntu 12 & 13 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e04e1e
correct requirements debian/ubuntu 12 & 13
free-x Dec 28, 2024
f01a5b3
avoid unnecessary pip calls
free-x Jan 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 29 additions & 11 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,31 @@ def DEFAULT_DEPS = [
['libc6'],
['libgcc1'],
['libstdc++6'],
[primary:['libssl1.1'], or:['libssl3'], or:['libssl3t64']],
['libssl1.1'],
['libcurl4'],
[primary:['python3-mapbox-earcut'], or:['base-files','13',org.redline_rpm.header.Flags.EQUAL|org.redline_rpm.header.Flags.LESS]],
['gdal-bin'],
['libusb-0.1-4']
]
def DEPS_V2 = [
def DEPS_V12u = [
['libc6'],
['libgcc1'],
['libstdc++6'],
['libssl3'],
['libcurl4'],
['gdal-bin'],
['libusb-0.1-4']
]
def DEPS_V12d = [
['libc6'],
['libgcc1'],
['libstdc++6'],
['libssl3'],
['libcurl4'],
['python3-mapbox-earcut'],
['gdal-bin'],
['libusb-0.1-4']
]
def DEPS_V13 = [
['libc6'],
['libgcc1'],
['libstdc++6'],
Expand Down Expand Up @@ -96,15 +114,15 @@ def VARIANTS=[
tag: IMAGE_VERSION,
dockerfile:'Dockerfile.all',
oexdir: 'linux64',
dependencies: DEFAULT_DEPS
dependencies: DEPS_V12u
],
[osline:'ubuntu',
osversion:'noble',
arch: 'amd64',
tag: IMAGE_VERSION,
dockerfile:'Dockerfile.all',
oexdir: 'linux64',
dependencies: DEPS_V2
dependencies: DEPS_V13
],
[osline:'debian',
osversion:'buster',
Expand Down Expand Up @@ -166,7 +184,7 @@ def VARIANTS=[
dockerbase:'amd64/debian',
dockerfile:'Dockerfile.all',
oexdir: 'linux64',
dependencies:DEFAULT_DEPS
dependencies:DEPS_V12d
],
[osline:'raspbian',
osversion:'bookworm',
Expand All @@ -175,7 +193,7 @@ def VARIANTS=[
dockerbase:'arm32v7/debian',
dockerfile:'Dockerfile.all',
oexdir: 'linuxarm',
dependencies:DEFAULT_DEPS
dependencies:DEPS_V12d
],
[osline:'raspbian',
osversion:'bookworm',
Expand All @@ -184,7 +202,7 @@ def VARIANTS=[
dockerbase:'arm64v8/debian',
dockerfile:'Dockerfile.all',
oexdir: 'linuxarm64',
dependencies:DEFAULT_DEPS
dependencies:DEPS_V12d
],
[osline:'debian',
osversion:'trixie',
Expand All @@ -193,7 +211,7 @@ def VARIANTS=[
dockerbase:'amd64/debian',
dockerfile:'Dockerfile.all.v2',
oexdir: 'linux64',
dependencies:DEPS_V2
dependencies:DEPS_V13
],
[osline:'raspbian',
osversion:'trixie',
Expand All @@ -203,7 +221,7 @@ def VARIANTS=[
dockerfile:'Dockerfile.platform.v2',
platform: 'linux/armhf',
oexdir: 'linuxarm',
dependencies:DEPS_V2
dependencies:DEPS_V13
],
[osline:'raspbian',
osversion:'trixie',
Expand All @@ -213,7 +231,7 @@ def VARIANTS=[
dockerbase:'arm64v8/debian',
dockerfile:'Dockerfile.platform.v2',
oexdir: 'linuxarm64',
dependencies:DEPS_V2
dependencies:DEPS_V13
]
]

Expand Down
8 changes: 6 additions & 2 deletions install/postinstall
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#! /bin/bash
echo pip installing mapbox-earcut
pip3 install mapbox-earcut || echo "ignoring install error for mapbox-earcut"

if [ -z "$(pip list | grep mapbox-earcut)" ]
then
echo pip installing mapbox-earcut
pip3 install mapbox-earcut || echo "ignoring install error for mapbox-earcut"
fi