From 4203792afbc4cf2d3a3240b1eebc84746cc54329 Mon Sep 17 00:00:00 2001 From: Lu Qiuwen Date: Mon, 10 May 2021 11:38:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=95=9C=E5=83=8F=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=9A=84=E7=9B=AE=E5=BD=95=EF=BC=8C=E9=9B=86=E4=B8=AD?= =?UTF-8?q?=E5=9C=A8images=E4=B8=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 5 ++++- make/Makefile.9000NPBP01R01 | 6 +----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 6da144e8..c4962ce5 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ INSTALLERDIR = $(realpath ./installer) PROJECTDIR = $(abspath ) BUILDDIR_BASE = $(abspath ./build) -IMAGEDIR_BASE = $(BUILDDIR)/images +IMAGEDIR_BASE = $(abspath ./images) OS_RELEASE_VER = 20.04.1 @@ -44,6 +44,9 @@ export OS_RELEASE_VER .PHONY: all clean $(PROFILE_LIST) all: $(PROFILE_LIST) + mkdir -p $(BUILDDIR_BASE) + mkdir -p $(IMAGEDIR_BASE) + $(Q) echo "=== Building $< $(OS_RELEASE_VER) ===" $(Q) $(MAKE) -f make/Makefile.$< all diff --git a/make/Makefile.9000NPBP01R01 b/make/Makefile.9000NPBP01R01 index a975099e..ef509978 100644 --- a/make/Makefile.9000NPBP01R01 +++ b/make/Makefile.9000NPBP01R01 @@ -47,13 +47,9 @@ sysroot-cleanup: sysroot-archive: installer sysroot-ansible sysroot-cleanup tar --exclude=*~ --exclude-backups --owner=root --group=root -c -C $(TARGET_SYSROOT_DIR) . | pbzip2 > $(TARGET_INSTALLER_DIR)/$(CHROOT_PKG) -INPUT_DIR=$1 -WORK_DIR=$2 -TARGET_BINARY=$3 - sysroot-binary: sysroot-archive mkdir -p $(TARGET_BUILD_DIR)/cook-bits - $(TOOLSDIR)/cook-bits $(TARGET_BUILD_DIR) $(TARGET_BUILD_DIR)/cook-bits $(TARGET_BUILD_DIR)/$(CHROOT_BIN) + $(TOOLSDIR)/cook-bits $(TARGET_BUILD_DIR) $(TARGET_BUILD_DIR)/cook-bits $(IMAGEDIR_BASE)/$(CHROOT_BIN) clean: rm -rf $(TARGET_BUILD_DIR) \ No newline at end of file