diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-05 06:07:19 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-05 06:07:19 +0200 |
| commit | 8316d0355b3f3d3c2bcad9d3900feb2bec40da46 (patch) | |
| tree | d26e9b24ef7087b7045c5529f4235ce48ed759f6 | |
| parent | 247861e494c03f9c0438ea3979110efbe405d98d (diff) | |
fix iso building
| -rw-r--r-- | mk/image.mk | 2 | ||||
| -rw-r--r-- | mk/vars.mk | 2 | ||||
| -rw-r--r-- | target/config/Config.in.tools | 13 |
3 files changed, 9 insertions, 8 deletions
diff --git a/mk/image.mk b/mk/image.mk index ee2f991e0..9e755ad1a 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -238,7 +238,7 @@ ${FW_DIR}/${ROOTFSISO}: ${TARGET_DIR} kernel-package ${TARGET_DIR}/boot/syslinux echo 'DEFAULT /boot/kernel root=/dev/sr0' > \ ${TARGET_DIR}/boot/syslinux/isolinux.cfg - ${STAGING_HOST_DIR}/usr/bin/mkisofs -R -uid 0 -gid 0 -o $@ \ + PATH='${HOST_PATH}' mkisofs -R -uid 0 -gid 0 -o $@ \ -b boot/syslinux/isolinux.bin \ -c boot/syslinux/boot.cat -no-emul-boot \ -boot-load-size 4 -boot-info-table ${TARGET_DIR} diff --git a/mk/vars.mk b/mk/vars.mk index 3215ff1a5..e804ad5e6 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -54,7 +54,7 @@ SCRIPT_TARGET_DIR:= ${STAGING_TARGET_DIR}/scripts # PATH variables TARGET_PATH= ${SCRIPT_DIR}:${STAGING_TARGET_DIR}/scripts:${TOOLCHAIN_DIR}/usr/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH} -HOST_PATH= ${SCRIPT_DIR}:${TOOLCHAIN_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH} +HOST_PATH= ${SCRIPT_DIR}:${TOOLCHAIN_DIR}/usr/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH} AUTOTOOL_PATH= ${TOOLCHAIN_DIR}/usr/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${_PATH} ifeq ($(ADK_DISABLE_HONOUR_CFLAGS),) diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index f95a4508b..b3e900bb3 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -105,15 +105,16 @@ config ADK_HOST_BUILD_QEMU boolean default n -config ADK_HOST_NEED_SYSLINUX +# optional, must be used from OpenADK +config ADK_HOST_NEED_MKIMAGE boolean default n -config ADK_HOST_BUILD_SYSLINUX +config ADK_HOST_BUILD_MKIMAGE boolean + default y if ADK_HOST_NEED_MKIMAGE default n -# optional, must be used from OpenADK config ADK_HOST_NEED_MTD_UTILS boolean default n @@ -132,13 +133,13 @@ config ADK_HOST_BUILD_SQUASHFS default y if ADK_HOST_NEED_SQUASHFS default n -config ADK_HOST_NEED_MKIMAGE +config ADK_HOST_NEED_SYSLINUX boolean default n -config ADK_HOST_BUILD_MKIMAGE +config ADK_HOST_BUILD_SYSLINUX boolean - default y if ADK_HOST_NEED_MKIMAGE + default y if ADK_HOST_NEED_SYSLINUX default n config ADK_HOST_BUILD_PCRE |