feature:TSG-10783:构建vsys os镜像

6 files changed, 228 insertions, 5 deletions

diff --git a/make/Makefile.7400MCN0P01R01 b/make/Makefile.7400MCN0P01R01
index ca427eff..a8285b61 100644
--- a/make/Makefile.7400MCN0P01R01
+++ b/make/Makefile.7400MCN0P01R01
@@ -52,7 +52,7 @@ sysroot-ansible: sysroot-verfile sysroot-base
 	cp $(CONFDIR)/resolv.conf $(TARGET_SYSROOT_DIR)/etc/ -r
 	cp $(TARGET_SYSROOT_DIR)/etc/hosts $(TARGET_SYSROOT_DIR)/tmp/ -r
 	cp /etc/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
-	$(TOOLSDIR)/ansible-HAL $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum-CentOS-7.conf
+	$(TOOLSDIR)/ansible-HAL $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum-CentOS-7.conf $(OS_RELEASE_VER)
 	cp $(TARGET_SYSROOT_DIR)/tmp/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
 
 sysroot-cleanup:
diff --git a/make/Makefile.7400MCN123P01R01 b/make/Makefile.7400MCN123P01R01
index e2ae57e4..c5202836 100644
--- a/make/Makefile.7400MCN123P01R01
+++ b/make/Makefile.7400MCN123P01R01
@@ -52,7 +52,7 @@ sysroot-ansible: sysroot-verfile sysroot-base
 	cp $(CONFDIR)/resolv.conf $(TARGET_SYSROOT_DIR)/etc/ -r
 	cp $(TARGET_SYSROOT_DIR)/etc/hosts $(TARGET_SYSROOT_DIR)/tmp/ -r
 	cp /etc/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
-	$(TOOLSDIR)/ansible-HAL $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum-CentOS-7.conf
+	$(TOOLSDIR)/ansible-HAL $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum-CentOS-7.conf $(OS_RELEASE_VER)
 	cp $(TARGET_SYSROOT_DIR)/tmp/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
 
 sysroot-cleanup:
diff --git a/make/Makefile.9000NPBP01R01 b/make/Makefile.9000NPBP01R01
index ea5f009b..af10dffa 100644
--- a/make/Makefile.9000NPBP01R01
+++ b/make/Makefile.9000NPBP01R01
@@ -52,7 +52,7 @@ sysroot-ansible: sysroot-verfile sysroot-base
 	cp $(CONFDIR)/resolv.conf $(TARGET_SYSROOT_DIR)/etc/ -r
 	cp $(TARGET_SYSROOT_DIR)/etc/hosts $(TARGET_SYSROOT_DIR)/tmp/ -r
 	cp /etc/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
-	$(TOOLSDIR)/ansible-HAL $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum-CentOS-7.conf
+	$(TOOLSDIR)/ansible-HAL $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum-CentOS-7.conf $(OS_RELEASE_VER)
 	cp $(TARGET_SYSROOT_DIR)/tmp/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
 
 sysroot-cleanup:
diff --git a/make/Makefile.TSGXNXR620G40R01P0804 b/make/Makefile.TSGXNXR620G40R01P0804
index 6c5b7c1b..576fa11f 100644
--- a/make/Makefile.TSGXNXR620G40R01P0804
+++ b/make/Makefile.TSGXNXR620G40R01P0804
@@ -53,7 +53,7 @@ sysroot-ansible: sysroot-verfile sysroot-base
 	cp $(CONFDIR)/resolv.conf $(TARGET_SYSROOT_DIR)/etc/ -r
 	cp $(TARGET_SYSROOT_DIR)/etc/hosts $(TARGET_SYSROOT_DIR)/tmp/ -r
 	cp /etc/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
-	$(TOOLSDIR)/ansible-HAL $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum-RockyLinux-8.conf
+	$(TOOLSDIR)/ansible-HAL $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum-RockyLinux-8.conf $(OS_RELEASE_VER)
 	cp $(TARGET_SYSROOT_DIR)/tmp/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
 	umount $(TARGET_SYSROOT_DIR)/proc
 
