diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-01-20 18:39:35 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-01-20 18:45:24 +0100 |
| commit | 52ad40a25e3f2fe7b897b7fcd7acfebe13ca5c89 (patch) | |
| tree | fe94395c7870954b7628a73250dc8090b3fa96cc | |
| parent | adcc592f7d7217bf70912e0f6088d5ef1eefcfb9 (diff) | |
| download | OSELAS.Toolchain-52ad40a25e3f2fe7b897b7fcd7acfebe13ca5c89.tar.gz OSELAS.Toolchain-52ad40a25e3f2fe7b897b7fcd7acfebe13ca5c89.tar.xz | |
image-toolchain-tgz: add host architecture to the file name again
It got lost during the conversion to the ptxdist iamge rule
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/image-toolchain-deb.make | 12 | ||||
| -rw-r--r-- | rules/image-toolchain-tgz.make | 2 | ||||
| -rw-r--r-- | rules/pre/toolchain.make | 15 |
3 files changed, 17 insertions, 12 deletions
diff --git a/rules/image-toolchain-deb.make b/rules/image-toolchain-deb.make index aae6146..54445df 100644 --- a/rules/image-toolchain-deb.make +++ b/rules/image-toolchain-deb.make @@ -17,17 +17,7 @@ IMAGE_PACKAGES-$(PTXCONF_IMAGE_TOOLCHAIN_DEB) += image-toolchain-deb # Paths and names # IMAGE_TOOLCHAIN_DEB_VERSION := $(shell ./scripts/setlocalversion ./.tarball-version) -IMAGE_TOOLCHAIN_DEB_ARCH := $(shell uname -m) -ifeq ($(IMAGE_TOOLCHAIN_DEB_ARCH),x86_64) -IMAGE_TOOLCHAIN_DEB_ARCH := amd64 -endif -ifeq ($(patsubst i%86,,$(IMAGE_TOOLCHAIN_DEB_ARCH)),) -IMAGE_TOOLCHAIN_DEB_ARCH := i386 -endif -ifeq ($(IMAGE_TOOLCHAIN_DEB_ARCH),ppc) -IMAGE_TOOLCHAIN_DEB_ARCH := powerpc -endif -IMAGE_TOOLCHAIN_DEB_IMAGE := $(PTXDIST_WORKSPACE)/dist/oselas.toolchain-$(IMAGE_TOOLCHAIN_DEB_VERSION)-$(subst _,-,$(PTXCONF_PLATFORM))_$(IMAGE_TOOLCHAIN_DEB_VERSION)_$(IMAGE_TOOLCHAIN_DEB_ARCH).deb +IMAGE_TOOLCHAIN_DEB_IMAGE := $(PTXDIST_WORKSPACE)/dist/oselas.toolchain-$(IMAGE_TOOLCHAIN_DEB_VERSION)-$(subst _,-,$(PTXCONF_PLATFORM))_$(IMAGE_TOOLCHAIN_DEB_VERSION)_$(PTX_TOOLCHAIN_HOST_ARCH).deb # ---------------------------------------------------------------------------- # Image diff --git a/rules/image-toolchain-tgz.make b/rules/image-toolchain-tgz.make index a80c808..dfd821c 100644 --- a/rules/image-toolchain-tgz.make +++ b/rules/image-toolchain-tgz.make @@ -17,7 +17,7 @@ IMAGE_PACKAGES-$(PTXCONF_IMAGE_TOOLCHAIN_TGZ) += image-toolchain-tgz # Paths and names # IMAGE_TOOLCHAIN_TGZ_VERSION := $(shell ./scripts/setlocalversion ./.tarball-version) -IMAGE_TOOLCHAIN_TGZ_IMAGE := $(PTXDIST_WORKSPACE)/dist/oselas.toolchain-$(IMAGE_TOOLCHAIN_TGZ_VERSION)-$(subst _,-,$(PTXCONF_PLATFORM)).tar.xz +IMAGE_TOOLCHAIN_TGZ_IMAGE := $(PTXDIST_WORKSPACE)/dist/oselas.toolchain-$(IMAGE_TOOLCHAIN_TGZ_VERSION)-$(subst _,-,$(PTXCONF_PLATFORM))_$(PTX_TOOLCHAIN_HOST_ARCH).tar.xz # ---------------------------------------------------------------------------- # Image diff --git a/rules/pre/toolchain.make b/rules/pre/toolchain.make index a55dd5a..6f212f5 100644 --- a/rules/pre/toolchain.make +++ b/rules/pre/toolchain.make @@ -60,4 +60,19 @@ BUILDDIR_DEBUG := $(BUILDDIR) BUILDDIR_CROSS_DEBUG := $(CROSS_BUILDDIR) endif +# +# images +# + +PTX_TOOLCHAIN_HOST_ARCH := $(shell uname -m) +ifeq ($(PTX_TOOLCHAIN_HOST_ARCH),x86_64) +PTX_TOOLCHAIN_HOST_ARCH := amd64 +endif +ifeq ($(patsubst i%86,,$(PTX_TOOLCHAIN_HOST_ARCH)),) +PTX_TOOLCHAIN_HOST_ARCH := i386 +endif +ifeq ($(PTX_TOOLCHAIN_HOST_ARCH),ppc) +PTX_TOOLCHAIN_HOST_ARCH := powerpc +endif + # vim: syntax=make |