From d14412810ae400aa24e2a3689208fcb71e0e1d61 Mon Sep 17 00:00:00 2001 From: Tycho Andersen Date: Wed, 14 Jun 2017 12:08:29 -0600 Subject: [PATCH] kernel config project: s/x86/x86_64 Let's use the kernel machine architecture for this value. Also remove a broken check. The "arch" binary on OSX outputs different stuff than on linux. Since we don't need this check anyway (the variable is mostly to demonstrate how cross platform stuff would work, not to actually do it yet), let's just remove the check. Signed-off-by: Tycho Andersen --- projects/kernel-config/Makefile | 2 +- .../kernel-config/{kernel_config.x86 => kernel_config.x86_64} | 0 .../{kernel_config.x86.4.10.x => kernel_config.x86_64.4.10.x} | 0 .../{kernel_config.x86.4.9.x => kernel_config.x86_64.4.9.x} | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename projects/kernel-config/{kernel_config.x86 => kernel_config.x86_64} (100%) rename projects/kernel-config/{kernel_config.x86.4.10.x => kernel_config.x86_64.4.10.x} (100%) rename projects/kernel-config/{kernel_config.x86.4.9.x => kernel_config.x86_64.4.9.x} (100%) diff --git a/projects/kernel-config/Makefile b/projects/kernel-config/Makefile index a06c6be66..710c72007 100644 --- a/projects/kernel-config/Makefile +++ b/projects/kernel-config/Makefile @@ -12,7 +12,7 @@ HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}') # Name on Hub IMAGE:=kernel -ARCH?=$(shell if [ "$$(arch)" = "x86_64" ]]; then echo x86; else $$(arch); fi) +ARCH?=x86_64 .PHONY: check tag push sign # Targets: diff --git a/projects/kernel-config/kernel_config.x86 b/projects/kernel-config/kernel_config.x86_64 similarity index 100% rename from projects/kernel-config/kernel_config.x86 rename to projects/kernel-config/kernel_config.x86_64 diff --git a/projects/kernel-config/kernel_config.x86.4.10.x b/projects/kernel-config/kernel_config.x86_64.4.10.x similarity index 100% rename from projects/kernel-config/kernel_config.x86.4.10.x rename to projects/kernel-config/kernel_config.x86_64.4.10.x diff --git a/projects/kernel-config/kernel_config.x86.4.9.x b/projects/kernel-config/kernel_config.x86_64.4.9.x similarity index 100% rename from projects/kernel-config/kernel_config.x86.4.9.x rename to projects/kernel-config/kernel_config.x86_64.4.9.x