diff options
| author | Cheng Zhang <cheng.zhang@citrix.com> | 2017-04-26 16:21:04 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-26 16:21:04 +0800 |
| commit | d5f5ea84568e4bdd192f16e250bcb7899570ff34 (patch) | |
| tree | 7b4fb375af0eee8c3ff60359b7edccd34801ace4 | |
| parent | 73775d90c74140b4c5a4eae8c59eabf296486efc (diff) | |
| parent | 2c3f28a4d157bbf2ed7e902ef6b49d50cef1a56f (diff) | |
| download | vyos-xe-guest-utilities-d5f5ea84568e4bdd192f16e250bcb7899570ff34.tar.gz vyos-xe-guest-utilities-d5f5ea84568e4bdd192f16e250bcb7899570ff34.zip | |
Merge pull request #34 from xiewei20082008/private/weix/CA-250696v7.4.0
CA-250696: DDK build number is optional.
| -rwxr-xr-x | mk/xe-linux-distribution | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mk/xe-linux-distribution b/mk/xe-linux-distribution index 76fa531..81f8fbf 100755 --- a/mk/xe-linux-distribution +++ b/mk/xe-linux-distribution @@ -135,8 +135,10 @@ identify_redhat() return 1 fi + eval $(sed -nr \ + 's/^(.*) DDK release ([^-]*)(-(.*))? (.*)$/distro=xe-ddk;major=\2;minor=\4/gp;' \ + "${redhat_release}") eval $(sed -n \ - -e 's/^\(.*\) DDK release \(.*\)-\(.*\) (.*)$/distro=xe-ddk;major=\2;minor=\3/gp;' \ -e 's/^\(.*\) SDK release \(.*\)-\(.*\) (.*)$/distro=xe-sdk;major=\2;minor=\3/gp;' \ -e 's/^Red Hat Enterprise Linux.* release \([0-9]*\) (.* Update \(.*\))$/distro=rhel;major=\1;minor=\2/gp;'\ -e 's/^Red Hat Enterprise Linux.* release \([0-9]*\) (.*)$/distro=rhel;major=\1/gp;' \ |