diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 19:03:21 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 19:03:21 +0200 |
| commit | 910ee3f081d229f4439aa2bdbb3553b61cc116cd (patch) | |
| tree | 91382e19d3f519c34777cb6f6277beb8b0190149 /mk | |
| parent | 8cf892f141edd33a54b09a16f72650754f6032b5 (diff) | |
fix symbol renaming bugs
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 2 | ||||
| -rw-r--r-- | mk/image.mk | 4 | ||||
| -rw-r--r-- | mk/rootfs.mk | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mk/build.mk b/mk/build.mk index ee3fbc609..18ade8e77 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -141,7 +141,7 @@ world: mkdir -p $(DL_DIR) $(HOST_BUILD_DIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \ $(STAGING_HOST_DIR) $(TOOLCHAIN_BUILD_DIR) $(STAGING_PKG_DIR)/stamps ${BASH} ${TOPDIR}/scripts/scan-pkgs.sh -ifeq ($(ADK_TOOLCHAIN),y) +ifeq ($(ADK_TARGET_TOOLCHAIN),y) ifeq ($(ADK_TOOLCHAIN_ONLY),y) $(MAKE) -f mk/build.mk package/hostcompile toolchain/fixup package/compile else diff --git a/mk/image.mk b/mk/image.mk index 62ac155f8..7e47d8dc7 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -128,7 +128,7 @@ kernel-package: kernel-strip $(TRACE) target/$(ADK_TARGET_ARCH)-install-kernel-package $(PKG_INSTALL) $(KERNEL_PKG) $(MAKE_TRACE) -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) TARGET_KERNEL= ${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_FS}-kernel INITRAMFS= ${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS} ROOTFSSQUASHFS= ${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.img @@ -150,7 +150,7 @@ ${FW_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR}/.adk kernel-package cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | \ sed "s#\(.*\)#:0:0::::::\1#" | sort | \ ${STAGING_HOST_DIR}/usr/bin/cpio -o -Hustar -P | gzip -n9 >$@ -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) endif diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 3956cf6a5..dd0516a3e 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -8,7 +8,7 @@ FS_CMDLINE:=$(3) endif endef -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) MTDDEV:= root=/dev/mtdblock0 ifeq ($(ADK_TARGET_ROOTFS_ARCHIVE),y) ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) |