diff options
| -rw-r--r-- | mk/build.mk | 12 | ||||
| -rw-r--r-- | target/ag241/Makefile | 3 | ||||
| -rw-r--r-- | target/bulk.lst | 1 | ||||
| -rw-r--r-- | target/qemu-arm/Makefile | 3 | ||||
| -rw-r--r-- | target/qemu-x86/Makefile | 3 | ||||
| -rw-r--r-- | target/qemu-x86_64/Makefile | 3 | ||||
| -rw-r--r-- | target/rb433/Makefile | 1 | ||||
| -rw-r--r-- | target/rb532/Makefile | 2 | ||||
| -rw-r--r-- | target/wrap/Makefile | 1 |
9 files changed, 15 insertions, 14 deletions
diff --git a/mk/build.mk b/mk/build.mk index f6e438508..879bdc04b 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -415,38 +415,38 @@ endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) # build all targets and combinations bulk: while read target libc fs; do \ - mkdir -p $(TOPDIR)/bin/$$target_$$libc; \ + mkdir -p $(TOPDIR)/bin/$${target}_$$libc; \ ( \ echo === building $$target $$libc $$fs on $$(date); \ $(GMAKE) prereq && \ $(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs defconfig; \ $(GMAKE) VERBOSE=1 all; \ rm .config; \ - ) 2>&1 | tee $(TOPDIR)/bin/$$target_$$libc/$$target-$$libc-$$fs.log; \ + ) 2>&1 | tee $(TOPDIR)/bin/$${target}_$$libc/$$target-$$libc-$$fs.log; \ done <${TOPDIR}/target/bulk.lst bulkall: while read target libc fs; do \ - mkdir -p $(TOPDIR)/bin/$$target_$$libc; \ + mkdir -p $(TOPDIR)/bin/$${target}_$$libc; \ ( \ echo === building $$target $$libc $$fs on $$(date); \ $(GMAKE) prereq && \ $(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs allconfig; \ $(GMAKE) VERBOSE=1 all; \ rm .config; \ - ) 2>&1 | tee $(TOPDIR)/bin/$$target_$$libc/$$target-$$libc-$$fs.log; \ + ) 2>&1 | tee $(TOPDIR)/bin/$${target}_$$libc/$$target-$$libc-$$fs.log; \ done <${TOPDIR}/target/bulk.lst bulkallmod: while read target libc fs; do \ - mkdir -p $(TOPDIR)/bin/$$target_$$libc; \ + mkdir -p $(TOPDIR)/bin/$${target}_$$libc; \ ( \ echo === building $$target $$libc $$fs on $$(date); \ $(GMAKE) prereq && \ $(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs allmodconfig; \ $(GMAKE) VERBOSE=1 all; \ rm .config; \ - ) 2>&1 | tee $(TOPDIR)/bin/$$target_$$libc/$$target-$$libc-$$fs.log; \ + ) 2>&1 | tee $(TOPDIR)/bin/$${target}_$$libc/$$target-$$libc-$$fs.log; \ done <${TOPDIR}/target/bulk.lst menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) diff --git a/target/ag241/Makefile b/target/ag241/Makefile index cb8ce4a71..44b8b1dff 100644 --- a/target/ag241/Makefile +++ b/target/ag241/Makefile @@ -16,8 +16,7 @@ tools-compile: $(TOOLS_BUILD_DIR) $(MAKE) -C ../tools/squashfs prepare compile install kernel-install: tools-compile - PATH='${TARGET_PATH}' \ - mipsel-linux-objcopy -S -O srec $(LINUX_DIR)/vmlinux \ + ${TARGET_CROSS}objcopy -S -O srec $(LINUX_DIR)/vmlinux \ $(LINUX_DIR)/vmlinux.srec PATH='${TARGET_PATH}' \ srec2bin $(LINUX_DIR)/vmlinux.srec $(LINUX_DIR)/vmlinux.bin diff --git a/target/bulk.lst b/target/bulk.lst index b637abc1a..968949373 100644 --- a/target/bulk.lst +++ b/target/bulk.lst @@ -25,3 +25,4 @@ x86_qemu eglibc archive x86_qemu glibc archive x86_64_qemu uclibc archive x86_64_qemu eglibc archive +x86_64_qemu glibc archive diff --git a/target/qemu-arm/Makefile b/target/qemu-arm/Makefile index cda4e95bb..d0ea5ae92 100644 --- a/target/qemu-arm/Makefile +++ b/target/qemu-arm/Makefile @@ -8,7 +8,8 @@ include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk kernel-install: - @cp $(LINUX_DIR)/arch/arm/boot/zImage $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + @cp $(LINUX_DIR)/arch/arm/boot/zImage \ + $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel createinit: @-rm $(LINUX_DIR)/usr/initramfs_data.cpio.* diff --git a/target/qemu-x86/Makefile b/target/qemu-x86/Makefile index 44e4b2319..11a393a5b 100644 --- a/target/qemu-x86/Makefile +++ b/target/qemu-x86/Makefile @@ -8,7 +8,8 @@ include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk kernel-install: - @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + @cp $(LINUX_DIR)/arch/x86/boot/bzImage \ + $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel createinit: @-rm $(LINUX_DIR)/usr/initramfs_data.cpio.* diff --git a/target/qemu-x86_64/Makefile b/target/qemu-x86_64/Makefile index b7847eeaa..5d8f2f531 100644 --- a/target/qemu-x86_64/Makefile +++ b/target/qemu-x86_64/Makefile @@ -8,7 +8,8 @@ include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk kernel-install: - @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + @cp $(LINUX_DIR)/arch/x86/boot/bzImage \ + $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel createinit: @-rm $(LINUX_DIR)/usr/initramfs_data.cpio.* diff --git a/target/rb433/Makefile b/target/rb433/Makefile index 4ecfbc47a..b9ee5932b 100644 --- a/target/rb433/Makefile +++ b/target/rb433/Makefile @@ -14,7 +14,6 @@ ifeq ($(FS),nfsroot) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}' - @echo 'Do not forget to create device nodes for console,null and tty in your nfsroot' @echo 'Login as user root with password linux123 via ssh or console' endif ifeq ($(FS),yaffs) diff --git a/target/rb532/Makefile b/target/rb532/Makefile index 88145c64c..b0c50dc5d 100644 --- a/target/rb532/Makefile +++ b/target/rb532/Makefile @@ -12,7 +12,7 @@ OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build kernel-install: $(TARGET_CROSS)objcopy $(OSTRIP) -S $(LINUX_DIR)/vmlinux \ $(TARGET_DIR)/boot/kernel - cp $(TARGET_DIR)/boot/kernel \ + @cp $(TARGET_DIR)/boot/kernel \ $(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel ifeq ($(FS),ext2-cf) diff --git a/target/wrap/Makefile b/target/wrap/Makefile index 77b9d4ab9..825b55175 100644 --- a/target/wrap/Makefile +++ b/target/wrap/Makefile @@ -24,6 +24,5 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo @echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel' @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}' - @echo 'Do not forget to create device nodes for console,null and tty in your nfsroot' @echo 'Login as user root with password linux123 via ssh or console' endif |