From c3f7075aea5d93dff79238cd326b22f48e437a89 Mon Sep 17 00:00:00 2001
From: Henrik Triem <henrik.triem@netways.de>
Date: Mon, 4 May 2020 15:20:45 +0200
Subject: [PATCH] Remove support for non existing x86 version of Ubuntu 20.04
LTS
---
dist_x86_64.mk | 22 ++++++++++++++++++++++
focal/Makefile | 2 +-
focal/x86/Dockerfile | 26 --------------------------
focal/x86/Makefile | 1 -
4 files changed, 23 insertions(+), 28 deletions(-)
create mode 100644 dist_x86_64.mk
delete mode 100644 focal/x86/Dockerfile
delete mode 100644 focal/x86/Makefile
diff --git a/dist_x86_64.mk b/dist_x86_64.mk
new file mode 100644
index 0000000..5bd4d9e
--- /dev/null
+++ b/dist_x86_64.mk
@@ -0,0 +1,22 @@
+ifeq ($(VERSIONS),)
+VERSIONS := x86_64
+endif
+
+VERSIONS_PUSH := $(VERSIONS:=-push)
+VERSIONS_CLEAN := $(VERSIONS:=-clean)
+
+all: $(VERSIONS)
+push: $(VERSIONS_PUSH)
+clean: $(VERSIONS_CLEAN)
+
+$(VERSIONS):
+ make -C $@
+
+$(VERSIONS_PUSH):
+ make -C $(@:-push=) push
+
+$(VERSIONS_CLEAN):
+ make -C $(@:-clean=) clean
+
+.PHONY: all push clean $(VERSIONS) $(VERSIONS_PUSH) $(VERSIONS_CLEAN)
+
diff --git a/focal/Makefile b/focal/Makefile
index 5575b72..5a52fcc 100644
--- a/focal/Makefile
+++ b/focal/Makefile
@@ -1 +1 @@
-include ../dist.mk
+include ../dist_x86_64.mk
diff --git a/focal/x86/Dockerfile b/focal/x86/Dockerfile
deleted file mode 100644
index 7a1e7d6..0000000
--- a/focal/x86/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM i386/ubuntu:focal
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update \
- && apt-get install -y eatmydata \
- && eatmydata apt-get upgrade -y
-
-RUN eatmydata apt-get install -y \
- sudo wget curl tar expect git \
- devscripts build-essential lintian ccache pbuilder aptitude apt-utils
-
-RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
- && DIST="$(lsb_release -sc)" \
- && echo "deb http://packages.icinga.com/ubuntu icinga-${DIST} main" > /etc/apt/sources.list.d/${DIST}-icinga.list
-
-RUN groupadd -g 1000 build \
- && useradd -u 1000 -g 1000 -m build \
- && echo 'Defaults:build !requiretty' | tee -a /etc/sudoers \
- && echo 'build ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers \
- && chown build.build /usr/local/bin
-
-USER build
-RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
-ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
-CMD ["icinga-build-package"]
diff --git a/focal/x86/Makefile b/focal/x86/Makefile
deleted file mode 100644
index 15497f2..0000000
--- a/focal/x86/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-include ../../image.mk
--
GitLab