From: Loic Dachary Date: Sun, 3 Jul 2016 11:31:46 +0000 (+0200) Subject: Merge pull request #9885 from dachary/wip-16351-by-parttypeuuid X-Git-Tag: ses5-milestone5~524 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b8a4ca7e4c8bac803a50eb6fa62d3fd6f2b7f293;p=ceph.git Merge pull request #9885 from dachary/wip-16351-by-parttypeuuid udev: always populate /dev/disk/by-parttypeuuid Reviewed-by: Alexandre Derumier --- b8a4ca7e4c8bac803a50eb6fa62d3fd6f2b7f293 diff --cc debian/rules index 18970aefcc48,06491b5b36ef..60603bfc1295 --- a/debian/rules +++ b/debian/rules @@@ -29,14 -55,32 +29,15 @@@ override_dh_auto_build cp src/init-radosgw debian/radosgw.init cp src/logrotate.conf debian/ceph.logrotate - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp +override_dh_auto_clean: + dh_auto_clean --buildsystem=cmake + rm -f debian/radosgw.init debian/ceph.logrotate - [ ! -f Makefile ] || $(MAKE) distclean - rm -f aclocal.m4 compile config.sub config.guess depcomp install-sh \ - ltmain.sh missing - rm -f configure Makefile.in man/Makefile.in src/Makefile.in - rm -f src/acconfig.h.in - rm -f debian/ceph-base.ceph.init debian/radosgw.init debian/ceph.logrotate debian/radosgw.logrotate - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - $(MAKE) DESTDIR=$(DESTDIR) install +override_dh_auto_install: + dh_auto_install --buildsystem=cmake --destdir=$(DESTDIR) install -D -m 644 udev/50-rbd.rules $(DESTDIR)/lib/udev/rules.d/50-rbd.rules install -D -m 644 udev/95-ceph-osd.rules $(DESTDIR)/lib/udev/rules.d/95-ceph-osd.rules + install -D -m 644 udev/60-ceph-by-parttypeuuid.rules $(DESTDIR)/lib/udev/rules.d/60-ceph-by-parttypeuuid.rules install -D -m 644 src/etc-rbdmap $(DESTDIR)/etc/ceph/rbdmap install -D -m 755 src/init-rbdmap $(DESTDIR)/etc/init.d/rbdmap