From 8c2e653abcbeadde7460c34bc2264056a6e2d886 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 19 Dec 2009 21:59:09 +0100 Subject: rename kernel and images files to be conform - use ADK_TARGET and FS for kernel files - use ADK_TARGET, ADK_LIBC and FS for image files ARCH is implicit in ADK_TARGET encoded. --- target/shuttle/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'target/shuttle/Makefile') 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 -- cgit v1.2.3