From 5e5934d89ec78d6622857605ae39cf9eb82feb05 Mon Sep 17 00:00:00 2001 From: linxiaoxu Date: Tue, 19 Oct 2021 22:43:55 +0800 Subject: [PATCH] change generate argument check range --- 0001-argumentchange.patch | 29 +++++++++++++++++++++++++++++ KubeOS.spec | 11 +++++++++-- 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 0001-argumentchange.patch diff --git a/0001-argumentchange.patch b/0001-argumentchange.patch new file mode 100644 index 0000000..2ef51ef --- /dev/null +++ b/0001-argumentchange.patch @@ -0,0 +1,29 @@ +From 377a5a9a81a3063ab56e2916575d46c0ec984f52 Mon Sep 17 00:00:00 2001 +From: linxiaoxu131415 +Date: Wed, 13 Oct 2021 07:54:55 +0000 +Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E6=A0=A1?= + =?UTF-8?q?=E9=AA=8C=E8=8C=83=E5=9B=B4?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + scripts/generate.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/generate.sh b/scripts/generate.sh +index c181221..7a57b05 100644 +--- a/scripts/generate.sh ++++ b/scripts/generate.sh +@@ -291,7 +291,7 @@ if [ $# != 4 ];then + fi + + set +eE +-for i in $* ++for i in $1 $2 $3 + do + echo "$i" | grep -v -E ${CHECK_REGEX} + filterParam=$(echo "$i" | grep -v -E ${CHECK_REGEX}) +-- +2.23.0 + diff --git a/KubeOS.spec b/KubeOS.spec index 2efd959..2f5f8ca 100644 --- a/KubeOS.spec +++ b/KubeOS.spec @@ -2,12 +2,13 @@ Name: KubeOS Version: 1.0.0 -Release: 3 +Release: 4 Summary: O&M platform used to update the whole OS as an entirety License: Mulan PSL v2 Source0: https://gitee.com/openeuler/isula-build/repository/archive/v%{version}.tar.gz ExclusiveArch: x86_64 BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch1: 0001-argumentchange.patch BuildRequires: make BuildRequires: golang >= 1.13 %description @@ -77,6 +78,12 @@ install -p -m 0600 ./files/os-release %{buildroot}/opt/kubeOS/files rm -rfv %{buildroot} %changelog +* Tue Oct 19 2021 linxiaoxu - 1.0.0-4 +- Type:requirement +- CVE:NA +- SUG:restart +- DESC:change argument check range + * Thu Sep 30 2021 liyuanrong - 1.0.0-2 - Type:requirement - CVE:NA @@ -93,4 +100,4 @@ rm -rfv %{buildroot} - Type:requirement - CVE:NA - SUG:restart -- DESC:First release KubeOS in rpm package \ No newline at end of file +- DESC:First release KubeOS in rpm package -- Gitee