ceph: remove NFS and Cassandra make targets

Remove all make-related references to NFS and Cassandra. This is limited purely to make targets. Leave CRD and codegen script references to be removed in a different commit. Signed-off-by: Blaine Gardner <[email protected]>
cmanzur · Aug 31, 2021 · 9531c25 · 9531c25
1 parent fc699c2
commit 9531c25
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 187 deletions.
diff --git a/build/makelib/common.mk b/build/makelib/common.mk
@@ -110,7 +110,7 @@ export SED_IN_PLACE
 echo.%: ; @echo $* = $($*)
 
 # Select which images (backends) to make; default to all possible images
-IMAGES ?= ceph nfs cassandra
+IMAGES ?= ceph
 
 COMMA := ,
 SPACE :=

diff --git a/images/Makefile b/images/Makefile
@@ -29,17 +29,8 @@ cross.%:
 ceph.%:
 	@$(MAKE) -C ceph PLATFORM=$*
 
-nfs.%:
-	@$(MAKE) -C nfs PLATFORM=$*
-
-cassandra.%:
-	@$(MAKE) -C cassandra PLATFORM=$*
-
-
-do.build.images.%: $(foreach i,$(IMAGES), $(i).%);
-
-do.build: do.build.images.$(PLATFORM) ;
-build.all: $(foreach p,$(PLATFORMS), do.build.images.$(p)) ; ## Build images for all platforms.
+do.build: ceph.$(PLATFORM) ;
+build.all: $(foreach p,$(PLATFORMS), ceph.$(p)) ; ## Build images for all platforms.
 
 # ====================================================================================
 # Help

diff --git a/images/cassandra/Dockerfile b/images/cassandra/Dockerfile
diff --git a/images/cassandra/Makefile b/images/cassandra/Makefile
diff --git a/images/nfs/Dockerfile b/images/nfs/Dockerfile
diff --git a/images/nfs/Makefile b/images/nfs/Makefile