diff options
| -rwxr-xr-x | linux-build-farm/build.sh | 2 | ||||
| -rw-r--r-- | make-linux.mk | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/linux-build-farm/build.sh b/linux-build-farm/build.sh index f2d13154..da95c04c 100755 --- a/linux-build-farm/build.sh +++ b/linux-build-farm/build.sh @@ -41,7 +41,7 @@ for distro in $subdirs; do rm -f *.deb *.rpm - if [ -e "`echo $distro | grep -F debian`" -a -e "`echo $distro | grep -F ubuntu`" ]; then + if [ ! -n "`echo $distro | grep -F debian`" -a ! -n "`echo $distro | grep -F ubuntu`" ]; then docker run --rm -v `pwd`:/artifacts --privileged -it zt1-build-${distro}-x64 /bin/bash -c 'cd /ZeroTierOne ; make redhat ; cd .. ; cp `find /root/rpmbuild -type f -name *.rpm` /artifacts ; ls -l /artifacts' docker run --rm -v `pwd`:/artifacts --privileged -it zt1-build-${distro}-x86 /bin/bash -c 'cd /ZeroTierOne ; make redhat ; cd .. ; cp `find /root/rpmbuild -type f -name *.rpm` /artifacts ; ls -l /artifacts' else diff --git a/make-linux.mk b/make-linux.mk index 8bfee3a0..6273bc71 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -143,6 +143,7 @@ doc: manpages clean: FORCE rm -rf *.so *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/lz4/*.o ext/json-parser/*.o ext/miniupnpc/*.o ext/libnatpmp/*.o $(OBJS) zerotier-one zerotier-idtool zerotier-cli zerotier-selftest build-* ZeroTierOneInstaller-* *.deb *.rpm .depend doc/*.1 doc/*.2 doc/*.8 debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one find linux-build-farm -type f -name '*.deb' -print0 | xargs -0 rm -fv + find linux-build-farm -type f -name '*.rpm' -print0 | xargs -0 rm -fv distclean: clean rm -rf doc/node_modules |