diff options
| author | U-windows7\wbx <wbx@windows7.(none)> | 2009-12-20 13:29:10 +0100 |
|---|---|---|
| committer | U-windows7\wbx <wbx@windows7.(none)> | 2009-12-20 13:29:10 +0100 |
| commit | 9115ff8b3139bab8ebc2d25f1ec03a98b2641c99 (patch) | |
| tree | 2c7535d8970d7ebf5a7b5613fc3324b3200c0645 /target/rescue-x86_64/Makefile | |
| parent | 82009b8fa77db023dd186444e2698a5d9c01d496 (diff) | |
| parent | 6b65886e809bdbfd7699e7fbbc8980f5eb4992c4 (diff) | |
Merge branch 'master' of git://openadk.org/git/openadk
Diffstat (limited to 'target/rescue-x86_64/Makefile')
| -rw-r--r-- | target/rescue-x86_64/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/rescue-x86_64/Makefile b/target/rescue-x86_64/Makefile index 58517d2fe..6e4f275ee 100644 --- a/target/rescue-x86_64/Makefile +++ b/target/rescue-x86_64/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,18 @@ 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),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) - 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}/${INITRAMFS}' @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 |