diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-11 18:20:46 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-11 18:20:46 +0100 |
| commit | b4c24c8ee4081fff087ca113c7d0087d4462e5aa (patch) | |
| tree | c91cfe82c500dbf8ee126fc2361eb6d24378a685 /mk | |
| parent | b608c5a7dc38765319cc5f7cb32d35fcb0701d08 (diff) | |
| parent | 72d93163012bc54c99ba5cd589f583fbf2c0dad6 (diff) | |
update todo, resolv conflict
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 1 | ||||
| -rw-r--r-- | mk/vars.mk | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/mk/build.mk b/mk/build.mk index 1cd50ea9b..ef551741a 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -14,7 +14,6 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_STATIC=n \ ADK_MAKE_PARALLEL=y \ ADK_MAKE_JOBS=4 \ - ADK_PACKAGE_BZR=n \ ADK_PACKAGE_GRUB=n \ ADK_PACKAGE_BASE_FILES=y \ ADK_PACKAGE_MGETTY=n \ diff --git a/mk/vars.mk b/mk/vars.mk index 0dd616846..6a0f50a2f 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -54,7 +54,6 @@ TARGET_DIR_PFX:= $(BASE_DIR)/root_* TARGET_PATH= ${SCRIPT_DIR}:${TOOLS_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_TARGET_DIR}/scripts:${_PATH} REAL_GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX) GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux -TOOLCHAIN_SYSROOT:= $(TOOLCHAIN_BUILD_DIR)/libc_dev ifeq ($(ADK_NATIVE),y) TARGET_CROSS:= TARGET_COMPILER_PREFIX?= |