From 4e36db9541b83c699b0eb6b388bd2d6811c8b2c9 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Wed, 31 May 2017 11:13:00 -0500 Subject: [PATCH 1/2] Rename deb dockerfiles to $(uname -m) equivalents Signed-off-by: Eli Uriegas Upstream-commit: 3f7e423438733fb5f593f666d12714ae2f63fcc9 Component: packaging --- .../deb/debian-jessie/{Dockerfile.armhf => Dockerfile.armv7l} | 0 .../deb/debian-jessie/{Dockerfile.amd64 => Dockerfile.x86_64} | 0 .../deb/debian-stretch/{Dockerfile.armhf => Dockerfile.armv7l} | 0 .../deb/debian-stretch/{Dockerfile.amd64 => Dockerfile.x86_64} | 0 .../deb/debian-wheezy/{Dockerfile.armhf => Dockerfile.armv7l} | 0 .../deb/debian-wheezy/{Dockerfile.amd64 => Dockerfile.x86_64} | 0 .../deb/ubuntu-trusty/{Dockerfile.armhf => Dockerfile.armv7l} | 0 .../deb/ubuntu-trusty/{Dockerfile.amd64 => Dockerfile.x86_64} | 0 .../deb/ubuntu-xenial/{Dockerfile.armhf => Dockerfile.armv7l} | 0 .../deb/ubuntu-xenial/{Dockerfile.amd64 => Dockerfile.x86_64} | 0 .../deb/ubuntu-yakkety/{Dockerfile.armhf => Dockerfile.armv7l} | 0 .../deb/ubuntu-yakkety/{Dockerfile.amd64 => Dockerfile.x86_64} | 0 .../deb/ubuntu-zesty/{Dockerfile.armhf => Dockerfile.armv7l} | 0 .../deb/ubuntu-zesty/{Dockerfile.amd64 => Dockerfile.x86_64} | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename components/packaging/deb/debian-jessie/{Dockerfile.armhf => Dockerfile.armv7l} (100%) rename components/packaging/deb/debian-jessie/{Dockerfile.amd64 => Dockerfile.x86_64} (100%) rename components/packaging/deb/debian-stretch/{Dockerfile.armhf => Dockerfile.armv7l} (100%) rename components/packaging/deb/debian-stretch/{Dockerfile.amd64 => Dockerfile.x86_64} (100%) rename components/packaging/deb/debian-wheezy/{Dockerfile.armhf => Dockerfile.armv7l} (100%) rename components/packaging/deb/debian-wheezy/{Dockerfile.amd64 => Dockerfile.x86_64} (100%) rename components/packaging/deb/ubuntu-trusty/{Dockerfile.armhf => Dockerfile.armv7l} (100%) rename components/packaging/deb/ubuntu-trusty/{Dockerfile.amd64 => Dockerfile.x86_64} (100%) rename components/packaging/deb/ubuntu-xenial/{Dockerfile.armhf => Dockerfile.armv7l} (100%) rename components/packaging/deb/ubuntu-xenial/{Dockerfile.amd64 => Dockerfile.x86_64} (100%) rename components/packaging/deb/ubuntu-yakkety/{Dockerfile.armhf => Dockerfile.armv7l} (100%) rename components/packaging/deb/ubuntu-yakkety/{Dockerfile.amd64 => Dockerfile.x86_64} (100%) rename components/packaging/deb/ubuntu-zesty/{Dockerfile.armhf => Dockerfile.armv7l} (100%) rename components/packaging/deb/ubuntu-zesty/{Dockerfile.amd64 => Dockerfile.x86_64} (100%) diff --git a/components/packaging/deb/debian-jessie/Dockerfile.armhf b/components/packaging/deb/debian-jessie/Dockerfile.armv7l similarity index 100% rename from components/packaging/deb/debian-jessie/Dockerfile.armhf rename to components/packaging/deb/debian-jessie/Dockerfile.armv7l diff --git a/components/packaging/deb/debian-jessie/Dockerfile.amd64 b/components/packaging/deb/debian-jessie/Dockerfile.x86_64 similarity index 100% rename from components/packaging/deb/debian-jessie/Dockerfile.amd64 rename to components/packaging/deb/debian-jessie/Dockerfile.x86_64 diff --git a/components/packaging/deb/debian-stretch/Dockerfile.armhf b/components/packaging/deb/debian-stretch/Dockerfile.armv7l similarity index 100% rename from components/packaging/deb/debian-stretch/Dockerfile.armhf rename to components/packaging/deb/debian-stretch/Dockerfile.armv7l diff --git a/components/packaging/deb/debian-stretch/Dockerfile.amd64 b/components/packaging/deb/debian-stretch/Dockerfile.x86_64 similarity index 100% rename from components/packaging/deb/debian-stretch/Dockerfile.amd64 rename to components/packaging/deb/debian-stretch/Dockerfile.x86_64 diff --git a/components/packaging/deb/debian-wheezy/Dockerfile.armhf b/components/packaging/deb/debian-wheezy/Dockerfile.armv7l similarity index 100% rename from components/packaging/deb/debian-wheezy/Dockerfile.armhf rename to components/packaging/deb/debian-wheezy/Dockerfile.armv7l diff --git a/components/packaging/deb/debian-wheezy/Dockerfile.amd64 b/components/packaging/deb/debian-wheezy/Dockerfile.x86_64 similarity index 100% rename from components/packaging/deb/debian-wheezy/Dockerfile.amd64 rename to components/packaging/deb/debian-wheezy/Dockerfile.x86_64 diff --git a/components/packaging/deb/ubuntu-trusty/Dockerfile.armhf b/components/packaging/deb/ubuntu-trusty/Dockerfile.armv7l similarity index 100% rename from components/packaging/deb/ubuntu-trusty/Dockerfile.armhf rename to components/packaging/deb/ubuntu-trusty/Dockerfile.armv7l diff --git a/components/packaging/deb/ubuntu-trusty/Dockerfile.amd64 b/components/packaging/deb/ubuntu-trusty/Dockerfile.x86_64 similarity index 100% rename from components/packaging/deb/ubuntu-trusty/Dockerfile.amd64 rename to components/packaging/deb/ubuntu-trusty/Dockerfile.x86_64 diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.armhf b/components/packaging/deb/ubuntu-xenial/Dockerfile.armv7l similarity index 100% rename from components/packaging/deb/ubuntu-xenial/Dockerfile.armhf rename to components/packaging/deb/ubuntu-xenial/Dockerfile.armv7l diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.amd64 b/components/packaging/deb/ubuntu-xenial/Dockerfile.x86_64 similarity index 100% rename from components/packaging/deb/ubuntu-xenial/Dockerfile.amd64 rename to components/packaging/deb/ubuntu-xenial/Dockerfile.x86_64 diff --git a/components/packaging/deb/ubuntu-yakkety/Dockerfile.armhf b/components/packaging/deb/ubuntu-yakkety/Dockerfile.armv7l similarity index 100% rename from components/packaging/deb/ubuntu-yakkety/Dockerfile.armhf rename to components/packaging/deb/ubuntu-yakkety/Dockerfile.armv7l diff --git a/components/packaging/deb/ubuntu-yakkety/Dockerfile.amd64 b/components/packaging/deb/ubuntu-yakkety/Dockerfile.x86_64 similarity index 100% rename from components/packaging/deb/ubuntu-yakkety/Dockerfile.amd64 rename to components/packaging/deb/ubuntu-yakkety/Dockerfile.x86_64 diff --git a/components/packaging/deb/ubuntu-zesty/Dockerfile.armhf b/components/packaging/deb/ubuntu-zesty/Dockerfile.armv7l similarity index 100% rename from components/packaging/deb/ubuntu-zesty/Dockerfile.armhf rename to components/packaging/deb/ubuntu-zesty/Dockerfile.armv7l diff --git a/components/packaging/deb/ubuntu-zesty/Dockerfile.amd64 b/components/packaging/deb/ubuntu-zesty/Dockerfile.x86_64 similarity index 100% rename from components/packaging/deb/ubuntu-zesty/Dockerfile.amd64 rename to components/packaging/deb/ubuntu-zesty/Dockerfile.x86_64 From f4929f012a336f8975b4ca9783601ecf35337c79 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Wed, 31 May 2017 11:15:19 -0500 Subject: [PATCH 2/2] Change ARCH to be reflective Signed-off-by: Eli Uriegas Upstream-commit: 930db40ec8424555612ce70781e94d5cb172aa4c Component: packaging --- components/packaging/deb/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/packaging/deb/Makefile b/components/packaging/deb/Makefile index 4c62c275fc..5ca2b57f62 100644 --- a/components/packaging/deb/Makefile +++ b/components/packaging/deb/Makefile @@ -1,6 +1,6 @@ SHELL:=/bin/bash ALPINE:=$(shell $(CURDIR)/../detect_alpine_image) -ARCH:=amd64 +ARCH:=$(shell uname -m) ENGINE_DIR:=$(CURDIR)/../../engine CLI_DIR:=$(CURDIR)/../../cli GITCOMMIT?=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD)