调整镜像生成的目录,集中在images下。

This commit is contained in:
Lu Qiuwen
2021-05-10 11:38:32 +08:00
parent 462b6c0ce7
commit 4203792afb
2 changed files with 5 additions and 6 deletions

View File

@@ -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

View File

@@ -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)