Remove IMAGE and related configuration options
Now, we just hardcode the image filenames to be rootfs.$(FSTYPE), in the $(BINARIES_DIR). Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
eefa832dff
commit
325bfd1cba
@ -109,7 +109,6 @@ TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
|
|||||||
|
|
||||||
# Quotes are needed for spaces et al in path components.
|
# Quotes are needed for spaces et al in path components.
|
||||||
TARGET_PATH="$(TOOLCHAIN_DIR)/bin:$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin/:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(PATH)"
|
TARGET_PATH="$(TOOLCHAIN_DIR)/bin:$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin/:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(PATH)"
|
||||||
IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(ROOTFS_SUFFIX)
|
|
||||||
GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux
|
GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux
|
||||||
REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)$(GNU_TARGET_SUFFIX)
|
REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)$(GNU_TARGET_SUFFIX)
|
||||||
TARGET_CROSS=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-
|
TARGET_CROSS=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-
|
||||||
@ -119,9 +118,6 @@ TOOLCHAIN_EXTERNAL_PREFIX:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))
|
|||||||
TOOLCHAIN_EXTERNAL_PATH:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
|
TOOLCHAIN_EXTERNAL_PATH:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
|
||||||
TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
|
TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
|
||||||
TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin/:$(TOOLCHAIN_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)"
|
TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin/:$(TOOLCHAIN_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)"
|
||||||
#IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(TOOLCHAIN_EXTERNAL_PREFIX)$(ROOTFS_SUFFIX)
|
|
||||||
IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(ROOTFS_SUFFIX)
|
|
||||||
|
|
||||||
REAL_GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
|
REAL_GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
|
||||||
GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
|
GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
|
||||||
KERNEL_CROSS=$(TOOLCHAIN_EXTERNAL_PATH)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)-
|
KERNEL_CROSS=$(TOOLCHAIN_EXTERNAL_PATH)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)-
|
||||||
|
@ -1,17 +1,5 @@
|
|||||||
menu "Target filesystem options"
|
menu "Target filesystem options"
|
||||||
|
|
||||||
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 ""
|
|
||||||
help
|
|
||||||
Add a custom string to the end of the root file system name.
|
|
||||||
|
|
||||||
config BR2_ROOTFS_POST_BUILD_SCRIPT
|
config BR2_ROOTFS_POST_BUILD_SCRIPT
|
||||||
string "Custom script to run before packing files"
|
string "Custom script to run before packing files"
|
||||||
default ""
|
default ""
|
||||||
|
Loading…
Reference in New Issue
Block a user