diff --git a/make/Makefile.TSGXNXR620G40R01P0906 b/make/Makefile.TSGXNXR620G40R01P0906
new file mode 100644
index 00000000..7f58dae9
--- /dev/null
+++ b/make/Makefile.TSGXNXR620G40R01P0906
@@ -0,0 +1,223 @@
+
+PROFILE_ID 				:= TSG-X-NXR620G40-R01-P0906
+SUPPORTED_MACHINE_ID 	:= TSG-X-NXR620G40-R01-P0906
+KERNEL_ARGS 			:= crashkernel=512M default_hugepagesz=1G hugepagesz=1G hugepages=16 intel_iommu=on iommu=pt mitigations=off psi=1 isolcpus=1-76
+GRUB_SERIAL_COMMAND 	:=
+SIZE_PART_SYSROOT		:= 16384M
+SIZE_PART_UPDATE		:= 16384M
+
+PROFILE_ID_IN_SHORT		:= $(subst -,$e,$(PROFILE_ID))
+CHROOT_PKG 				:= tsg-os-${OS_RELEASE_VER}-${PROFILE_ID_IN_SHORT}-chroot.tar.bz2
+CHROOT_BIN 				:= tsg-os-${OS_RELEASE_VER}-${PROFILE_ID_IN_SHORT}-ONIE.bin
+
+TARGET_BUILD_DIR 		:= $(BUILDDIR_BASE)/$(PROFILE_ID)
+TARGET_INSTALLER_DIR 	:= $(TARGET_BUILD_DIR)/installer
+TARGET_SYSROOT_DIR		:= $(TARGET_BUILD_DIR)/sysroot
+
+TARGET_CONTAINER_IMAGE_DIR		:= $(TARGET_BUILD_DIR)/container_images
+CONTAINER_DOCKERFILE			:= $(TARGET_CONTAINER_IMAGE_DIR)/Dockerfile
+
+CONTAINER_FIREWALL_NAME					:= firewall
+TARGET_CONTAINER_FIREWALL_SYSROOT_DIR	:= $(TARGET_BUILD_DIR)/$(CONTAINER_FIREWALL_NAME)-container_sysroot
+CONTAINER_FIREWALL_PKG					:= tsg-container-$(CONTAINER_FIREWALL_NAME)-${OS_RELEASE_VER}-${PROFILE_ID_IN_SHORT}-images.tar.xz
+CONTAINER_FIREWALL_TAR					:= tsg-container-$(CONTAINER_FIREWALL_NAME)-${OS_RELEASE_VER}-images.tar
+
+CONTAINER_PROXY_NAME					:= proxy
+TARGET_CONTAINER_RPOXY_SYSROOT_DIR		:= $(TARGET_BUILD_DIR)/$(CONTAINER_PROXY_NAME)-container_sysroot
+CONTAINER_RPOXY_PKG						:= tsg-container-$(CONTAINER_PROXY_NAME)-${OS_RELEASE_VER}-${PROFILE_ID_IN_SHORT}-images.tar.xz
+CONTAINER_RPOXY_TAR						:= tsg-container-$(CONTAINER_PROXY_NAME)-${OS_RELEASE_VER}-images.tar
+
+CONTAINER_CERTSTORE_NAME				:= certstore
+TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR	:= $(TARGET_BUILD_DIR)/$(CONTAINER_CERTSTORE_NAME)-container_sysroot
+CONTAINER_CERTSTORE_PKG					:= tsg-container-$(CONTAINER_CERTSTORE_NAME)-${OS_RELEASE_VER}-${PROFILE_ID_IN_SHORT}-images.tar.xz
+CONTAINER_CERTSTORE_TAR					:= tsg-container-$(CONTAINER_CERTSTORE_NAME)-${OS_RELEASE_VER}-images.tar
+
+CONTAINER_TELEGRAF_NAME					:= telegraf
+TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR	:= $(TARGET_BUILD_DIR)/$(CONTAINER_TELEGRAF_NAME)-container_sysroot
+CONTAINER_TELEGRAF_PKG					:= tsg-container-$(CONTAINER_TELEGRAF_NAME)-${OS_RELEASE_VER}-${PROFILE_ID_IN_SHORT}-images.tar.xz
+CONTAINER_TELEGRAF_TAR					:= tsg-container-$(CONTAINER_TELEGRAF_NAME)-${OS_RELEASE_VER}-images.tar
+
+CONTAINER_INIT_NAME						:= init
+TARGET_CONTAINER_INIT_SYSROOT_DIR		:= $(TARGET_BUILD_DIR)/$(CONTAINER_INIT_NAME)-container_sysroot
+CONTAINER_INIT_PKG						:= tsg-container-$(CONTAINER_INIT_NAME)-${OS_RELEASE_VER}-${PROFILE_ID_IN_SHORT}-images.tar.xz
+CONTAINER_INIT_TAR						:= tsg-container-$(CONTAINER_INIT_NAME)-${OS_RELEASE_VER}-images.tar
+
+.PHONY: all builddir installer sysroot-base sysroot-cleanup sysroot-archive sysroot-binary  container-sysroot-base container-sysroot-ansible container-images-generate add-images-into-sysroot container-sysroot-cleanup clean
+
+all: sysroot-binary
+
+builddir:
+	mkdir -p $(TARGET_BUILD_DIR)
+
+installer: builddir
+	rm -rf $(TARGET_INSTALLER_DIR)
+	mkdir -p $(TARGET_INSTALLER_DIR)
+	cp $(INSTALLERDIR)/install.sh $(TARGET_INSTALLER_DIR)/install.sh
+	cp $(INSTALLERDIR)/distro-setup.sh $(TARGET_INSTALLER_DIR)/distro-setup.sh
+	chmod +x $(TARGET_INSTALLER_DIR)/install.sh
+	chmod +x $(TARGET_INSTALLER_DIR)/distro-setup.sh
+
+	sed -i -e "s/%%DISTR0_VER%%/$(OS_RELEASE_VER)/" $(TARGET_INSTALLER_DIR)/install.sh
+	sed -i -e "s/%%MACHINE_ID%%/$(SUPPORTED_MACHINE_ID)/" $(TARGET_INSTALLER_DIR)/install.sh
+	sed -i -e "s/%%CHROOT_PKG%%/$(CHROOT_PKG)/" $(TARGET_INSTALLER_DIR)/install.sh
+	sed -i -e "s/%%KERNAL_ARGS%%/$(KERNEL_ARGS)/" $(TARGET_INSTALLER_DIR)/install.sh
+	sed -i -e "s/%%GRUB_SERIAL_COMMAND%%/$(GRUB_SERIAL_COMMAND)/" $(TARGET_INSTALLER_DIR)/install.sh
+	sed -i -e "s/%%SIZE_PART_SYSROOT%%/$(SIZE_PART_SYSROOT)/" $(TARGET_INSTALLER_DIR)/install.sh
+	sed -i -e "s/%%SIZE_PART_UPDATE%%/$(SIZE_PART_UPDATE)/" $(TARGET_INSTALLER_DIR)/install.sh
+
+	sed -i '/sapp-pr:/d;/tfe-pr:/d' $(PROJECTDIR)/ansible/install_config/group_vars/rpm_version.yml
+
+sysroot-base: builddir
+	$(TOOLSDIR)/mk-base-image $(CONFDIR)/yum-RockyLinux-8.conf $(TARGET_SYSROOT_DIR) $(PROJECTDIR) $(PROFILE_ID)
+
+container-sysroot-base: builddir sysroot-verfile sysroot-ansible
+	rm -rf $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)
+	rm -rf $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)
+	rm -rf $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)
+	rm -rf $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)
+	rm -rf $(TARGET_CONTAINER_INIT_SYSROOT_DIR)
+
+	mkdir -p $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)
+	mkdir -p $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)
+	mkdir -p $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)
+	mkdir -p $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)
+	mkdir -p $(TARGET_CONTAINER_INIT_SYSROOT_DIR)
+
+	mkdir -p $(TARGET_CONTAINER_IMAGE_DIR)
+
+	tar -Jxf $(PROJECTDIR)/package/rocky-8.6-docker.tar.xz -C $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)
+	tar -Jxf $(PROJECTDIR)/package/rocky-8.6-docker.tar.xz -C $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)
+	tar -Jxf $(PROJECTDIR)/package/rocky-8.6-docker.tar.xz -C $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)
+	tar -Jxf $(PROJECTDIR)/package/rocky-8.6-docker.tar.xz -C $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)
+	tar -Jxf $(PROJECTDIR)/package/rocky-8.6-docker.tar.xz -C $(TARGET_CONTAINER_INIT_SYSROOT_DIR)
+	#curl -SL https://raw.githubusercontent.com/rocky-linux/sig-cloud-instance-images/Rocky-8.5-x86_64/rocky-8.5-docker-x86_64.tar.xz | tar -Jx  -C $(TARGET_CONTAINER_SYSROOT_DIR)
+
+sysroot-verfile: sysroot-base
+	sed -i -e "s/^NAME=.*/NAME=\"TSG-OS\"/" $(TARGET_SYSROOT_DIR)/usr/lib/os-release
+	sed -i -e "s/^VERSION=.*/VERSION=\"$(OS_RELEASE_VER) ($(PROFILE_ID_IN_SHORT))\"/" $(TARGET_SYSROOT_DIR)/usr/lib/os-release
+	sed -i -e "s/^PRETTY_NAME=.*/PRETTY_NAME=\"TSG-OS $(OS_RELEASE_VER) ($(PROFILE_ID_IN_SHORT))\"/" $(TARGET_SYSROOT_DIR)/usr/lib/os-release
+
+sysroot-ansible: sysroot-verfile sysroot-base
+	cp $(CONFDIR)/yum-RockyLinux-8.conf $(TARGET_SYSROOT_DIR)/tmp/ -r
+	cp $(CONFDIR)/resolv.conf $(TARGET_SYSROOT_DIR)/etc/ -r
+	cp $(TARGET_SYSROOT_DIR)/etc/hosts $(TARGET_SYSROOT_DIR)/tmp/ -r
+	cp /etc/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
+	$(TOOLSDIR)/ansible-HAL $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum-RockyLinux-8.conf $(OS_RELEASE_VER)
+	cp $(TARGET_SYSROOT_DIR)/tmp/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
+
+container-sysroot-ansible: container-sysroot-base
+	cp $(CONFDIR)/yum-RockyLinux-8.conf $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)/tmp/ -r
+	cp $(CONFDIR)/resolv.conf $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)/etc/ -r
+	cp $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)/etc/hosts $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)/tmp/ -r
+	cp /etc/hosts $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)/etc/ -r
+	$(TOOLSDIR)/ansible-HAL $(PROFILE_ID)-$(CONTAINER_FIREWALL_NAME) $(PROJECTDIR) $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR) /tmp/yum-RockyLinux-8.conf $(OS_RELEASE_VER)
+	cp $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)/tmp/hosts $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)/etc/ -r
+
+	cp $(CONFDIR)/yum-RockyLinux-8.conf $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)/tmp/ -r
+	cp $(CONFDIR)/resolv.conf $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)/etc/ -r
+	cp $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)/etc/hosts $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)/tmp/ -r
+	cp /etc/hosts $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)/etc/ -r
+	$(TOOLSDIR)/ansible-HAL $(PROFILE_ID)-$(CONTAINER_PROXY_NAME) $(PROJECTDIR) $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR) /tmp/yum-RockyLinux-8.conf $(OS_RELEASE_VER)
+	cp $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)/tmp/hosts $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)/etc/ -r
+
+	cp $(CONFDIR)/yum-RockyLinux-8.conf $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)/tmp/ -r
+	cp $(CONFDIR)/resolv.conf $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)/etc/ -r
+	cp $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)/etc/hosts $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)/tmp/ -r
+	cp /etc/hosts $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)/etc/ -r
+	$(TOOLSDIR)/ansible-HAL $(PROFILE_ID)-$(CONTAINER_CERTSTORE_NAME) $(PROJECTDIR) $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR) /tmp/yum-RockyLinux-8.conf $(OS_RELEASE_VER)
+	cp $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)/tmp/hosts $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)/etc/ -r
+
+	cp $(CONFDIR)/yum-RockyLinux-8.conf $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)/tmp/ -r
+	cp $(CONFDIR)/resolv.conf $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)/etc/ -r
+	cp $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)/etc/hosts $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)/tmp/ -r
+	cp /etc/hosts $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)/etc/ -r
+	$(TOOLSDIR)/ansible-HAL $(PROFILE_ID)-$(CONTAINER_TELEGRAF_NAME) $(PROJECTDIR) $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR) /tmp/yum-RockyLinux-8.conf $(OS_RELEASE_VER)
+	cp $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)/tmp/hosts $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)/etc/ -r
+
+	cp $(CONFDIR)/yum-RockyLinux-8.conf $(TARGET_CONTAINER_INIT_SYSROOT_DIR)/tmp/ -r
+	cp $(CONFDIR)/resolv.conf $(TARGET_CONTAINER_INIT_SYSROOT_DIR)/etc/ -r
+	cp $(TARGET_CONTAINER_INIT_SYSROOT_DIR)/etc/hosts $(TARGET_CONTAINER_INIT_SYSROOT_DIR)/tmp/ -r
+	cp /etc/hosts $(TARGET_CONTAINER_INIT_SYSROOT_DIR)/etc/ -r
+	$(TOOLSDIR)/ansible-HAL $(PROFILE_ID)-$(CONTAINER_INIT_NAME) $(PROJECTDIR) $(TARGET_CONTAINER_INIT_SYSROOT_DIR) /tmp/yum-RockyLinux-8.conf $(OS_RELEASE_VER)
+	cp $(TARGET_CONTAINER_INIT_SYSROOT_DIR)/tmp/hosts $(TARGET_CONTAINER_INIT_SYSROOT_DIR)/etc/ -r
+
+container-sysroot-cleanup:
+	cp $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)/tmp/ks-script-* $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)
+	rm -rf $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)/tmp/*
+	rm -rf $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)/dev/*
+	mv $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)/ks-script-* $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)/tmp
+
+	cp $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)/tmp/ks-script-* $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)
+	rm -rf $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)/tmp/*
+	rm -rf $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)/dev/*
+	mv $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)/ks-script-* $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)/tmp
+
+	cp $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)/tmp/ks-script-* $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)
+	rm -rf $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)/tmp/*
+	rm -rf $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)/dev/*
+	mv $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)/ks-script-* $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)/tmp
+
+	cp $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)/tmp/ks-script-* $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)
+	rm -rf $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)/tmp/*
+	rm -rf $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)/dev/*
+	mv $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)/ks-script-* $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)/tmp
+
+	cp $(TARGET_CONTAINER_INIT_SYSROOT_DIR)/tmp/ks-script-* $(TARGET_CONTAINER_INIT_SYSROOT_DIR)
+	rm -rf $(TARGET_CONTAINER_INIT_SYSROOT_DIR)/tmp/*
+	rm -rf $(TARGET_CONTAINER_INIT_SYSROOT_DIR)/dev/*
+	mv $(TARGET_CONTAINER_INIT_SYSROOT_DIR)/ks-script-* $(TARGET_CONTAINER_INIT_SYSROOT_DIR)/tmp
+
+container-images-generate: container-sysroot-ansible container-sysroot-cleanup
+	tar -Jcf $(TARGET_CONTAINER_IMAGE_DIR)/$(CONTAINER_FIREWALL_PKG) -C $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR) .
+	echo -e "FROM scratch\nADD $(CONTAINER_FIREWALL_PKG) /\n\nCMD ["/bin/bash"]\n" > $(CONTAINER_DOCKERFILE)
+	docker build -t tsg-${CONTAINER_FIREWALL_NAME}:$(OS_RELEASE_VER) -f $(CONTAINER_DOCKERFILE) $(TARGET_CONTAINER_IMAGE_DIR)
+	docker save tsg-${CONTAINER_FIREWALL_NAME}:$(OS_RELEASE_VER) > $(TARGET_CONTAINER_IMAGE_DIR)/$(CONTAINER_FIREWALL_TAR)
+	docker rmi tsg-${CONTAINER_FIREWALL_NAME}:$(OS_RELEASE_VER)
+
+	tar -Jcf $(TARGET_CONTAINER_IMAGE_DIR)/$(CONTAINER_RPOXY_PKG) -C $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR) .
+	echo -e "FROM scratch\nADD $(CONTAINER_RPOXY_PKG) /\n\nCMD ["/bin/bash"]\n" > $(CONTAINER_DOCKERFILE)
+	docker build -t tsg-$(CONTAINER_PROXY_NAME):$(OS_RELEASE_VER) -f $(CONTAINER_DOCKERFILE) $(TARGET_CONTAINER_IMAGE_DIR)
+	docker save tsg-$(CONTAINER_PROXY_NAME):$(OS_RELEASE_VER) > $(TARGET_CONTAINER_IMAGE_DIR)/$(CONTAINER_RPOXY_TAR)
+	docker rmi tsg-$(CONTAINER_PROXY_NAME):$(OS_RELEASE_VER)
+
+	tar -Jcf $(TARGET_CONTAINER_IMAGE_DIR)/$(CONTAINER_CERTSTORE_PKG) -C $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR) .
+	echo -e "FROM scratch\nADD $(CONTAINER_CERTSTORE_PKG) /\n\nCMD ["/bin/bash"]\n" > $(CONTAINER_DOCKERFILE)
+	docker build -t tsg-$(CONTAINER_CERTSTORE_NAME):$(OS_RELEASE_VER) -f $(CONTAINER_DOCKERFILE) $(TARGET_CONTAINER_IMAGE_DIR)
+	docker save tsg-$(CONTAINER_CERTSTORE_NAME):$(OS_RELEASE_VER) > $(TARGET_CONTAINER_IMAGE_DIR)/$(CONTAINER_CERTSTORE_TAR)
+	docker rmi tsg-$(CONTAINER_CERTSTORE_NAME):$(OS_RELEASE_VER)
+
+	tar -Jcf $(TARGET_CONTAINER_IMAGE_DIR)/$(CONTAINER_TELEGRAF_PKG) -C $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR) .
+	echo -e "FROM scratch\nADD $(CONTAINER_TELEGRAF_PKG) /\n\nCMD ["/bin/bash"]\n" > $(CONTAINER_DOCKERFILE)
+	docker build -t tsg-$(CONTAINER_TELEGRAF_NAME):$(OS_RELEASE_VER) -f $(CONTAINER_DOCKERFILE) $(TARGET_CONTAINER_IMAGE_DIR)
+	docker save tsg-$(CONTAINER_TELEGRAF_NAME):$(OS_RELEASE_VER) > $(TARGET_CONTAINER_IMAGE_DIR)/$(CONTAINER_TELEGRAF_TAR)
+	docker rmi tsg-$(CONTAINER_TELEGRAF_NAME):$(OS_RELEASE_VER)
+
+	tar -Jcf $(TARGET_CONTAINER_IMAGE_DIR)/$(CONTAINER_INIT_PKG) -C $(TARGET_CONTAINER_INIT_SYSROOT_DIR) .
+	echo -e "FROM scratch\nADD $(CONTAINER_INIT_PKG) /\n\nCMD ["/bin/bash"]\n" > $(CONTAINER_DOCKERFILE)
+	docker build -t tsg-$(CONTAINER_INIT_NAME):$(OS_RELEASE_VER) -f $(CONTAINER_DOCKERFILE) $(TARGET_CONTAINER_IMAGE_DIR)
+	docker save tsg-$(CONTAINER_INIT_NAME):$(OS_RELEASE_VER) > $(TARGET_CONTAINER_IMAGE_DIR)/$(CONTAINER_INIT_TAR)
+	docker rmi tsg-$(CONTAINER_INIT_NAME):$(OS_RELEASE_VER)
+
+sysroot-cleanup:
+	rm -rf $(TARGET_SYSROOT_DIR)/tmp/*
+	rm -rf $(TARGET_SYSROOT_DIR)/dev/*
+
+add-images-into-sysroot: container-images-generate
+	mkdir -p $(TARGET_SYSROOT_DIR)/opt/tsg/images/
+	cp $(TARGET_CONTAINER_IMAGE_DIR)/$(CONTAINER_FIREWALL_TAR) $(TARGET_SYSROOT_DIR)/opt/tsg/images/
+	cp $(TARGET_CONTAINER_IMAGE_DIR)/$(CONTAINER_RPOXY_TAR) $(TARGET_SYSROOT_DIR)/opt/tsg/images/
+	cp $(TARGET_CONTAINER_IMAGE_DIR)/$(CONTAINER_CERTSTORE_TAR) $(TARGET_SYSROOT_DIR)/opt/tsg/images/
+	cp $(TARGET_CONTAINER_IMAGE_DIR)/$(CONTAINER_TELEGRAF_TAR) $(TARGET_SYSROOT_DIR)/opt/tsg/images/
+	cp $(TARGET_CONTAINER_IMAGE_DIR)/$(CONTAINER_INIT_TAR) $(TARGET_SYSROOT_DIR)/opt/tsg/images/
+
+sysroot-archive: installer add-images-into-sysroot sysroot-cleanup
+	cp $(TARGET_CONTAINER_INIT_SYSROOT_DIR)/etc/sysctl.d/80-tfe.conf $(TARGET_SYSROOT_DIR)/etc/sysctl.d/
+	tar --exclude=*~ --exclude-backups --owner=root --group=root -c -C $(TARGET_SYSROOT_DIR) . | pbzip2 -p9 > $(TARGET_INSTALLER_DIR)/$(CHROOT_PKG)
+
+sysroot-binary: sysroot-archive
+	mkdir -p $(TARGET_BUILD_DIR)/cook-bits
+	$(TOOLSDIR)/cook-bits $(TARGET_BUILD_DIR) $(TARGET_BUILD_DIR)/cook-bits $(IMAGEDIR_BASE)/$(CHROOT_BIN)
+	sha256sum $(IMAGEDIR_BASE)/$(CHROOT_BIN) | awk '{print $$1}' > $(IMAGEDIR_BASE)/$(CHROOT_BIN).sha256sum.txt
+
+clean:
+	rm -rf $(TARGET_BUILD_DIR)
\ No newline at end of file
diff --git a/make/Makefile.TSGXNXR620G40R01P1403 b/make/Makefile.TSGXNXR620G40R01P1403
index 5372abe2..4048163e 100644
--- a/make/Makefile.TSGXNXR620G40R01P1403
+++ b/make/Makefile.TSGXNXR620G40R01P1403
@@ -53,7 +53,7 @@ sysroot-ansible: sysroot-verfile sysroot-base
 	cp $(CONFDIR)/resolv.conf $(TARGET_SYSROOT_DIR)/etc/ -r
 	cp $(TARGET_SYSROOT_DIR)/etc/hosts $(TARGET_SYSROOT_DIR)/tmp/ -r
 	cp /etc/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
-	$(TOOLSDIR)/ansible-HAL $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum-CentOS-7.conf
+	$(TOOLSDIR)/ansible-HAL $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum-CentOS-7.conf $(OS_RELEASE_VER)
 	cp $(TARGET_SYSROOT_DIR)/tmp/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
 	umount $(TARGET_SYSROOT_DIR)/proc