diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-16 15:20:15 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-16 15:20:15 +0200 |
| commit | 7aecee89f4e1dbbf696efa52299fff5ce4731075 (patch) | |
| tree | ede50022e4b7c78344a2cc18b87aefe10f7ce0b8 | |
| parent | 2cbfc08e1b55b8c68fce17662c129f4a1afba259 (diff) | |
| parent | 48f6bfb37e3b2511a5cac64d3267bb78d0709024 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | target/Config.in | 1 | ||||
| -rw-r--r-- | target/native/Makefile | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/target/Config.in b/target/Config.in index 5647039dd..fc3e07b97 100644 --- a/target/Config.in +++ b/target/Config.in @@ -962,6 +962,7 @@ config ADK_TARGET_ROOTFS_EXT2_BLOCK config ADK_TARGET_ROOTFS_ARCHIVE bool "Archive usable for different filesystems" depends on \ + ADK_LINUX_NATIVE || \ ADK_LINUX_QEMU || \ ADK_LINUX_XSCALE_ZAURUS || \ ADK_LINUX_X86_IBMX40 || \ diff --git a/target/native/Makefile b/target/native/Makefile index 1999540c4..63eeb1842 100644 --- a/target/native/Makefile +++ b/target/native/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/mk/modules.mk include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk -KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage +KERNEL:=$(LINUX_DIR)/vmlinuz ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) @@ -21,3 +21,7 @@ imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs @cp $(KERNEL) ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel @echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' endif +ifeq ($(FS),archive) +imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) + @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" +endif |