summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-02 17:35:41 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-02 17:35:41 (GMT)
commitec8dc318d417ac1c4d27e47b3f9a8b644f9ebbff (patch)
tree6ab3f57b039496baf39e5f3b500e3d34a2ca90da
parent437c7008a34ff594df9f1bb518ae588e19e80c17 (diff)
parenta4baf91a4d25cde617e3071a2e701cb80a3092c5 (diff)
downloaddefinitions-ec8dc318d417ac1c4d27e47b3f9a8b644f9ebbff.tar.gz
Merge branch 'baserock/pedroalvarez/ebtables-fix'
Reviewed-by: Sam Thursfield <sam.thursfield@codethink.co.uk> Reviewed-by: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
-rw-r--r--strata/virtualization.morph2
-rw-r--r--strata/virtualization/ebtables.morph2
2 files changed, 2 insertions, 2 deletions
diff --git a/strata/virtualization.morph b/strata/virtualization.morph
index 881b53d..1cd447a 100644
--- a/strata/virtualization.morph
+++ b/strata/virtualization.morph
@@ -129,7 +129,7 @@ chunks:
- name: ebtables
morph: strata/virtualization/ebtables.morph
repo: upstream:ebtables
- ref: 09792f0107a9318da809908db31f0b826017de7b
+ ref: f4bdc80ae8c1a79b4ab5dcb8431ad85aea618d66
unpetrify-ref: master
build-depends: []
- name: openvswitch
diff --git a/strata/virtualization/ebtables.morph b/strata/virtualization/ebtables.morph
index 8be1b4f..a4d9fc7 100644
--- a/strata/virtualization/ebtables.morph
+++ b/strata/virtualization/ebtables.morph
@@ -4,4 +4,4 @@ build-system: manual
build-commands:
- make
install-commands:
-- make install DESTDIR="$DESTDIR" BINDIR="$DESDIR"/sbin
+- make install DESTDIR="$DESTDIR" BINDIR="$PREFIX/sbin"