From 65ec08d1b0718604c92f091847d2bd8b415dfbad Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 7 Feb 2015 21:01:48 +0000 Subject: [PATCH] imagebuilder: align filename with SDK Signed-off-by: Jo-Philipp Wich SVN-Revision: 44313 --- target/imagebuilder/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index a8ff4a3c5a..1f97cb8613 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2012 OpenWrt.org +# Copyright (C) 2006-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,10 +12,7 @@ include $(INCLUDE_DIR)/version.mk override MAKEFLAGS= -PKG_OS:=$(word 2,$(subst -, ,$(shell $(HOSTCC) -dumpmachine))) -PKG_CPU:=$(word 1,$(subst -, ,$(shell $(HOSTCC) -dumpmachine))) - -IB_NAME:=OpenWrt-ImageBuilder-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))-for-$(PKG_OS)-$(PKG_CPU) +IB_NAME:=OpenWrt-ImageBuilder-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET)).$(HOST_OS)-$(HOST_ARCH) PKG_BUILD_DIR:=$(BUILD_DIR)/$(IB_NAME) IB_KDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(KERNEL_BUILD_DIR)) IB_LDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(LINUX_DIR))