diff --git a/isopackage.sdf b/isopackage.sdf index 50d3148..98127ac 100644 --- a/isopackage.sdf +++ b/isopackage.sdf @@ -1,3 +1,5 @@ -eulerversion=vrsion +openeulerversion=version compiletime=2017-01-01-00-00-00 kernelversion=version +gccversion=2017-01-01-00-00-00 +openjdkversion=2017-01-01-00-00-00 diff --git a/isopackage_arm64.sdf b/isopackage_arm64.sdf index 59d1225..98127ac 100644 --- a/isopackage_arm64.sdf +++ b/isopackage_arm64.sdf @@ -1,3 +1,5 @@ -eulerversion=version +openeulerversion=version compiletime=2017-01-01-00-00-00 kernelversion=version +gccversion=2017-01-01-00-00-00 +openjdkversion=2017-01-01-00-00-00 diff --git a/openEuler-latest-release.spec b/openEuler-latest-release.spec index 6f7b834..60f3a28 100644 --- a/openEuler-latest-release.spec +++ b/openEuler-latest-release.spec @@ -1,12 +1,12 @@ Name: openEuler-latest-release -Summary: System information like kernelversion, eulerversion and compile time +Summary: System information like kernelversion, openeulerversion, gccversion, openjdkversion and compile time License: GPL Group: System/Config Version: 1.0 %ifarch aarch64 -Release: %(date +%s -d "$(grep "compiletime" %{_sourcedir}/isopackage_arm64.sdf | cut -d '=' -f2 | sed 's/-/ /3' | sed 's/-/:/3' | sed 's/-/:/3')").%(grep "eulerversion" %{_sourcedir}/isopackage_arm64.sdf | cut -d '_' -f2)%{?dist} +Release: %(date +%s -d "$(grep "compiletime" %{_sourcedir}/isopackage_arm64.sdf | cut -d '=' -f2 | sed 's/-/ /3' | sed 's/-/:/3' | sed 's/-/:/3')").%(grep "openeulerversion" %{_sourcedir}/isopackage_arm64.sdf | cut -d '_' -f2)%{?dist} %else -Release: %(date +%s -d "$(grep "compiletime" %{_sourcedir}/isopackage.sdf | cut -d '=' -f2 | sed 's/-/ /3' | sed 's/-/:/3' | sed 's/-/:/3')").%(grep "eulerversion" %{_sourcedir}/isopackage.sdf | cut -d '_' -f2)%{?dist} +Release: %(date +%s -d "$(grep "compiletime" %{_sourcedir}/isopackage.sdf | cut -d '=' -f2 | sed 's/-/ /3' | sed 's/-/:/3' | sed 's/-/:/3')").%(grep "openeulerversion" %{_sourcedir}/isopackage.sdf | cut -d '_' -f2)%{?dist} %endif BuildRoot: %{_tmppath}/%{name}-%{version} @@ -18,35 +18,34 @@ The rpm contains system information, like kernelversion, eulerversion and compil %install mkdir -p %{buildroot}/etc %ifarch aarch64 -install %{_sourcedir}/isopackage_arm64.sdf %{buildroot}/etc/euleros-latest +install %{_sourcedir}/isopackage_arm64.sdf %{buildroot}/etc/openeuler-latest %else -install %{_sourcedir}/isopackage.sdf %{buildroot}/etc/euleros-latest +install %{_sourcedir}/isopackage.sdf %{buildroot}/etc/openeuler-latest %endif %pre %post -if [[ `grep "eulerversion" /etc/euleros-latest | cut -d '_' -f2` =~ 2\.2\.RC.* ]]; then +if [[ `grep "openeulerversion" /etc/openeuler-latest | cut -d '_' -f2` =~ 2\.2\.RC.* ]]; then if [ $1 = 1 ]; then - if [ -e /etc/EulerLinux.conf ];then - mv /etc/EulerLinux.conf /etc/.EulerLinux.conf + if [ -e /etc/openEulerLinux.conf ];then + mv /etc/openEulerLinux.conf /etc/.openEulerLinux.conf fi else - rm -f /etc/.EulerLinux.conf + rm -f /etc/.openEulerLinux.conf fi fi %preun %postun -if [ -e /etc/.EulerLinux.conf ]; then -mv /etc/.EulerLinux.conf /etc/EulerLinux.conf +if [ -e /etc/.openEulerLinux.conf ]; then +mv /etc/.openEulerLinux.conf /etc/openEulerLinux.conf fi - %files -%config /etc/euleros-latest -%attr(0444, root, root) /etc/euleros-latest +%config /etc/openeuler-latest +%attr(0444, root, root) /etc/openeuler-latest %clean rm -rf $RPM_BUILD_ROOT/* @@ -54,14 +53,3 @@ rm -rf %{_tmppath}/%{name}-%{version} rm -rf $RPM_BUILD_DIR/%{name}-%{version} %changelog -* Wed Feb 27 2019 jiazhenyuan - 2.0SP8 -- Type:bugfix -- ID:NA -- SUG:restart -- DESC:update version. - -* Tue Jul 10 2018 zhangpengfei - 2.0SP5 -- Type:bugfix -- SUG:NA -- DEC:update Version to SP5 -