On 7/12/2022 1:35 PM, David Marchand wrote:
build-aux/initial-tab-allowed-files is updated in patch 5, so I'd expect
a build check failure at this point of the series as mentionned in v3.
On 7/12/22 19:56, Greg Rose wrote:
diff --git a/Makefile.am b/Makefile.am
index cb8076433..eda0d91eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,6 @@
AUTOMAKE_OPTIONS = foreign subdir-objects
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = datapath
AM_CPPFLAGS = $(SSL_CFLAGS)
AM_LDFLAGS = $(SSL_LDFLAGS)
@@ -198,9 +197,6 @@ CLEAN_LOCAL += clean-pycov
ALL_LOCAL += dist-hook-git
dist-hook-git: distfiles
@if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1;
then \
- (cd datapath && $(MAKE) distfiles); \
- (cat distfiles; sed 's|^|datapath/|' datapath/distfiles) | \
- LC_ALL=C sort -u > all-distfiles; \
(cd $(srcdir) && git ls-files) | grep -v '\.gitignore$$' | \
grep -v '\.gitattributes$$' | \
LC_ALL=C sort -u > all-gitfiles; \
From your last comment, I guess you figured out how to fix the build
issue reported by CI.
I think the simpler is to keep generating this all-distfiles file. But
maybe you have a better solution.
@@ -235,7 +231,7 @@ config-h-check:
@cd $(srcdir); \
if test -e .git && (git --version) >/dev/null 2>&1 && \
git --no-pager grep -L '#include <config\.h>' `git ls-files |
grep '\.c$$' | \
- grep -vE
'^datapath|^lib/sflow|^third-party|^datapath-windows|^python'`; \
+ grep -vE '^datapath-windows|^lib/sflow|^python|^third-party'`; \
Ack.
then \
echo "See above for list of violations of the rule that"; \
echo "every C source file must #include <config.h>."; \
@@ -256,7 +252,7 @@ printf-check:
@cd $(srcdir); \
if test -e .git && (git --version) >/dev/null 2>&1 && \
git --no-pager grep -n -E -e '%[-+ #0-9.*]*([ztj]|hh)' --and
--not -e 'ovs_scan' `git ls-files | grep '\.[ch]$$' | \
- grep -vE '^datapath|^lib/sflow|^third-party'`; \
+ grep -vE '^lib/sflow|^third-party'`; \
Hum, here, in theory, datapath-windows files were caught by pattern
before but, with this change, would not be anymore.
+ grep -vE '^datapath-windows|^lib/sflow|^third-party'`; \
then \
echo "See above for list of violations of the rule that"; \
echo "'z', 't', 'j', 'hh' printf() type modifiers are"; \
@@ -299,7 +295,7 @@ check-endian:
@if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1 && \
(cd $(srcdir) && git --no-pager grep -l -E \
-e 'BIG_ENDIAN|LITTLE_ENDIAN' --and --not -e 'BYTE_ORDER' | \
- $(EGREP) -v '^datapath/|^include/sparse/rte_'); \
+ $(EGREP) -v '^datapath-windows|^include/sparse/rte_'); \
On the contrary here, the trailing / in datapath/ pattern was avoiding
the datapath-windows files, so:
+ $(EGREP) -v '^include/sparse/rte_'); \
then \
echo "See above for list of files that misuse LITTLE""_ENDIAN"; \
echo "or BIG""_ENDIAN. Please use WORDS_BIGENDIAN instead."; \
@@ -339,7 +335,7 @@ thread-safety-check:
if test -e .git && (git --version) >/dev/null 2>&1 && \
grep -n -f build-aux/thread-safety-forbidden \
`git ls-files | grep '\.[ch]$$' \
- | $(EGREP) -v '^datapath|^lib/sflow|^third-party'` /dev/null \
+ | $(EGREP) -v '^datapath-windows|^lib/sflow|^third-party'`
/dev/null \
Ack.
The rest lgtm.
OK - I'll incorporate those suggestions and fix it up in V5.
Thanks!
- Greg
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
