build: remove ceph-disk-udev entirely

Signed-off-by: Leo Zhang <[email protected]>
bitfehler · May 24, 2017 · 06018fa · 06018fa
1 parent 1d74182
commit 06018fa
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 89 deletions.
diff --git a/alpine/APKBUILD.in b/alpine/APKBUILD.in
@@ -301,7 +301,7 @@ osd() {
 	depends="ceph-base parted gptfdisk"
 
 	_pkg $_bindir ceph-clsinfo ceph-bluefs-tool ceph-objectstore-tool ceph-osd
-	_pkg $_sbindir ceph-disk ceph-disk-udev
+	_pkg $_sbindir ceph-disk
 	_pkg $_libexecdir/ceph ceph-osd-prestart.sh
 	_pkg $_udevrulesdir 60-ceph-by-parttypeuuid.rules 95-ceph-osd.rules
 	install -m 750 -o $_ceph_uid -g $_ceph_gid -d \

diff --git a/ceph.spec.in b/ceph.spec.in
@@ -1390,7 +1390,6 @@ fi
 %{_bindir}/ceph-objectstore-tool
 %{_bindir}/ceph-osd
 %{_sbindir}/ceph-disk
-%{_sbindir}/ceph-disk-udev
 %{_libexecdir}/ceph/ceph-osd-prestart.sh
 %dir %{_udevrulesdir}
 %{_udevrulesdir}/60-ceph-by-parttypeuuid.rules

diff --git a/debian/ceph-osd.install b/debian/ceph-osd.install
@@ -1,7 +1,6 @@
 lib/udev/rules.d/95-ceph-osd.rules
 lib/udev/rules.d/60-ceph-by-parttypeuuid.rules
 usr/sbin/ceph-disk
-usr/sbin/ceph-disk-udev
 usr/bin/ceph-clsinfo
 usr/bin/ceph-objectstore-tool
 usr/bin/ceph-bluestore-tool

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -944,7 +944,6 @@ install(PROGRAMS
 install(PROGRAMS
   ${CMAKE_SOURCE_DIR}/src/ceph-create-keys
 #  ${CMAKE_SOURCE_DIR}/src/ceph-disk
-  ${CMAKE_SOURCE_DIR}/src/ceph-disk-udev
   DESTINATION sbin)
 
 add_subdirectory(bash_completion)

diff --git a/src/ceph-disk-udev b/src/ceph-disk-udev