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

bugfix:修复编译TSG-X获取kernel version错误问题

Browse Source
This commit is contained in:
fumingwei
2022-04-07 15:41:39 +08:00
parent 22fdc5796d
commit 368a4e4c06
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/roles/OFED/tasks/main.yml
View File

@@ -15,8 +15,12 @@
dest: /tmp/OFED/unarchived/
remote_src: yes
- name: "Get linux kernel file path"
shell: ls /boot/vmlinuz-*.x86_64 | grep -oP "^/boot/vmlinuz-\K.*"
register: obtain_kernel_version
- name: "execute OFED installer"
shell: /tmp/OFED/unarchived/MLNX_OFED_LINUX-5.5-1.0.3.2-rhel7.9-x86_64-ext/mlnxofedinstall --add-kernel-support --kernel 4.18.0-348.12.2.el8_5.x86_64 --force --without-depcheck
shell: /tmp/OFED/unarchived/MLNX_OFED_LINUX-5.5-1.0.3.2-rhel7.9-x86_64-ext/mlnxofedinstall --add-kernel-support --kernel {{obtain_kernel_version.stdout}} --force --without-depcheck
- name: "enable auto update firmware on boot"
replace:

14
tools/mk-base-image
View File

@@ -10,9 +10,7 @@ yum_config=$1
target=$2
projectdir=$3
profile_id=$4
if [ $profile_id == "TSG-X-NXR620G40-R01-P1403" ];then
kernel_version="4.18.0-348.12.2.el8_5.x86_64"
else
if [ $profile_id != "TSG-X-NXR620G40-R01-P1403" ];then
kernel_version="5.4.159-1.el7.elrepo.x86_64"
fi
@@ -28,8 +26,10 @@ package_to_install_RockyLinux85="@base @core @debugging @anaconda-tools @additio
grub2 epel-release efibootmgr ansible yum-utils ipmitool OpenIPMI docker-ce docker-ce-cli containerd.io lrzsz python3 watchdog pcm git tmux fish kernel kernel-devel
kernel-tools-libs kernel-modules kernel-tools kernel-core"
locak_package_to_install_CentOS7="$projectdir/package/kernel-lt-$kernel_version.rpm
$projectdir/package/kernel-lt-devel-$kernel_version.rpm"
if [ $profile_id != "TSG-X-NXR620G40-R01-P1403" ];then
locak_package_to_install_CentOS7="$projectdir/package/kernel-lt-$kernel_version.rpm
$projectdir/package/kernel-lt-devel-$kernel_version.rpm"
fi
kernel_package_to_install="kernel-3.10.0-1160.59.1.el7.x86_64 kernel-devel-3.10.0-1160.59.1.el7.x86_64"
@@ -42,6 +42,10 @@ if [ $profile_id != "TSG-X-NXR620G40-R01-P1403" ];then
else
yum -c "$yum_config" --installroot="$target" -y --setopt=$setopt install $package_to_install_RockyLinux85
fi
if [ $profile_id == "TSG-X-NXR620G40-R01-P1403" ];then
kernel_version=$(ls $target/boot/vmlinuz-*.x86_64 | grep -oP "^$target/boot/vmlinuz-\K.*")
fi
#git clone --depth 1 https://github.com/brendangregg/FlameGraph.git /opt/tools/FlameGraph/
#git clone --depth 1 https://github.com/brendangregg/perf-tools.git /opt/tools/perf-tools/
test -d "$target"/opt/tools/ || mkdir -p "$target"/opt/tools/