From ac9c49892399229231fb1ddd11de5155abd93e29 Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Tue, 21 Sep 2021 22:15:19 -1000 Subject: [PATCH] build: normalize imagebuilder/sdk naming We use a specific file prefix dependent on target and release except for imagebuilder and sdk. While everything goes `openwrt--` the two go `openwrt---`. This commit normalizes the naming: openwrt-x86-64-generic-squashfs-combined.img openwrt-x86-64-generic-squashfs-rootfs.img.gz openwrt-x86-64-imagebuilder.Linux-x86_64.tar.xz openwrt-x86-64-sdk_gcc-11.2.0_musl.Linux-x86_64.tar.xz Previously the naming would be as following: openwrt-x86-64-generic-squashfs-combined.img openwrt-x86-64-generic-squashfs-rootfs.img.gz openwrt-imagebuilder-x86-64.Linux-x86_64.tar.xz openwrt-sdk-x86-64_gcc-11.2.0_musl.Linux-x86_64.tar.xz Signed-off-by: Paul Spooren --- target/imagebuilder/Makefile | 2 +- target/sdk/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index 0580e41c57..d108f390bb 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/feeds.mk override MAKEFLAGS= -IB_NAME:=$(VERSION_DIST_SANITIZED)-imagebuilder-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET)).$(HOST_OS)-$(HOST_ARCH) +IB_NAME:=$(VERSION_DIST_SANITIZED)-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))-imagebuilder.$(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)) diff --git a/target/sdk/Makefile b/target/sdk/Makefile index 0606621192..494d66bb94 100644 --- a/target/sdk/Makefile +++ b/target/sdk/Makefile @@ -13,7 +13,7 @@ include $(INCLUDE_DIR)/download.mk override MAKEFLAGS= -SDK_NAME:=$(VERSION_DIST_SANITIZED)-sdk-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))$(if $(GCCV),_gcc-$(GCCV))$(DIR_SUFFIX).$(HOST_OS)-$(HOST_ARCH) +SDK_NAME:=$(VERSION_DIST_SANITIZED)-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))-sdk$(if $(GCCV),_gcc-$(GCCV))$(DIR_SUFFIX).$(HOST_OS)-$(HOST_ARCH) SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME) STAGING_SUBDIR_HOST := staging_dir/host -- 2.30.2