From: Loic Dachary Date: Thu, 11 Feb 2016 17:09:44 +0000 (+0700) Subject: ceph-disk,ceph-detect-init: clean the build directory X-Git-Tag: v10.1.0~392^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cd87bd48de1f6f381a0ed3957b25a84440624b09;p=ceph.git ceph-disk,ceph-detect-init: clean the build directory b030d8fc113736b479e84246b6b36d5f698a2da3 should have kept the build directory in .gitignore and the clean target. Re-adding. Signed-off-by: Loic Dachary --- diff --git a/src/ceph-detect-init/.gitignore b/src/ceph-detect-init/.gitignore index dfb9bc7b5678..1bcbb562700d 100644 --- a/src/ceph-detect-init/.gitignore +++ b/src/ceph-detect-init/.gitignore @@ -7,6 +7,7 @@ *.egg dist virtualenv +build wheelhouse* *.log *.trs diff --git a/src/ceph-detect-init/Makefile.am b/src/ceph-detect-init/Makefile.am index ccc9def9d926..0c8372f3c75d 100644 --- a/src/ceph-detect-init/Makefile.am +++ b/src/ceph-detect-init/Makefile.am @@ -59,7 +59,7 @@ ceph-detect-init/virtualenv: cd $(srcdir)/ceph-detect-init ; ../tools/setup-virtualenv.sh ; test -d wheelhouse && export NO_INDEX=--no-index ; virtualenv/bin/pip install $$NO_INDEX --use-wheel --find-links=file://$$(pwd)/wheelhouse -e . ceph-detect-init-clean: - cd $(srcdir)/ceph-detect-init ; python setup.py clean ; rm -fr wheelhouse .tox virtualenv .coverage *.egg-info + cd $(srcdir)/ceph-detect-init ; python setup.py clean ; rm -fr wheelhouse .tox build virtualenv .coverage *.egg-info ceph-detect-init-install-data: cd $(srcdir)/ceph-detect-init ; \ diff --git a/src/ceph-disk/.gitignore b/src/ceph-disk/.gitignore index dfb9bc7b5678..1bcbb562700d 100644 --- a/src/ceph-disk/.gitignore +++ b/src/ceph-disk/.gitignore @@ -7,6 +7,7 @@ *.egg dist virtualenv +build wheelhouse* *.log *.trs diff --git a/src/ceph-disk/Makefile.am b/src/ceph-disk/Makefile.am index 7e4947fe0386..ec3ea5de2a4a 100644 --- a/src/ceph-disk/Makefile.am +++ b/src/ceph-disk/Makefile.am @@ -35,7 +35,7 @@ ceph-disk/virtualenv: cd $(srcdir)/ceph-disk ; ../tools/setup-virtualenv.sh ; test -d wheelhouse && export NO_INDEX=--no-index ; virtualenv/bin/pip install $$NO_INDEX --use-wheel --find-links=file://$$(pwd)/wheelhouse -e . ceph-disk-clean: - cd $(srcdir)/ceph-disk ; python setup.py clean ; rm -fr wheelhouse .tox virtualenv .coverage *.egg-info + cd $(srcdir)/ceph-disk ; python setup.py clean ; rm -fr wheelhouse .tox build virtualenv .coverage *.egg-info ceph-disk-install-data: cd $(srcdir)/ceph-disk ; \