diff --git a/conf/yum-RockyLinux-8.5.conf b/conf/yum-RockyLinux-8.conf similarity index 65% rename from conf/yum-RockyLinux-8.5.conf rename to conf/yum-RockyLinux-8.conf index 593986f7..66a83d2c 100644 --- a/conf/yum-RockyLinux-8.5.conf +++ b/conf/yum-RockyLinux-8.conf @@ -11,33 +11,33 @@ distroverpkg=rocky-release reposdir=./ [base] -name=RockyLinux-8.5 - Base - mirrors.aliyun.com +name=RockyLinux-8 - Base - mirrors.aliyun.com #failovermethod=priority -baseurl=http://mirrors.aliyun.com/rockylinux/8.5/BaseOS/x86_64/os/ +baseurl=http://mirrors.aliyun.com/rockylinux/8/BaseOS/x86_64/os/ gpgcheck=1 -gpgkey=http://mirrors.aliyun.com/rockylinux/8.5/BaseOS/x86_64/os/RPM-GPG-KEY-rockyofficial +gpgkey=http://mirrors.aliyun.com/rockylinux/8/BaseOS/x86_64/os/RPM-GPG-KEY-rockyofficial [extras] -name=RockyLinux-8.5 - Extras - mirrors.aliyun.com +name=RockyLinux-8 - Extras - mirrors.aliyun.com #failovermethod=priority -baseurl=http://mirrors.aliyun.com/rockylinux/8.5/extras/x86_64/os/ +baseurl=http://mirrors.aliyun.com/rockylinux/8/extras/x86_64/os/ gpgcheck=0 [docker-ce-stable] name=Docker CE Stable -baseurl=https://mirrors.aliyun.com/docker-ce/linux/centos/8.5/x86_64/stable/ +baseurl=https://mirrors.aliyun.com/docker-ce/linux/centos/8/x86_64/stable/ enabled=1 gpgcheck=0 [PowerTools] -name=RockyLinux-8.5 - PowerTools - mirrors.aliyun.com -baseurl=http://mirrors.aliyun.com/rockylinux/8.5/PowerTools/x86_64/os/ +name=RockyLinux-8 - PowerTools - mirrors.aliyun.com +baseurl=http://mirrors.aliyun.com/rockylinux/8/PowerTools/x86_64/os/ gpgcheck=1 -gpgkey=http://mirrors.aliyun.com/rockylinux/8.5/PowerTools/x86_64/os/RPM-GPG-KEY-rockyofficial +gpgkey=http://mirrors.aliyun.com/rockylinux/8/PowerTools/x86_64/os/RPM-GPG-KEY-rockyofficial [PowerTools] -name=RockyLinux-8.5 - PowerTools - mirrors.aliyun.com -baseurl=http://mirrors.aliyun.com/rockylinux/8.5/BaseOS/x86_64/debug/tree/ +name=RockyLinux-8 - PowerTools - mirrors.aliyun.com +baseurl=http://mirrors.aliyun.com/rockylinux/8/BaseOS/x86_64/debug/tree/ enabled=1 gpgcheck=0 @@ -49,10 +49,10 @@ gpgcheck=0 [App] name=App Packages for Enterprise Linux 8 - x86_64 -baseurl=http://mirrors.aliyun.com/rockylinux/8.5/AppStream/x86_64/os/ +baseurl=http://mirrors.aliyun.com/rockylinux/8/AppStream/x86_64/os/ enabled=1 gpgcheck=1 -gpgkey=http://mirrors.aliyun.com/rockylinux/8.5/AppStream/x86_64/os/RPM-GPG-KEY-rockyofficial +gpgkey=http://mirrors.aliyun.com/rockylinux/8/AppStream/x86_64/os/RPM-GPG-KEY-rockyofficial [framework] diff --git a/make/Makefile.TSGXNXR620G40R01P0804 b/make/Makefile.TSGXNXR620G40R01P0804 index 2bacb1eb..b3c51e97 100644 --- a/make/Makefile.TSGXNXR620G40R01P0804 +++ b/make/Makefile.TSGXNXR620G40R01P0804 @@ -40,7 +40,7 @@ installer: builddir sed -i '/sapp:/d;/tfe:/d' $(PROJECTDIR)/ansible/install_config/group_vars/rpm_version.yml sysroot-base: builddir - $(TOOLSDIR)/mk-base-image $(CONFDIR)/yum-RockyLinux-8.5.conf $(TARGET_SYSROOT_DIR) $(PROJECTDIR) $(PROFILE_ID) + $(TOOLSDIR)/mk-base-image $(CONFDIR)/yum-RockyLinux-8.conf $(TARGET_SYSROOT_DIR) $(PROJECTDIR) $(PROFILE_ID) sysroot-verfile: sysroot-base sed -i -e "s/^NAME=.*/NAME=\"TSG-OS\"/" $(TARGET_SYSROOT_DIR)/usr/lib/os-release @@ -48,11 +48,11 @@ sysroot-verfile: sysroot-base 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.5.conf $(TARGET_SYSROOT_DIR)/tmp/ -r + 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.5.conf + $(TOOLSDIR)/ansible-HAL $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum-RockyLinux-8.conf cp $(TARGET_SYSROOT_DIR)/tmp/hosts $(TARGET_SYSROOT_DIR)/etc/ -r sysroot-cleanup: