Commit 414e79e6 authored by Jérome Perrin's avatar Jérome Perrin

build jq from source

For now it's used only in repman, but instead of compiling from source it was
using a pre-build binary for linux64. This change to compile from source.

See merge request nexedi/slapos!933
parents 4e8a8d66 7d506640
[buildout]
parts =
jq
extends =
../oniguruma/buildout.cfg
[jq]
recipe = slapos.recipe.cmmi
url = https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz
md5sum = e68fbd6a992e36f1ac48c99bbf825d6b
shared = true
configure-options =
--with-oniguruma=${oniguruma:location}
[buildout]
parts =
oniguruma
[oniguruma]
recipe = slapos.recipe.cmmi
url = https://github.com/kkos/oniguruma/releases/download/v6.9.6/onig-6.9.6.tar.gz
md5sum = 4759064e1a6c23e764fa6918c700ecbd
shared = true
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# not need these here). # not need these here).
[instance.cfg] [instance.cfg]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = fd0df2c4a91c1e478b72cbaeb6c021c3 md5sum = 8a08be95a04f1a47098c4fdef80bdfed
[instance-repman.cfg] [instance-repman.cfg]
_update_hash_filename_ = instance-repman.cfg.jinja2.in _update_hash_filename_ = instance-repman.cfg.jinja2.in
......
...@@ -46,7 +46,7 @@ context = ...@@ -46,7 +46,7 @@ context =
# program binaries # program binaries
raw bash_bin {{ bash_location }}/bin/bash raw bash_bin {{ bash_location }}/bin/bash
raw jq_bin {{ jq_location }}/jq raw jq_bin {{ jq_location }}/bin/jq
raw curl_bin {{ curl_location }}/bin/curl raw curl_bin {{ curl_location }}/bin/curl
${:extra-context} ${:extra-context}
......
...@@ -17,6 +17,7 @@ extends = ...@@ -17,6 +17,7 @@ extends =
../../component/proxysql/buildout.cfg ../../component/proxysql/buildout.cfg
../../component/socat/buildout.cfg ../../component/socat/buildout.cfg
../../component/rsync/buildout.cfg ../../component/rsync/buildout.cfg
../../component/jq/buildout.cfg
../../stack/supervisord/buildout.cfg ../../stack/supervisord/buildout.cfg
../../stack/monitor/buildout.cfg ../../stack/monitor/buildout.cfg
../neoppod/software-common.cfg ../neoppod/software-common.cfg
...@@ -50,7 +51,7 @@ context = ...@@ -50,7 +51,7 @@ context =
key buildout_bin_directory buildout:bin-directory key buildout_bin_directory buildout:bin-directory
key dbjobs_in dbjobs-in:target key dbjobs_in dbjobs-in:target
key dash_location dash:location key dash_location dash:location
key jq_location jq-binary:location key jq_location jq:location
key logrotate_cfg template-logrotate-base:rendered key logrotate_cfg template-logrotate-base:rendered
key gowork_bin gowork:bin key gowork_bin gowork:bin
key gzip_location gzip:location key gzip_location gzip:location
...@@ -87,14 +88,6 @@ context = ...@@ -87,14 +88,6 @@ context =
key proxysql_location proxysql:location key proxysql_location proxysql:location
[jq-binary]
recipe = hexagonit.recipe.download
url = https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64
md5sum = 1fffde9f3c7944f063265e9a5e67ae4f
filename = jq
mode = 0755
download-only = true
[download-file] [download-file]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/${:_update_hash_filename_} url = ${:_profile_base_location_}/${:_update_hash_filename_}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment