diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 14 | ||||
| -rw-r--r-- | mk/image.mk | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/mk/build.mk b/mk/build.mk index d526906ed..664046799 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -365,7 +365,7 @@ endif @if [ ! -z "$(SYSTEM)" ];then \ system=$$(echo "$(SYSTEM)" |sed -e "s/-/_/g"); \ grep -h "^config" target/*/Config.in.systems \ - |grep -i "$$system" \ + |grep -i "$$system$$" \ |sed -e "s#^config \(.*\)#\1=y#" \ >> $(TOPDIR)/.defconfig; \ fi @@ -496,8 +496,8 @@ endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) bulktoolchain: for libc in uclibc eglibc glibc;do \ while read arch; do \ + mkdir -p $(TOPDIR)/bin/toolchain_$${arch}_$$libc; \ ( \ - mkdir -p $(TOPDIR)/bin/toolchain_$${arch}_$$libc; \ echo === building $$arch $$libc toolchain on $$(date); \ $(GMAKE) prereq && \ $(GMAKE) ARCH=$$arch SYSTEM=toolchain LIBC=$$libc defconfig; \ @@ -514,8 +514,8 @@ bulk: while read arch; do \ systems=$$(./scripts/getsystems $$arch); \ for system in $$systems;do \ - ( \ mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \ + ( \ echo === building $$arch $$system $$libc on $$(date); \ $(GMAKE) prereq && \ $(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc defconfig; \ @@ -532,8 +532,8 @@ bulkall: while read arch; do \ systems=$$(./scripts/getsystems $$arch); \ for system in $$systems;do \ - ( \ mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \ + ( \ echo === building $$arch $$system $$libc on $$(date); \ $(GMAKE) prereq && \ $(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc allconfig; \ @@ -550,8 +550,8 @@ bulkallmod: while read arch; do \ systems=$$(./scripts/getsystems $$arch); \ for system in $$systems;do \ - ( \ mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \ + ( \ echo === building $$arch $$system $$libc on $$(date); \ $(GMAKE) prereq && \ $(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc allmodconfig; \ @@ -573,7 +573,7 @@ ${TOPDIR}/bin/tools/pkgrebuild: package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) ${TOPDIR}/bin/tools/pkgmaker ${TOPDIR}/bin/tools/pkgrebuild @echo "Generating menu structure ..." - $(TOPDIR)/bin/tools/pkgmaker + @$(TOPDIR)/bin/tools/pkgmaker @:>.menu $(TOPDIR)/bin/tools: @@ -584,7 +584,7 @@ ${TOPDIR}/bin/tools/depmaker: $(TOPDIR)/bin/tools dep: $(TOPDIR)/bin/tools/depmaker @echo "Generating dependencies ..." - $(TOPDIR)/bin/tools/depmaker > ${TOPDIR}/package/Depends.mk + @$(TOPDIR)/bin/tools/depmaker > ${TOPDIR}/package/Depends.mk .PHONY: menu dep diff --git a/mk/image.mk b/mk/image.mk index 3b1db46cd..1b7178eef 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -35,7 +35,7 @@ kernel-package: $(KERNEL) $(TRACE) target/$(ADK_TARGET_ARCH)-install-kernel-package $(PKG_INSTALL) $(KERNEL_PKG) $(MAKE_TRACE) -TARGET_KERNEL:= $(BIN_DIR)/${ADK_TARGET_SYSTEM}-${ADK_TARGET_ARCH}-${ADK_TARGET_FS}-kernel +TARGET_KERNEL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_ARCH}-${ADK_TARGET_FS}-kernel INITRAMFS= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_ARCH}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS} ROOTFSSQUASHFS= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_ARCH}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.img ROOTFSTARBALL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_ARCH}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}+kernel.tar.gz @@ -69,7 +69,7 @@ ${BIN_DIR}/${ROOTFSSQUASHFS}: ${TARGET_DIR} ${STAGING_HOST_DIR}/bin/mksquashfs ${TARGET_DIR} \ ${BUILD_DIR}/root.squashfs \ -nopad -noappend -root-owned $(MAKE_TRACE) - cat ${TARGET_KERNEL} ${BUILD_DIR}/root.squashfs > \ + cat ${BUILD_DIR}/${TARGET_KERNEL} ${BUILD_DIR}/root.squashfs > \ ${BUILD_DIR}/${ROOTFSSQUASHFS} createinitramfs: |