For some time, it seems that the distcheck make target has not functioned
properly. This patch works around the automake imposed distcheck read-only
directory, as well as signaling to travis-ci that sudo is required (which is
required for new github forks as of 2015-01-01).
Tested on travis-ci, and on a ubuntu 14.04LTS system.
---
NOTE: This is a re-submission because it seems my email configuration was not
correct. I hope this gets through.
Signed-off-by: Aaron Conole <aa...@bytheb.org>
---
.travis.yml | 2 ++
AUTHORS | 1 +
Makefile.am | 2 +-
datapath-windows/include/automake.mk | 2 +-
lib/automake.mk | 9 ++++++---
ovsdb/automake.mk | 4 ++--
tests/automake.mk | 2 ++
vtep/automake.mk | 2 +-
8 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 36d95bd..2c0fd96 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,8 @@ compiler:
- gcc
- clang
+sudo: true
+
before_install: ./.travis/prepare.sh
env:
diff --git a/AUTHORS b/AUTHORS
index e81ff17..a797baa 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -23,6 +23,7 @@ Ariel Tubaltsev atubalt...@vmware.com
Arun Sharma arun.sha...@calsoftinc.com
Aryan TaheriMonfared aryan.taherimonfa...@uis.no
Ashwin Swaminathan ashwi...@arista.com
+Aaron Conole aa...@bytheb.org
Ben Pfaff b...@nicira.com
Billy O'Mahony billy.o.mah...@intel.com
Brian Kruger bkruger+ovs...@gmail.com
diff --git a/Makefile.am b/Makefile.am
index a659814..209e4dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,7 @@ endif
if WIN32
psep=";"
else
-psep=":"
+psep=:
endif
# PYTHONDONTWRITEBYTECODE=yes keeps Python from creating .pyc and .pyo
# files. Creating .py[co] works OK for any given version of Open
diff --git a/datapath-windows/include/automake.mk
b/datapath-windows/include/automake.mk
index 31f2fe2..9ab6c1f 100644
--- a/datapath-windows/include/automake.mk
+++ b/datapath-windows/include/automake.mk
@@ -3,7 +3,7 @@ BUILT_SOURCES +=
$(srcdir)/datapath-windows/include/OvsDpInterface.h
$(srcdir)/datapath-windows/include/OvsDpInterface.h: \
datapath/linux/compat/include/linux/openvswitch.h \
build-aux/extract-odp-netlink-windows-dp-h
- $(AM_V_GEN)sed -f $(srcdir)/build-aux/extract-odp-netlink-windows-dp-h
< $< > $@
+ $(AM_V_GEN)chmod u+w $(dir $@) && sed -f
$(srcdir)/build-aux/extract-odp-netlink-windows-dp-h < $< > $@
EXTRA_DIST += $(srcdir)/build-aux/extract-odp-netlink-windows-dp-h
diff --git a/lib/automake.mk b/lib/automake.mk
index f72eb32..560cbb0 100644
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -446,7 +446,8 @@ OVSIDL_BUILT += lib/vswitch-idl.c lib/vswitch-idl.h
lib/vswitch-idl.ovsidl
EXTRA_DIST += lib/vswitch-idl.ann
$(srcdir)/lib/vswitch-idl.ovsidl: vswitchd/vswitch.ovsschema
lib/vswitch-idl.ann
- $(AM_V_GEN)$(OVSDB_IDLC) annotate $(srcdir)/vswitchd/vswitch.ovsschema
$(srcdir)/lib/vswitch-idl.ann > $@.tmp && mv $@.tmp $@
+ $(AM_V_GEN)chmod u+w $(dir $@) && $(OVSDB_IDLC) annotate
$(srcdir)/vswitchd/vswitch.ovsschema $(srcdir)/lib/vswitch-idl.ann > $@.tmp &&
mv $@.tmp $@
+CLEANFILES += $(srcdir)/lib/vswitch-idl.ovsidl $(OVSIDL_BUILT)
lib/dirs.c: lib/dirs.c.in Makefile
$(AM_V_GEN)($(ro_c) && sed < $(srcdir)/lib/dirs.c.in \
@@ -484,13 +485,15 @@ lib/ofp-errors.inc: lib/ofp-errors.h
include/openflow/openflow-common.h \
$(srcdir)/include/openflow/openflow-common.h > $@.tmp && \
mv $@.tmp $@
lib/ofp-errors.c: lib/ofp-errors.inc
-EXTRA_DIST += build-aux/extract-ofp-errors
+EXTRA_DIST += build-aux/extract-ofp-errors $(srcdir)/lib/ofp-errors.c
+CLEANFILES += lib/ofp-errors.inc
lib/ofp-msgs.inc: lib/ofp-msgs.h $(srcdir)/build-aux/extract-ofp-msgs
$(AM_V_GEN)$(run_python) $(srcdir)/build-aux/extract-ofp-msgs \
$(srcdir)/lib/ofp-msgs.h $@ > $@.tmp && mv $@.tmp $@
lib/ofp-msgs.c: lib/ofp-msgs.inc
-EXTRA_DIST += build-aux/extract-ofp-msgs
+EXTRA_DIST += build-aux/extract-ofp-msgs $(srcdir)/lib/ofp-msgs.c
+CLEANFILES += lib/ofp-msgs.inc
INSTALL_DATA_LOCAL += lib-install-data-local
lib-install-data-local:
diff --git a/ovsdb/automake.mk b/ovsdb/automake.mk
index de7c5e0..b17965b 100644
--- a/ovsdb/automake.mk
+++ b/ovsdb/automake.mk
@@ -79,9 +79,9 @@ DISTCLEANFILES += ovsdb/ovsdb-idlc
SUFFIXES += .ovsidl .ovsschema
OVSDB_IDLC = $(run_python) $(srcdir)/ovsdb/ovsdb-idlc.in
.ovsidl.c:
- $(AM_V_GEN)$(OVSDB_IDLC) c-idl-source $< > $@.tmp && mv $@.tmp $@
+ $(AM_V_GEN)$(OVSDB_IDLC) c-idl-source $< > $@.tmp && mv -f $@.tmp $@
.ovsidl.h:
- $(AM_V_GEN)$(OVSDB_IDLC) c-idl-header $< > $@.tmp && mv $@.tmp $@
+ $(AM_V_GEN)$(OVSDB_IDLC) c-idl-header $< > $@.tmp && mv -f $@.tmp $@
BUILT_SOURCES += $(OVSIDL_BUILT)
diff --git a/tests/automake.mk b/tests/automake.mk
index 153d4e1..7e3da6c 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -251,6 +251,8 @@ tests/idltest.ovsidl: $(IDLTEST_IDL_FILES)
tests/idltest.c: tests/idltest.h
+CLEANFILES += tests/idltest.c tests/idltest.h tests/idltest.ovsidl
+
if DPDK_NETDEV
noinst_PROGRAMS += tests/test-dpdkr
tests_test_dpdkr_SOURCES = \
diff --git a/vtep/automake.mk b/vtep/automake.mk
index c712b0c..f44752d 100644
--- a/vtep/automake.mk
+++ b/vtep/automake.mk
@@ -10,7 +10,7 @@ VTEP_IDL_FILES = \
vtep/vtep-idl.ovsidl: $(VTEP_IDL_FILES)
$(AM_V_GEN)$(OVSDB_IDLC) annotate $(VTEP_IDL_FILES) > $@.tmp && \
mv $@.tmp $@
-CLEANFILES += vtep/vtep-idl.c vtep/vtep-idl.h
+CLEANFILES += vtep/vtep-idl.c vtep/vtep-idl.h vtep/vtep-idl.ovsidl
# libvtep
lib_LTLIBRARIES += vtep/libvtep.la
--
1.9.1
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
