Commit 7845a774 authored by Killian Lufau's avatar Killian Lufau Committed by Julien Muchembled

re6st-node: keep babeld repository to build on OBS

OBS can't use the gitclone recipe for Babeld because there is no
network, so we keep the source files resulting of the local build.

/reviewed-on nexedi/slapos.package!99
parent 81e3723d
...@@ -25,7 +25,7 @@ $(BUILD)/bin/buildout: ...@@ -25,7 +25,7 @@ $(BUILD)/bin/buildout:
cd $(BUILD) && $(PYTHON2) -S $(CURDIR)/rebootstrap cd $(BUILD) && $(PYTHON2) -S $(CURDIR)/rebootstrap
$(BUILD)/.installed.cfg: $(BUILD)/bin/buildout $(BUILD)/buildout.cfg $(BUILD)/.installed.cfg: $(BUILD)/bin/buildout $(BUILD)/buildout.cfg
cd $(BUILD) && bin/buildout cd $(BUILD) && bin/buildout babeld-repository:recipe=
touch $@ touch $@
PROGS = $(patsubst %,$(DESTDIR)/usr/bin/%,$(BIN)) PROGS = $(patsubst %,$(DESTDIR)/usr/bin/%,$(BIN))
......
...@@ -15,6 +15,13 @@ allow-picked-versions = true ...@@ -15,6 +15,13 @@ allow-picked-versions = true
parts += chrpath python parts += chrpath python
[babeld-repository]
git-executable =
location = ${buildout:directory}/babeld
[babeld]
post-install = make clean
[python] [python]
recipe = zc.recipe.egg recipe = zc.recipe.egg
interpreter = ${:_buildout_section_name_}.tmp interpreter = ${:_buildout_section_name_}.tmp
......
...@@ -52,7 +52,7 @@ BOOTSTRAP_URL = "https://bootstrap.pypa.io/bootstrap-buildout.py" ...@@ -52,7 +52,7 @@ BOOTSTRAP_URL = "https://bootstrap.pypa.io/bootstrap-buildout.py"
PACKAGE = "re6st-node" PACKAGE = "re6st-node"
BIN = "re6st-conf re6st-registry re6stnet".split() BIN = "re6st-conf re6st-registry re6stnet".split()
BUILD_KEEP = "buildout.cfg", "extends-cache", "download-cache" BUILD_KEEP = "babeld", "buildout.cfg", "download-cache", "extends-cache"
NOPART = "chrpath flex glib lunzip m4 patch perl popt site_perl xz-utils".split() NOPART = "chrpath flex glib lunzip m4 patch perl popt site_perl xz-utils".split()
TARGET = "opt/re6st" TARGET = "opt/re6st"
...@@ -178,8 +178,10 @@ def tarball(task): ...@@ -178,8 +178,10 @@ def tarball(task):
t.add("re6stnet/daemon") t.add("re6stnet/daemon")
for x in upstream.outputs: for x in upstream.outputs:
t.add(x) t.add(x)
def exclude(path):
return path.endswith('/.git')
for x in BUILD_KEEP: for x in BUILD_KEEP:
t.add(BUILD + "/" + x) t.add(BUILD + "/" + x, exclude=exclude)
@task(sdist, "debian/changelog") @task(sdist, "debian/changelog")
def dch(task): def dch(task):
......
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