From 7653a02ed3d82b23b13d4005fd5dc09e2153f88f Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Wed, 8 Mar 2017 17:06:06 +0100 Subject: [PATCH] use slapos.recipe.build:download and slapos.recipe.build:download-unpacked instead of hexagonit.recipe.download. --- component/apache/buildout.cfg | 8 ++++---- component/fonts/buildout.cfg | 4 ++-- component/ghostscript/buildout.cfg | 4 ++-- component/tesseract/buildout.cfg | 3 +-- software/ipython_notebook/software.cfg | 4 +--- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/component/apache/buildout.cfg b/component/apache/buildout.cfg index cfc941e78..535b2b6f2 100644 --- a/component/apache/buildout.cfg +++ b/component/apache/buildout.cfg @@ -17,15 +17,15 @@ extends = ../zlib/buildout.cfg [apr] -recipe = hexagonit.recipe.download -ignore-existing = true +recipe = slapos.recipe.build:download-unpacked +strip-top-level-dir = false version = 1.5.2 md5sum = 4e9769f3349fe11fc0a5e1b224c236aa url = https://archive.apache.org/dist/apr/apr-${:version}.tar.bz2 [apr-util] -recipe = hexagonit.recipe.download -ignore-existing = true +recipe = slapos.recipe.build:download-unpacked +strip-top-level-dir = false version = 1.5.4 url = https://archive.apache.org/dist/apr/apr-util-${:version}.tar.bz2 md5sum = 2202b18f269ad606d70e1864857ed93c diff --git a/component/fonts/buildout.cfg b/component/fonts/buildout.cfg index 9e0176af4..c7e5371e9 100644 --- a/component/fonts/buildout.cfg +++ b/component/fonts/buildout.cfg @@ -14,8 +14,8 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_} [fonts-base] destination = ${fonts:location}/${:_buildout_section_name_} -recipe = hexagonit.recipe.download -ignore-existing = true +location = ${:destination} +recipe = slapos.recipe.build:download-unpacked strip-top-level-dir = true # Liberation(tm) Fonts - a font family which aims at metric diff --git a/component/ghostscript/buildout.cfg b/component/ghostscript/buildout.cfg index a9918883e..0369b22b0 100644 --- a/component/ghostscript/buildout.cfg +++ b/component/ghostscript/buildout.cfg @@ -37,7 +37,7 @@ url = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs md5sum = 8f3d383d48da22345937b66b01ab2960 [ghostscript-fonts] -recipe = hexagonit.recipe.download -ignore-existing = true +recipe = slapos.recipe.build:download-unpacked +strip-top-level-dir = false url = http://downloads.ghostscript.com/public/fonts/urw-base35-v1.10.zip md5sum = 66e8bbd8228519d5dba82b9433a61bb0 diff --git a/component/tesseract/buildout.cfg b/component/tesseract/buildout.cfg index 79e147d64..06c157221 100644 --- a/component/tesseract/buildout.cfg +++ b/component/tesseract/buildout.cfg @@ -46,8 +46,7 @@ make-options = LIBTOOL=${libtool:location}/bin/libtool [tesseract-eng-traineddata] -recipe = hexagonit.recipe.download -ignore-existing = true +recipe = slapos.recipe.build:download-unpacked strip-top-level-dir = true url = http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.01.eng.tar.gz md5sum = 89c139a73e0e7b1225809fc7b226b6c9 diff --git a/software/ipython_notebook/software.cfg b/software/ipython_notebook/software.cfg index 73b24f4d3..f1b7f4265 100644 --- a/software/ipython_notebook/software.cfg +++ b/software/ipython_notebook/software.cfg @@ -28,11 +28,9 @@ eggs += patsy [download-file-base] -recipe = hexagonit.recipe.download -ignore-existing = true +recipe = slapos.recipe.build:download url = ${:_profile_base_location_}/template/${:filename} download-only = true -destination = ${buildout:parts-directory}/${:_buildout_section_name_} mode = 0644 [ipython-notebook-config] -- 2.30.9