Add repo as submodule add patch support arm64 38/538/1
authorjialv01 <Jianlin.Lv@arm.com>
Wed, 3 Apr 2019 05:53:06 +0000 (13:53 +0800)
committerjialv01 <Jianlin.Lv@arm.com>
Wed, 3 Apr 2019 05:53:06 +0000 (13:53 +0800)
1.forked SEBA componants`s repo to IEC repo,include:
    kafka-exporter,cp-docker-images
2.Create new directory:src/use_cases/seba_on_arm/docker/build
    Store the script to build docker image
3.Create new directory:src/use_cases/seba_on_arm/patches
    This directory holds the patches files of the submodules
4.Add patch files inorder to aarch64 docker image support
    patches/kafka-exporter/0001-modify-Makefile-for-aarch64-support.patch
    build/cp-docker-images/build.arm
    build/kafka-exporter/build.arm

Change-Id: I53db4a633ba0a39f0bb2e8c8b17b3f5271fba2b1
Signed-off-by: jialv01 <Jianlin.Lv@arm.com>
.gitmodules
src/use_cases/seba_on_arm/docker/build/cp-docker-images/build.arm [new file with mode: 0755]
src/use_cases/seba_on_arm/docker/build/kafka-exporter/build.arm [new file with mode: 0755]
src/use_cases/seba_on_arm/patches/kafka-exporter/0001-modify-Makefile-for-aarch64-support.patch [new file with mode: 0644]
src/use_cases/seba_on_arm/src_repo/cp-docker-images [new submodule]
src/use_cases/seba_on_arm/src_repo/kafka-exporter [new submodule]

index 8647d03..917f06c 100644 (file)
@@ -1,3 +1,10 @@
 [submodule "seba_charts"]
        path = src/use_cases/seba_on_arm/src_repo/seba_charts
        url = https://github.com/iecedge/seba_charts.git
+[submodule "kafka-exporter"]
+       path = src/use_cases/seba_on_arm/src_repo/kafka-exporter
+       url = https://github.com/iecedge/kafka_exporter.git
+[submodule "cp-docker-images"]
+       path = src/use_cases/seba_on_arm/src_repo/cp-docker-images
+       url = https://github.com/iecedge/cp-docker-images.git
+       branch = 4.1.2-post-arm64v8
diff --git a/src/use_cases/seba_on_arm/docker/build/cp-docker-images/build.arm b/src/use_cases/seba_on_arm/docker/build/cp-docker-images/build.arm
new file mode 100755 (executable)
index 0000000..446b5fb
--- /dev/null
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# This script builds the cp-kafka docker image
+
+#cd $CP-DOCKER-IMAGES_PATH
+
+set -o errexit
+set -o xtrace
+
+# Building the Images
+make build-debian
+docker tag confluentinc/cp-kafka:4.1.2  iecedge/cp-kafka_arm64:4.1.2
diff --git a/src/use_cases/seba_on_arm/docker/build/kafka-exporter/build.arm b/src/use_cases/seba_on_arm/docker/build/kafka-exporter/build.arm
new file mode 100755 (executable)
index 0000000..0b42425
--- /dev/null
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+# This script builds the kafka-exporter binaries and docker image
+set -o errexit
+set -o xtrace
+
+#cd $KAFKA-EXPORTER_PATH
+
+#Build Binary
+make
+#Build Docker Image
+make docker
+docker tag kafka-exporter:master  iecedge/kafka-exporter_arm64:master
diff --git a/src/use_cases/seba_on_arm/patches/kafka-exporter/0001-modify-Makefile-for-aarch64-support.patch b/src/use_cases/seba_on_arm/patches/kafka-exporter/0001-modify-Makefile-for-aarch64-support.patch
new file mode 100644 (file)
index 0000000..817a9ab
--- /dev/null
@@ -0,0 +1,26 @@
+From 0d93a605f2a8dc34ce4040e5f34ae68d636fce8b Mon Sep 17 00:00:00 2001
+From: jialv01 <Jianlin.Lv@arm.com>
+Date: Wed, 27 Mar 2019 15:25:58 +0800
+Subject: [PATCH] modify Makefile for aarch64 support
+
+Signed-off-by: jialv01 <Jianlin.Lv@arm.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index e2ba788..d44171c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -55,7 +55,7 @@ release: promu github-release
+ promu:
+       @GOOS=$(shell uname -s | tr A-Z a-z) \
+-              GOARCH=$(subst x86_64,amd64,$(patsubst i%86,386,$(shell uname -m))) \
++              GOARCH=$(subst aarch64,arm64,$(subst x86_64,amd64,$(patsubst i%86,386,$(shell uname -m)))) \
+               $(GO) get -u github.com/prometheus/promu
+ github-release:
+-- 
+2.17.1
+
diff --git a/src/use_cases/seba_on_arm/src_repo/cp-docker-images b/src/use_cases/seba_on_arm/src_repo/cp-docker-images
new file mode 160000 (submodule)
index 0000000..9b9973b
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 9b9973b6cdf6eca5aaf86e16b19ef688b3db81a5
diff --git a/src/use_cases/seba_on_arm/src_repo/kafka-exporter b/src/use_cases/seba_on_arm/src_repo/kafka-exporter
new file mode 160000 (submodule)
index 0000000..56c1d47
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 56c1d47f9794d59d042852cc31558257e24d2ea0