diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-06-28 10:38:59 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-06-28 10:38:59 +0200 |
| commit | e9e7c5715ae2cb168dfe56192a3a1d5aacc70b23 (patch) | |
| tree | 25656fc11aa2d35418a76114f8d82262e9536bad /target/lemote | |
| parent | 1143ead360fb043f43388d727e710f358702bc9a (diff) | |
fix busybox rebuild issue, simplify target Makefiles
Diffstat (limited to 'target/lemote')
| -rw-r--r-- | target/lemote/Makefile | 43 |
1 files changed, 19 insertions, 24 deletions
diff --git a/target/lemote/Makefile b/target/lemote/Makefile index 8f8042827..40b19b19c 100644 --- a/target/lemote/Makefile +++ b/target/lemote/Makefile @@ -9,9 +9,6 @@ include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/vmlinuz -kernel-install: - @cp $(KERNEL) $(TARGET_DIR)/boot/vmlinuz-adk - createinitcrypt: $(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="./initramfs_list"#' $(LINUX_DIR)/.config echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config @@ -20,18 +17,34 @@ createinitcrypt: CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE) $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ CC="$(TARGET_CC)" $(MAKE_TRACE) - @cp $(LINUX_DIR)/vmlinuz $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel ifeq ($(FS),nfsroot) imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) - @cp $(LINUX_DIR)/vmlinuz $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSUSERTARBALL}' @echo 'Boot your lemote and type following commands in PMON:' @echo 'PMON> ifaddr rtl0 <ip-address-client>' @echo 'PMON> load tftp://<ip-address-server>/${ADK_TARGET}-${FS}-kernel' @echo 'PMON> g' - @echo 'Login as user root with password linux123 via ssh or console' +endif +ifeq ($(FS),initramfs) +imageinstall: $(BIN_DIR)/$(INITRAMFS) + @cp $(KERNEL) $(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}' +endif +ifeq ($(FS),initramfs-piggyback) +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) + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' + @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" endif ifeq ($(FS),encrypted) imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) createinitcrypt @@ -60,22 +73,4 @@ imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) createinitcrypt @echo 'Move boot.cfg to /mnt/boot/boot' @echo 'mv /mnt/root/boot/boot.cfg /mnt/boot/boot' @echo 'cd /mnt/root ; mknod -m 644 console c 5 1' - @echo 'Login as user root with password linux123 via ssh or console' -endif -ifeq ($(FS),initramfs) -imageinstall: $(BIN_DIR)/$(INITRAMFS) - @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) createinitramfs - @echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' - @echo 'Login as user root with password linux123 via ssh or console' -endif -ifeq ($(FS),archive) -imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - @echo - @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" - @echo 'Login as user root with password linux123 via ssh or console' endif |