diff options
| -rw-r--r-- | Config.in | 13 | ||||
| -rw-r--r-- | package/Makefile.in | 14 |
2 files changed, 23 insertions, 4 deletions
@@ -102,6 +102,19 @@ config BR2_TOPDIR_SUFFIX build_ARCH -> build_ARCH_[SUFFIX] toolchain_build_ARCH -> toolchain_build_ARCH_[SUFFIX] +config BR2_ROOTFS_PREFIX + string "Custom root fs prefix" + default "rootfs" + help + Add a custom string to the beginning of the root file system name. + +config BR2_ROOTFS_SUFFIX + string "Custom root fs suffix" + default "$(DATE)" if BR2_TARGET_ATMEL + default "" if !BR2_TARGET_ATMEL + help + Add a custom string to the end of the root file system name. + config BR2_GNU_BUILD_SUFFIX string "GNU build hostname suffix" default "pc-linux-gnu" diff --git a/package/Makefile.in b/package/Makefile.in index f16746060..4939a00fc 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -65,14 +65,18 @@ TARGET_CXXFLAGS=$(TARGET_CFLAGS) TARGET_LDFLAGS=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib endif ######################################################################### - +ifeq ($(BR2_ROOTFS_SUFFIX),) +ROOTFS_SUFFIX:= +else +ROOTFS_SUFFIX:=-$(BR2_ROOTFS_SUFFIX) +endif ifeq ($(BR2_TOOLCHAIN_SOURCE),y) TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(ARCH)$(ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX) # Quotes are needed for spaces et al in path components. TARGET_PATH="$(TOOL_BUILD_DIR)/bin:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(PATH)" -IMAGE:=$(BINARIES_DIR)/rootfs.$(ARCH)$(ARCH_FPU_SUFFIX) +IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX) GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)$(GNU_TARGET_SUFFIX) TARGET_CROSS=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)- @@ -82,9 +86,11 @@ TOOLCHAIN_EXTERNAL_PREFIX:=$(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_PREFIX)) #")) TOOLCHAIN_EXTERNAL_PATH:=$(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_PATH))) #")) -TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(TOOLCHAIN_EXTERNAL_PREFIX) +#TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(TOOLCHAIN_EXTERNAL_PREFIX) +TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(ARCH)$(ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX) TARGET_PATH="$(STAGING_DIR)/bin:$(TOOL_BUILD_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)" -IMAGE:=$(BINARIES_DIR)/rootfs.$(TOOLCHAIN_EXTERNAL_PREFIX)-$(DATE) +#IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(TOOLCHAIN_EXTERNAL_PREFIX)$(ROOTFS_SUFFIX) +IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX) REAL_GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX) GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX) |