diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2010-03-10 22:13:47 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2010-04-09 11:04:35 +0200 |
| commit | 325bfd1cbae03fe286796d3fa7de7c0a3227f7a5 (patch) | |
| tree | 5ae4d6943afd1702a4cc96877ba49a6d82fab08a | |
| parent | eefa832dff6539f85f1ed9b3be1721da11107df3 (diff) | |
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>
| -rw-r--r-- | package/Makefile.in | 4 | ||||
| -rw-r--r-- | target/Config.in | 12 |
2 files changed, 0 insertions, 16 deletions
diff --git a/package/Makefile.in b/package/Makefile.in index 2bd364013..efb4dec34 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -109,7 +109,6 @@ TOOLCHAIN_DIR=$(BASE_DIR)/toolchain # 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)" -IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(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)- @@ -119,9 +118,6 @@ TOOLCHAIN_EXTERNAL_PREFIX:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX)) TOOLCHAIN_EXTERNAL_PATH:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH)) 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)" -#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) GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX) KERNEL_CROSS=$(TOOLCHAIN_EXTERNAL_PATH)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)- diff --git a/target/Config.in b/target/Config.in index 4cae66cf7..5d634ca2a 100644 --- a/target/Config.in +++ b/target/Config.in @@ -1,17 +1,5 @@ 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 string "Custom script to run before packing files" default "" |