From 15845d51e5b6211c81f933b4d74bd9de4481b2fa Mon Sep 17 00:00:00 2001 From: Gleb Fotengauer-Malinovskiy Date: Tue, 9 Jul 2019 12:30:26 +0300 Subject: [PATCH] Stop treating all ppc* architectures as ppc --- Makefile | 2 +- image.in/functions.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d4b571d3..d8687712 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ # for immediate assignment ifndef ARCH ARCH := $(shell arch \ - | sed 's/i686/i586/; s/armv7.*/armh/; s/armv.*/arm/; s/ppc.*/ppc/') + | sed 's/i686/i586/; s/armv7.*/armh/; s/armv.*/arm/') endif ifndef ARCHES diff --git a/image.in/functions.mk b/image.in/functions.mk index 17e4a3a8..6156ee07 100644 --- a/image.in/functions.mk +++ b/image.in/functions.mk @@ -2,7 +2,7 @@ PKGDIR ?= $(GLOBAL_BUILDDIR)/pkg # duplicated from metaprofile makefiles for the sake of "local" builds -ARCH ?= $(shell arch | sed 's/i686/i586/; s/armv.*/arm/; s/ppc.*/ppc/') +ARCH ?= $(shell arch | sed 's/i686/i586/; s/armv.*/arm/') DATE ?= $(shell date +%Y%m%d) # prefix pkglist name with its directory to form a path (relative/absolute)