From bf7ab9f04cbff2716e0f63a628ef9cecc050b073 Mon Sep 17 00:00:00 2001
From: Dave Tucker <dt@docker.com>
Date: Thu, 6 Apr 2017 16:56:20 +0100
Subject: [PATCH] tools: rename mkimage-gce to mkimage-gcp

Also removes `mobyplatform` from the cmdline as this is no longer used

Signed-off-by: Dave Tucker <dt@docker.com>
---
 tools/{mkimage-gce => mkimage-gcp}/Dockerfile        | 2 +-
 tools/{mkimage-gce => mkimage-gcp}/Makefile          | 4 ++--
 tools/{mkimage-gce/make-gce => mkimage-gcp/make-gcp} | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename tools/{mkimage-gce => mkimage-gcp}/Dockerfile (84%)
 rename tools/{mkimage-gce => mkimage-gcp}/Makefile (93%)
 rename tools/{mkimage-gce/make-gce => mkimage-gcp/make-gcp} (87%)

diff --git a/tools/mkimage-gce/Dockerfile b/tools/mkimage-gcp/Dockerfile
similarity index 84%
rename from tools/mkimage-gce/Dockerfile
rename to tools/mkimage-gcp/Dockerfile
index 5ec767ee5..0ee52d285 100644
--- a/tools/mkimage-gce/Dockerfile
+++ b/tools/mkimage-gcp/Dockerfile
@@ -2,4 +2,4 @@ FROM mobylinux/guestfs:69698aca5bfcb8c4d3a3bbe6d8656be155bf8cd6@sha256:703a7372a
 
 COPY . .
 
-ENTRYPOINT [ "/make-gce" ]
+ENTRYPOINT [ "/make-gcp" ]
diff --git a/tools/mkimage-gce/Makefile b/tools/mkimage-gcp/Makefile
similarity index 93%
rename from tools/mkimage-gce/Makefile
rename to tools/mkimage-gcp/Makefile
index 934cb1808..e3734df3a 100644
--- a/tools/mkimage-gce/Makefile
+++ b/tools/mkimage-gcp/Makefile
@@ -1,10 +1,10 @@
 .PHONY: tag push
 
-IMAGE=mkimage-gce
+IMAGE=mkimage-gcp
 
 default: push
 
-hash: Dockerfile make-gce
+hash: Dockerfile make-gcp
 	tar cf - $^ | docker build --no-cache -t $(IMAGE):build -
 	docker run --entrypoint sh --rm $(IMAGE):build -c "(cat $^; apt list --installed 2>/dev/null) | sha1sum" | sed 's/ .*//' > hash
 
diff --git a/tools/mkimage-gce/make-gce b/tools/mkimage-gcp/make-gcp
similarity index 87%
rename from tools/mkimage-gce/make-gce
rename to tools/mkimage-gcp/make-gcp
index ef811b2e8..4cf5d1281 100755
--- a/tools/mkimage-gce/make-gce
+++ b/tools/mkimage-gcp/make-gcp
@@ -26,8 +26,8 @@ CMDLINE="$*"
 # clean up subdirectories
 find . -mindepth 1 -maxdepth 1 -type d | xargs rm -rf
 
-# should be externally provided as GCE specific
-GCE_CONFIG="earlyprintk=ttyS0,115200 console=ttyS0,115200 mobyplatform=gcp vsyscall=emulate page_poison=1"
+# should be externally provided as GCP specific
+GCP_CONFIG="earlyprintk=ttyS0,115200 console=ttyS0,115200 vsyscall=emulate page_poison=1"
 
 CFG="DEFAULT linux
 LABEL linux