diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-16 13:11:33 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-16 13:11:33 +0100 |
| commit | 422fe42ea4a4f5c5f868736e17a0462e1e5c1c6b (patch) | |
| tree | 387c24796571c19abda81843ae13e5356091b3bf | |
| parent | 24db4fb9b27f4ea87b3ecdf8fd4dd07b62ba9514 (diff) | |
small fixes for iso target
| -rw-r--r-- | target/config/Config.in | 1 | ||||
| -rw-r--r-- | target/x86/Makefile | 2 | ||||
| -rw-r--r-- | tools/Makefile | 5 | ||||
| -rw-r--r-- | tools/syslinux/Makefile | 1 |
4 files changed, 7 insertions, 2 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index db04414de..99b056546 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -755,6 +755,7 @@ config ADK_TARGET_ROOTFS_ISO select ADK_KERNEL_SCSI select ADK_KERNEL_BLK_DEV_SR depends on ADK_HOST_LINUX + depends on ADK_LINUX_X86 help Use this option to create a bootable ISO image. diff --git a/target/x86/Makefile b/target/x86/Makefile index 87d3b5806..b228810c7 100644 --- a/target/x86/Makefile +++ b/target/x86/Makefile @@ -65,8 +65,8 @@ ifeq ($(ADK_HARDWARE_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu-system-i386 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/$(TARGET_KERNEL)' endif +endif ifeq (${ADK_TARGET_FS},iso) imageinstall: ${BIN_DIR}/${ROOTFSISO} @echo 'ISO image is at $<' endif -endif diff --git a/tools/Makefile b/tools/Makefile index 86eb09e22..4a5f1ec92 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -3,7 +3,10 @@ include $(TOPDIR)/rules.mk -TARGETS:=adk mkcrypt cpio mkimage genext2fs cdrtools syslinux +TARGETS:=adk mkcrypt cpio mkimage genext2fs +ifeq ($(ADK_TARGET_ROOTFS_ISO),y) +TARGETS+=cdrtools syslinux +endif TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS)) TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS)) diff --git a/tools/syslinux/Makefile b/tools/syslinux/Makefile index 2f44c301b..1ac6ef672 100644 --- a/tools/syslinux/Makefile +++ b/tools/syslinux/Makefile @@ -24,6 +24,7 @@ $(WRKBUILD)/.installed: ${WRKBUILD}/.compiled ${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}' \ INSTALLROOT='${WRKINST}' \ bios install + touch $@ ${TOOLS_DIR}/extlinux: $(WRKBUILD)/.installed $(INSTALL_BIN) ${WRKINST}/sbin/extlinux \ |