From e374e7a7e1cb448b7a28733c9e186997959b6019 Mon Sep 17 00:00:00 2001 From: Stoiko Ivanov Date: Thu, 25 Apr 2019 19:53:58 +0200 Subject: [PATCH] bsys: Drop i686 support ArchLinux has stopped supporting i686 1.5 years ago [0]. [0] https://www.archlinux.org/news/the-end-of-i686-support/ Signed-off-by: Stoiko Ivanov --- Makefile | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index b61323e..7712f6d 100644 --- a/Makefile +++ b/Makefile @@ -1,45 +1,29 @@ TODAY != date '+%Y%m%d' VERSION := $(TODAY)-1 -V_amd64 := $(VERSION)_amd64 -V_i686 := $(VERSION)_i686 +ARCH := amd64 +V_ARCH := $(VERSION)_$(ARCH) PERL := perl -I. -all: - @echo The following targets are available: - @echo ' $(MAKE) base-amd64' - @echo ' $(MAKE) base-i686' - @echo ' $(MAKE) default (same as make base-amd64)' - .PHONY: default default: base-amd64 # we should always regenerate this: -.PHONY: aab.conf aab.conf.amd64 aab.conf.i686 +.PHONY: aab.conf aab.conf: echo 'Name: archlinux-base' > aab.conf echo 'Version: $(VERSION)' >> aab.conf echo 'Section: system' >> aab.conf echo 'Maintainer: Proxmox Support Team ' >> aab.conf echo 'Source: http://archlinux.cu.be/$$repo/os/$$arch' >> aab.conf - -aab.conf.amd64: aab.conf - echo 'Architecture: amd64' >> aab.conf -aab.conf.i686: aab.conf - echo 'Architecture: i686' >> aab.conf - -.PHONY: base-amd64 -base-amd64: archlinux-base_$(V_amd64).tar.gz -archlinux-base_$(V_amd64).tar.gz: aab.conf.amd64 + echo 'Architecture: $(ARCH)' >> aab.conf echo 'Headline: ArchLinux base image.' >> aab.conf - $(MAKE) build-current -.PHONY: base-xi686 -base-i686: archlinux-base_$(V_i686).tar.gz -archlinux-base_$(V_i686).tar.gz: aab.conf.i686 - echo 'Headline: ArchLinux base image.' >> aab.conf - $(MAKE) build-current +.PHONY: base-$(ARCH) +base-$(ARCH): aab.conf archlinux-base_$(V_ARCH).tar.gz + +archlinux-base_$(V_ARCH).tar.gz: build-current .PHONY: build-current build-current: check-all