Waldemar Brodkorb 10 лет назад
Родитель
Сommit
422fe42ea4
4 измененных файлов с 7 добавлено и 2 удалено
  1. 1 0
      target/config/Config.in
  2. 1 1
      target/x86/Makefile
  3. 4 1
      tools/Makefile
  4. 1 0
      tools/syslinux/Makefile

+ 1 - 0
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.
 

+ 1 - 1
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

+ 4 - 1
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))

+ 1 - 0
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 \