diff options
| author | wbx <wbx@openbsd.my.domain> | 2015-12-11 20:03:11 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-12-11 22:09:56 +0100 |
| commit | fba2ff31928b18364c1934654169806f5c800e23 (patch) | |
| tree | 54b21d52f020460253241439b29745b54c460a5a /target | |
| parent | 08f07c80cd46b2d6495ebbfedd742255e9873d3b (diff) | |
rework prereq check
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
Diffstat (limited to 'target')
| -rw-r--r-- | target/Makefile | 25 | ||||
| -rw-r--r-- | target/config/Config.in.adk | 25 | ||||
| -rw-r--r-- | target/config/Config.in.target | 1 |
3 files changed, 18 insertions, 33 deletions
diff --git a/target/Makefile b/target/Makefile index d6cfa0bf8..c0a76f1d8 100644 --- a/target/Makefile +++ b/target/Makefile @@ -122,19 +122,25 @@ install: $(ADK_TARGET_ARCH)-imageclean $(ADK_TARGET_ARCH)-install $(ADK_TARGET_A clean: $(ADK_TARGET_ARCH)-clean $(ADK_TARGET_ARCH)-imageclean %-clean: - $(TRACE) target/$(patsubst %-clean,%,$@)-clean + $(START_TRACE) "target/$(patsubst %-clean,%,$@)-clean.. " $(MAKE) -C $(patsubst %-clean,%,$@) clean + $(CMD_TRACE) " done" + $(END_TRACE) %-imageclean: - $(TRACE) target/$(patsubst %-imageclean,%,$@)-imageclean + $(START_TRACE) "target/$(patsubst %-imageclean,%,$@)-imageclean.. " $(MAKE) -C $(patsubst %-imageclean,%,$@) imageclean + $(CMD_TRACE) " done" + $(END_TRACE) %-prepare: - $(TRACE) target/$(patsubst %-prepare,%,$@)-prepare + $(START_TRACE) "target/$(patsubst %-prepare,%,$@)-prepare.. " $(MAKE) -C $(patsubst %-prepare,%,$@) prepare + $(CMD_TRACE) " done" + $(END_TRACE) %-imageprepare: - $(TRACE) target/$(patsubst %-imageprepare,%,$@)-imageprepare + $(START_TRACE) "target/$(patsubst %-imageprepare,%,$@)-imageprepare.. " ifeq ($(ADK_RUNTIME_DEV_UDEV),y) # This should be made a package instead $(CP) -a $(BUILD_DIR)/linux-$(ADK_TARGET_ARCH)/modules/lib $(TARGET_DIR) @@ -146,23 +152,28 @@ endif break; \ done $(MAKE) -C $(patsubst %-imageprepare,%,$@) imageprepare + $(CMD_TRACE) " done" + $(END_TRACE) %-compile: %-prepare - $(TRACE) target/$(patsubst %-compile,%,$@)-compile $(MAKE) -C $(patsubst %-compile,%,$@) compile %-install: %-compile - $(TRACE) target/$(patsubst %-install,%,$@)-install + $(START_TRACE) "target/$(patsubst %-install,%,$@)-install.. " $(MAKE) -C $(patsubst %-install,%,$@) install + $(CMD_TRACE) " done" + $(END_TRACE) %-targethelp: $(MAKE) -C $(patsubst %-targethelp,%,$@) targethelp %-imageinstall: %-imageprepare - $(TRACE) target/$(patsubst %-imageinstall,%,$@)-imageinstall + $(START_TRACE) "target/$(patsubst %-imageinstall,%,$@)-imageinstall.. " $(MAKE) -C $(patsubst %-imageinstall,%,$@) imageinstall @for x in $$(ls $(ADK_TOPDIR)/scripts/postimage/*.sh 2>/dev/null); do \ [[ -x "$$x" ]] && $$x; \ break; \ done + $(CMD_TRACE) " done" + $(END_TRACE) @echo "Login as user root via ssh or console." diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk index 510809ce5..81144dc02 100644 --- a/target/config/Config.in.adk +++ b/target/config/Config.in.adk @@ -101,31 +101,6 @@ config ADK_TARGET_PORT help Port to use for SSH when running make check. -choice -prompt "Hostsystem (do not change!)" -config ADK_HOST_LINUX - bool "Linux" - -config ADK_HOST_FREEBSD - bool "FreeBSD" - -config ADK_HOST_MIRBSD - bool "MirBSD" - -config ADK_HOST_OPENBSD - bool "OpenBSD" - -config ADK_HOST_NETBSD - bool "NetBSD" - -config ADK_HOST_DARWIN - bool "Darwin" - -config ADK_HOST_CYGWIN - bool "Cygwin" - -endchoice - config ADK_PRELINK prompt "Prelink binaries and libraries in Image" boolean diff --git a/target/config/Config.in.target b/target/config/Config.in.target index 3c396f37e..4d1888c35 100644 --- a/target/config/Config.in.target +++ b/target/config/Config.in.target @@ -131,7 +131,6 @@ config ADK_TARGET_ROOTFS_ISO select ADK_HOST_NEED_CDRTOOLS select ADK_HOST_NEED_SYSLINUX select ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_QEMU - depends on ADK_HOST_LINUX depends on ADK_TARGET_ARCH_X86 help Use this option to create a bootable ISO image. |