Message ID | 20180717122620.12052-1-aserdean@ovn.org |
---|---|
State | Changes Requested |
Headers | show |
Series | [ovs-dev] build: Add gitattribute file to build-aux | expand |
Bleep bloop. Greetings Alin Gabriel Serdean, I am a robot and I have tried out your patch. Thanks for your contribution. I encountered some error that I wasn't expecting. See the details below. build: /bin/sh /var/lib/jenkins/jobs/upstream_build_from_pw/workspace/build-aux/missing autom4te --language=autotest -I '.' -o tests/system-dpdk-testsuite.tmp tests/system-dpdk-testsuite.at mv tests/system-dpdk-testsuite.tmp tests/system-dpdk-testsuite \ { sed -n -e '/%AUTHORS%/q' -e p < ./debian/copyright.in; \ sed '34,/^$/d' ./AUTHORS.rst | \ sed -n -e '/^$/q' -e 's/^/ /p'; \ sed -e '34,/%AUTHORS%/d' ./debian/copyright.in; \ } > debian/copyright (printf '\043 Generated automatically -- do not modify! -*- buffer-read-only: t -*-\n' && sed -e 's,[@]VERSION[@],2.9.90,g') < ./rhel/openvswitch-dkms.spec.in > openvswitch-dkms.spec.tmp || exit 1; if cmp -s openvswitch-dkms.spec.tmp rhel/openvswitch-dkms.spec; then touch rhel/openvswitch-dkms.spec; rm openvswitch-dkms.spec.tmp; else mv openvswitch-dkms.spec.tmp rhel/openvswitch-dkms.spec; fi (printf '\043 Generated automatically -- do not modify! -*- buffer-read-only: t -*-\n' && sed -e 's,[@]VERSION[@],2.9.90,g') < ./rhel/kmod-openvswitch-rhel6.spec.in > kmod-openvswitch-rhel6.spec.tmp || exit 1; if cmp -s kmod-openvswitch-rhel6.spec.tmp rhel/kmod-openvswitch-rhel6.spec; then touch rhel/kmod-openvswitch-rhel6.spec; rm kmod-openvswitch-rhel6.spec.tmp; else mv kmod-openvswitch-rhel6.spec.tmp rhel/kmod-openvswitch-rhel6.spec; fi (printf '\043 Generated automatically -- do not modify! -*- buffer-read-only: t -*-\n' && sed -e 's,[@]VERSION[@],2.9.90,g') < ./rhel/openvswitch-kmod-fedora.spec.in > openvswitch-kmod-fedora.spec.tmp || exit 1; if cmp -s openvswitch-kmod-fedora.spec.tmp rhel/openvswitch-kmod-fedora.spec; then touch rhel/openvswitch-kmod-fedora.spec; rm openvswitch-kmod-fedora.spec.tmp; else mv openvswitch-kmod-fedora.spec.tmp rhel/openvswitch-kmod-fedora.spec; fi (printf '\043 Generated automatically -- do not modify! -*- buffer-read-only: t -*-\n' && sed -e 's,[@]VERSION[@],2.9.90,g') < ./rhel/openvswitch.spec.in > openvswitch.spec.tmp || exit 1; if cmp -s openvswitch.spec.tmp rhel/openvswitch.spec; then touch rhel/openvswitch.spec; rm openvswitch.spec.tmp; else mv openvswitch.spec.tmp rhel/openvswitch.spec; fi (printf '\043 Generated automatically -- do not modify! -*- buffer-read-only: t -*-\n' && sed -e 's,[@]VERSION[@],2.9.90,g') < ./rhel/openvswitch-fedora.spec.in > openvswitch-fedora.spec.tmp || exit 1; if cmp -s openvswitch-fedora.spec.tmp rhel/openvswitch-fedora.spec; then touch rhel/openvswitch-fedora.spec; rm openvswitch-fedora.spec.tmp; else mv openvswitch-fedora.spec.tmp rhel/openvswitch-fedora.spec; fi (printf '\043 Generated automatically -- do not modify! -*- buffer-read-only: t -*-\n' && sed -e 's,[@]VERSION[@],2.9.90,g') \ < ./xenserver/openvswitch-xen.spec.in > openvswitch-xen.spec.tmp || exit 1; \ if cmp -s openvswitch-xen.spec.tmp xenserver/openvswitch-xen.spec; then touch xenserver/openvswitch-xen.spec; rm openvswitch-xen.spec.tmp; else mv openvswitch-xen.spec.tmp xenserver/openvswitch-xen.spec; fi make[3]: Entering directory `/var/lib/jenkins/jobs/upstream_build_from_pw/workspace/datapath' make[3]: Leaving directory `/var/lib/jenkins/jobs/upstream_build_from_pw/workspace/datapath' The following files are in git but not the distribution: build-aux/.gitattributes make[2]: *** [dist-hook-git] Error 1 make[2]: Leaving directory `/var/lib/jenkins/jobs/upstream_build_from_pw/workspace' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/var/lib/jenkins/jobs/upstream_build_from_pw/workspace' make: *** [all] Error 2 Please check this out. If you feel there has been an error, please email aconole@bytheb.org Thanks, 0-day Robot
Hi Alin, 0-day Robot <robot@bytheb.org> writes: > Bleep bloop. Greetings Alin Gabriel Serdean, I am a robot and I have tried out your patch. > Thanks for your contribution. > > I encountered some error that I wasn't expecting. See the details below. > > I suggest folding in something like the following (since I don't think it makes sense to worry about distributing gitattributes files): --- diff --git a/Makefile.am b/Makefile.am index e02799a90..fd6620a9b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -199,6 +199,7 @@ dist-hook-git: 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; \ LC_ALL=C comm -1 -3 all-distfiles all-gitfiles > missing-distfiles; \ if test -s missing-distfiles; then \ ---
> -----Mesaj original----- > De la: ovs-dev-bounces@openvswitch.org <ovs-dev- > bounces@openvswitch.org> În numele Aaron Conole > Trimis: Wednesday, July 18, 2018 6:02 PM > Către: Alin Gabriel Serdean <aserdean@ovn.org> > Cc: dev@openvswitch.org > Subiect: Re: [ovs-dev] build: Add gitattribute file to build-aux > > Hi Alin, > > 0-day Robot <robot@bytheb.org> writes: > > > Bleep bloop. Greetings Alin Gabriel Serdean, I am a robot and I have tried > out your patch. > > Thanks for your contribution. > > > > I encountered some error that I wasn't expecting. See the details below. > > > > > > I suggest folding in something like the following (since I don't think it makes > sense to worry about distributing gitattributes files): > Thanks for the suggestion Aaron. I sent out an incremental: https://patchwork.ozlabs.org/patch/946511/ Do you mind looking over it and adding a Signed-off? Thanks, Alin.
On Tue, Jul 17, 2018 at 03:26:20PM +0300, Alin Gabriel Serdean wrote: > The command: `make check-tabs` fails on Windows due to line ending conversions > caused by the following setting: `git config --global core.autocrlf true` > (the whitelist `build-aux/initial-tab-whitelist` becomes a blacklist) > > This patch adds a .gittatribute file to build-aux to force LF endings > on Windows. > > Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org> With Aaron's suggestion, this makes sense to me. Acked-by: Ben Pfaff <blp@ovn.org>
diff --git a/.gitignore b/.gitignore index 81faf270d..60e7818c3 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,6 @@ .libs .tmp_versions .vagrant -.gitattributes /Makefile /Makefile.in /aclocal.m4 diff --git a/build-aux/.gitattributes b/build-aux/.gitattributes new file mode 100644 index 000000000..fcadb2cf9 --- /dev/null +++ b/build-aux/.gitattributes @@ -0,0 +1 @@ +* text eol=lf
The command: `make check-tabs` fails on Windows due to line ending conversions caused by the following setting: `git config --global core.autocrlf true` (the whitelist `build-aux/initial-tab-whitelist` becomes a blacklist) This patch adds a .gittatribute file to build-aux to force LF endings on Windows. Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org> --- .gitignore | 1 - build-aux/.gitattributes | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 build-aux/.gitattributes