gfwleak/tsg-tsg-os-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨ feat(DPISDN-9): 9140设备支持安装多平台的MRZCPD RPM

Browse Source 
9140设备支持安装多平台的MRZCPD RPM
This commit is contained in:
songyanchao
2023-06-15 23:22:22 -04:00
committed by 付明卫
parent 2be40c14fe
commit 4fe62c5732
8 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ansible/install_config/group_vars/rpm_version.yml
View File

@@ -59,7 +59,10 @@ kni_rpm_version:
mrzcpd_rpm_version:
mrzcpd: mrzcpd-4.5.6.fa28206
mrzcpd-0906: mrzcpd-4.6.26.12d7aa1
mrzcpd-icelake-server: mrzcpd-icelake-server-4.6.25.60eddce
mrzcpd-znver1: mrzcpd-znver1-4.6.25.60eddce
mrzcpd-corei7: mrzcpd-corei7-4.6.25.60eddce
sapp_rpm_version:

16
ansible/roles/mrzcpd/tasks/main.yml
View File

@@ -8,6 +8,10 @@
download_dir: "{{ path_download }}"
with_dict: "{{ mrzcpd_rpm_version }}"
- name: "Install python module"
shell: pip2 install PrettyTable==0.7.2
when: runtime_env == 'TSG-X-P0906'
- name: "Install mrzcpd rpm package"
shell: rpm -i /tmp/rpm_download/{{ item.value }}* --prefix {{ prefix_path.mrzcpd }}
with_dict: "{{ mrzcpd_rpm_version }}"
@@ -50,8 +54,8 @@
regexp: '/opt/mrzcpd'
replace: '{{ prefix_path.mrzcpd }}'
with_items:
- /usr/lib/systemd/system/mrzcpd-hugepages-setup.service
- /usr/lib/systemd/system/mrzcpd-hwdb-setup.service
- /usr/lib/systemd/system/mrzcpd_hugepages_setup.service
- /usr/lib/systemd/system/mrzcpd_hwdb_setup.service
when: runtime_env == 'TSG-X-P0906'
- name: "replace action: replace Requires to Wants"
@@ -171,16 +175,16 @@
enabled: yes
when: runtime_env != 'TSG-X-P0906'
- name: "enable mrzcpd-hugepages-setup"
- name: "enable mrzcpd_hugepages_setup"
systemd:
name: mrzcpd-hugepages-setup
name: mrzcpd_hugepages_setup
enabled: yes
when: runtime_env == 'TSG-X-P0906'
- name: "enable mrzcpd-hwdb-setup"
- name: "enable mrzcpd_hwdb_setup"
systemd:
name: mrzcpd-hwdb-setup
name: mrzcpd_hwdb_setup
enabled: yes
when: runtime_env == 'TSG-X-P0906'

2
make/Makefile.7400MCN0P01R01
View File

@@ -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 '/sapp-pr:/d;/mrzcpd-0906:/d' $(PROJECTDIR)/ansible/install_config/group_vars/rpm_version.yml
sed -i '/sapp-pr:/d;/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)

2
make/Makefile.7400MCN123P01R01
View File

@@ -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-0906:/d' $(PROJECTDIR)/ansible/install_config/group_vars/rpm_version.yml
sed -i '/tfe-pr:/d;/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)

2
make/Makefile.9000NPBP01R01
View File

@@ -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 '/sapp-pr:/d;/tfe-pr:/d;/mrzcpd-0906:/d' $(PROJECTDIR)/ansible/install_config/group_vars/rpm_version.yml
sed -i '/sapp-pr:/d;/tfe-pr:/d;/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)

2
make/Makefile.TSGXNXR620G40R01P0804
View File

@@ -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 '/sapp:/d;/tfe:/d;/mrzcpd-0906:/d' $(PROJECTDIR)/ansible/install_config/group_vars/rpm_version.yml
sed -i '/sapp:/d;/tfe:/d;/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-RockyLinux-8.conf $(TARGET_SYSROOT_DIR) $(PROJECTDIR) $(PROFILE_ID)

2
make/Makefile.TSGXNXR620G40R01P1403
View File

@@ -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 '/sapp:/d;/tfe:/d;/mrzcpd-0906:/d' $(PROJECTDIR)/ansible/install_config/group_vars/rpm_version.yml
sed -i '/sapp:/d;/tfe:/d;/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)

2
tools/mk-base-image
View File

@@ -47,7 +47,7 @@ case $profile_id in
containerd.io lrzsz python3 watchdog pcm git tmux fish kernel kernel-devel kernel-tools-libs kernel-modules
kernel-tools kernel-core rpm-build libtool kernel-rpm-macros python36-devel tcsh kernel-modules-extra gcc-gfortran
libdb-devel fuse-devel python3-Cython cmake perl-generators libstdc++-devel libmnl-devel bison flex gcc-c++
python3-docutils libnsl liburing hwloc-gui perl-open perl"
python3-docutils libnsl liburing hwloc-gui perl-open perl python2"
;;
"TSG-X-NXR620G40-R01-P1403" | "7400-MCN0-P01R01" | "7400-MCN123-P01R01" |"9000-NPB-P01R01")