summaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorfumingwei <[email protected]>2024-07-08 16:50:19 +0800
committerfumingwei <[email protected]>2024-07-08 17:16:31 +0800
commitcb266a49b25bbc528de349586302dcbfe338b063 (patch)
tree6f78ce22be7783b97b213efb84206ff2d5486969 /make
parent0f1dec9456b3fb06e0ef805c982de9e1ed9e1346 (diff)
feature:TSG-21743:Remove tfe-pr because cento7 end of life.
Diffstat (limited to 'make')
-rw-r--r--make/Makefile.7400MCN123P01R012
-rw-r--r--make/Makefile.x86_64_COTS2
-rw-r--r--make/Makefile.x86_64_COTS_APP_BUNDLE4
3 files changed, 4 insertions, 4 deletions
diff --git a/make/Makefile.7400MCN123P01R01 b/make/Makefile.7400MCN123P01R01
index 710f8498..30e014cd 100644
--- a/make/Makefile.7400MCN123P01R01
+++ b/make/Makefile.7400MCN123P01R01
@@ -37,7 +37,7 @@ installer: builddir
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 '/tfe-pr:/d;/mrzcpd-icelake-server:/d;/mrzcpd-znver1:/d;/mrzcpd-corei7:/d' $(PROJECTDIR)/ansible/install_config/group_vars/rpm_version.yml
+ sed -i '/mrzcpd-icelake-server:/d;/mrzcpd-znver1:/d;/mrzcpd-corei7:/d' $(PROJECTDIR)/ansible/install_config/group_vars/rpm_version.yml
sysroot-base: builddir
$(TOOLSDIR)/mk-base-image $(CONFDIR)/yum-CentOS-7.conf $(TARGET_SYSROOT_DIR) $(PROJECTDIR) $(PROFILE_ID)
diff --git a/make/Makefile.x86_64_COTS b/make/Makefile.x86_64_COTS
index ca987c77..84967959 100644
--- a/make/Makefile.x86_64_COTS
+++ b/make/Makefile.x86_64_COTS
@@ -44,7 +44,7 @@ installer: builddir
sed -i -e "s/%%APP_BUNDLE_BIN%%/$(APP_BUNDLE_BIN)/" $(TARGET_INSTALLER_DIR)/install.sh
sed -i -e "s/%%NIC_UIO_BINDER_IMAGE_TAR%%/$(NIC_UIO_BINDER_IMAGE_TAR)/" $(PROJECTDIR)/$(NIC_UIO_BINDER_FILE_PATH)
- sed -i '/sapp-pr:/d;/tfe-pr:/d;/mrzcpd:/d' $(PROJECTDIR)/ansible/install_config/group_vars/rpm_version.yml
+ sed -i '/sapp-pr:/d;/mrzcpd:/d' $(PROJECTDIR)/ansible/install_config/group_vars/rpm_version.yml
ifeq ($(ENABLE_ALIYUN_INTERNAL_DOMAIN),1)
sed -i -e "s/mirrors.aliyun.com/mirrors.cloud.aliyuncs.com/" $(CONFDIR)/yum-RockyLinux-8.conf
endif
diff --git a/make/Makefile.x86_64_COTS_APP_BUNDLE b/make/Makefile.x86_64_COTS_APP_BUNDLE
index d66424a7..39cf66a8 100644
--- a/make/Makefile.x86_64_COTS_APP_BUNDLE
+++ b/make/Makefile.x86_64_COTS_APP_BUNDLE
@@ -50,9 +50,9 @@ installer: build_dir
prebuild_container_images:
ifeq ($(ENABLE_LICENSE_PROTECTED),1)
- sed -i '/sapp:/d;/tfe-pr:/d;/mrzcpd:/d' $(PROJECTDIR)/ansible/install_config/group_vars/rpm_version.yml
+ sed -i '/sapp:/d;/mrzcpd:/d' $(PROJECTDIR)/ansible/install_config/group_vars/rpm_version.yml
else
- sed -i '/sapp-pr:/d;/tfe-pr:/d;/mrzcpd:/d' $(PROJECTDIR)/ansible/install_config/group_vars/rpm_version.yml
+ sed -i '/sapp-pr:/d;/mrzcpd:/d' $(PROJECTDIR)/ansible/install_config/group_vars/rpm_version.yml
endif
ifeq ($(ENABLE_ALIYUN_INTERNAL_DOMAIN),1)
sed -i -e "s/mirrors.aliyun.com/mirrors.cloud.aliyuncs.com/" $(CONFDIR)/yum-RockyLinux-8.conf