diff --git a/generic-release-1.0/system-info.sh b/generic-release-1.0/system-info.sh index a4e92541ede0a0cbe1568eec0431350f15ab0ccd..19af64a9a453536f15bbca31915aea46d1415358 100644 --- a/generic-release-1.0/system-info.sh +++ b/generic-release-1.0/system-info.sh @@ -13,19 +13,28 @@ welcome=$(uname -r) # Memory -memory_total=$(free -m | awk '/Mem:/ { printf($2)}') +memory_total=$(cat /proc/meminfo | awk '/^MemTotal:/ {printf($2)}') +memory_free=$(cat /proc/meminfo | awk '/^MemFree:/ { printf($2)}') +buffers=$(cat /proc/meminfo | awk '/^Buffers:/ { printf($2)}') +cached=$(cat /proc/meminfo | awk '/^Cached:/ { printf($2)}') +sreclaimable=$(cat /proc/meminfo | awk '/^SReclaimable:/ { printf($2)}') +swap_total=$(cat /proc/meminfo | awk '/^SwapTotal:/ { printf($2)}') +swap_free=$(cat /proc/meminfo | awk '/^SwapFree:/ { printf($2)}') + + if [ $memory_total -gt 0 ] then - memory_usage=$(free -m | awk '/Mem:/ { printf("%3.1f%%", $3/$2*100)}') + memory_usage=`echo "scale=1; ($memory_total - $memory_free - $buffers - $cached - $sreclaimable) * 100.0 / $memory_total" |bc` + memory_usage="${memory_usage}%" else memory_usage=0.0% fi # Swap memory -swap_total=$(free -m | awk '/Swap:/ { printf($2)}') if [ $swap_total -gt 0 ] then - swap_mem=$(free -m | awk '/Swap:/ { printf("%3.1f%%", $3/$2*100)}') + swap_mem=`echo "scale=1; ($swap_total - $swap_free) * 100.0 / $swap_total" |bc` + swap_mem="${swap_mem}%" else swap_mem=0.0% fi diff --git a/generic-release.spec b/generic-release.spec index a0a0a1f020c2e3b9d921d8ae9dfceb1a374ec452..6ca4e4e76cf912f4b2a858491971b3697f12645d 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -5,8 +5,7 @@ %define dist_release_version 8 %define generic_version 20.03 %define generic_patch_level LTS -%define generic_patch_level_extend SP2 -%define generic_release 39 +%define generic_release 44 %define builtin_release_version 1.0 %define current_arch %{_arch} @@ -162,12 +161,18 @@ rm -rf $RPM_BUILD_ROOT %defattr(0644,root,root,0755) /etc/profile.d/performance.sh -%files -n %{product_family}-rootfiles -%config(noreplace) /root/.bashrc -%config(noreplace) /root/.bash_profile -%config(noreplace) /root/.bash_logout -%config(noreplace) /root/.tcshrc -%config(noreplace) /root/.cshrc +%changelog +* Thu Apr 1 2021 gaochong - 1.0-44 +- get memeroy info from /proc/meminfo instead of command free, fix issue I3EN1Z + +* Sat Dec 26 2020 fu_changjie - 1.0-43 +- Change value of product_family to 2, fix issue I3A6CP + +* Sat Dec 26 2020 fu_changjie - 1.0-42 +- Use generic_version macro instead of constant value, fix issue I28WC0 + +* Sat Dec 26 2020 Shinwell_Hu - 1.0-41 +- Disable GOMP_CPU_AFFINITY setting in performance.sh to fix issue I1OT20 %changelog * Wed Apr 28 2021 yaokai13 - 1.0-39