Browse Source

use TARGET_CROSS, minor indentation fixes

Waldemar Brodkorb 14 years ago
parent
commit
08c3724108

+ 6 - 6
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)

+ 1 - 2
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

+ 1 - 0
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

+ 2 - 1
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.*

+ 2 - 1
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.*

+ 2 - 1
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.*

+ 0 - 1
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)

+ 1 - 1
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)

+ 0 - 1
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