Merge branch '4.2/4267' into 'master'

[ Bug #4267 ] 集成静态编译的perf

See merge request linx6.0.42/new_install!5
This commit is contained in:
徐顺选
2021-06-29 11:46:05 +08:00
2 changed files with 2 additions and 2 deletions

View File

@@ -62,7 +62,7 @@ generate_issue () {
local date="$4"
echo -e "\033[H\033[J"
echo "Welcome to Rocky OS ${version} ${arch} ${release} ($date) (\n) (\l)"
echo "LinxOS ${arch} ${release} (\n) (\l)"
echo
echo

View File

@@ -20480,7 +20480,7 @@
</buildtime>
</package>
<package group="base" insatll="optional" install="mandatory" layer="dont_build" name="kernel-image" version="2.6.32.41"/>
<package group="server" install="optional" layer="dont_build" name="perf" version="0.0.2.PERF"/>
<package group="server" install="optional" layer="dont_build" name="perf" version="2.6.32.700"/>
<package group="base" install="mandatory" layer="dont_build" name="linux-firmware" version="20140108"/>
<package group="server" install="optional" layer="above_floor" name="ethtool" version="3.13">
<runtime>