diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-20 10:18:07 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-20 10:18:07 +0100 |
| commit | 6b9416e4465c909141f4fcfd314e8d3cf0ea8477 (patch) | |
| tree | c76c9e8e93f100c1fc2357fc2b3e16be57a26ef8 /target/shuttle/Makefile | |
| parent | d2b0fbc76dcd2dd31a6842ec990276a36b12cbad (diff) | |
| parent | ec84dd5b5584435ad5ef699cbe3ed9ef98e17463 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/shuttle/Makefile')
| -rw-r--r-- | target/shuttle/Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/target/shuttle/Makefile b/target/shuttle/Makefile index 9cc8a0e95..53ab59227 100644 --- a/target/shuttle/Makefile +++ b/target/shuttle/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/mk/image.mk kernel-install: createinit: - @-rm $(LINUX_DIR)/usr/initramfs_data.cpio.lzma + @-rm $(LINUX_DIR)/usr/initramfs_data.cpio.* $(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="${BUILD_DIR}/${INITRAMFS_PIGGYBACK}"#' $(LINUX_DIR)/.config echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config @@ -20,18 +20,19 @@ createinit: $(MAKE) -C $(LINUX_DIR) V=0 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ CC="$(TARGET_CC)" $(MAKE_TRACE) $(CP) $(LINUX_DIR)/arch/x86/boot/bzImage \ - $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel + $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel ifeq ($(FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel - @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel' + @cp $(LINUX_DIR)/arch/x86/boot/bzImage \ + $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The initramfs image is: ${BIN_DIR}/${ROOTFSTARBALL}' @echo 'Login as user root with password linux123 via ssh or console' endif ifeq ($(FS),initramfs-piggyback) imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinit - @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel' + @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'Login as user root with password linux123 via ssh or console' endif |