diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-12-28 21:26:47 +0000 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-12-28 22:30:28 +0100 |
| commit | d61f658f7adf5f0f5c231a3e73cdc697c8693885 (patch) | |
| tree | 908b6b738e6c8359627fa7a42b761b13339ac0cf | |
| parent | 71a0b913900dd8b9226f08670c639bd25677b5e0 (diff) | |
| parent | a419bc16924c46af0899b8402b7584bc7ce21cba (diff) | |
| download | vyos-xe-guest-utilities-d61f658f7adf5f0f5c231a3e73cdc697c8693885.tar.gz vyos-xe-guest-utilities-d61f658f7adf5f0f5c231a3e73cdc697c8693885.zip | |
Merge tag 'v7.13.0' of https://github.com/xenserver/xe-guest-utilities into current
* tag 'v7.13.0' of https://github.com/xenserver/xe-guest-utilities:
CP-31387(REQ-749): add support to sle15sp1 os-release format
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | mk/testcases/sle-15sp1 | 8 | ||||
| -rwxr-xr-x | mk/xe-linux-distribution | 6 | ||||
| -rwxr-xr-x | mk/xe-linux-distribution-test | 1 |
5 files changed, 18 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 26eb008..5fdfcad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyos-xe-guest-utilities (7.13.0+vyos2+current1) UNRELEASED; urgency=medium + + * Update to xe-guest-utilities 7.13.0 + + -- Christian Poessinger <christian@poessinger.com> Mon, 28 Dec 2020 22:27:28 +0100 + vyos-xe-guest-utilities (7.12.0+vyos2+current1) UNRELEASED; urgency=medium * Fixup package version to v7.12.0 diff --git a/debian/control b/debian/control index df20d0e..2388cd8 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,6 @@ Vcs-Git: https://github.com/xenserver/xe-guest-utilities Package: vyos-xe-guest-utilities Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} Description: daemon for monitoring Xen Virtual machines xe-daemon for monitoring Virtual Machines on a Xen Hypervisor. . diff --git a/mk/testcases/sle-15sp1 b/mk/testcases/sle-15sp1 new file mode 100644 index 0000000..c916157 --- /dev/null +++ b/mk/testcases/sle-15sp1 @@ -0,0 +1,8 @@ +NAME="SLES" +VERSION="15-SP1" +VERSION_ID="15.1" +PRETTY_NAME="SUSE Linux Enterprise Server 15 SP1" +ID="sles" +ID_LIKE="suse" +ANSI_COLOR="0;32" +CPE_NAME="cpe:/o:suse:sles:15:sp1" diff --git a/mk/xe-linux-distribution b/mk/xe-linux-distribution index a5f1b2a..dc35b2b 100755 --- a/mk/xe-linux-distribution +++ b/mk/xe-linux-distribution @@ -222,11 +222,11 @@ identify_sles() fi eval $(sed -n \ + -e 's/^VERSION_ID="\([0-9]*\)\.\?\([0-9]*\)\?"$/major=\1;minor=\2;/gp' \ + -e 's/^PRETTY_NAME="SUSE L\(inux\|INUX\) Enterprise \([a-zA-Z0-9_]*\) \([0-9]*\)\( SP[0-9]*\)\?"/_major=\3;_pretty_name=\0;/gp' \ -e 's/^SUSE L\(inux\|INUX\) Enterprise \([a-zA-Z0-9_]*\) \([0-9]*\) (.*)/_major=\3;_pretty_name="\0";/gp;' \ -e 's/^VERSION = \([0-9]*\)$/major=\1;/gp;' \ -e 's/^PATCHLEVEL = \([0-9]*\)$/minor=\1;/gp;' \ - -e 's/^PRETTY_NAME="SUSE L\(inux\|INUX\) Enterprise \([a-zA-Z0-9_]*\) \([0-9]*\)"/_major=\3;_pretty_name=\0;/gp' \ - -e 's/^VERSION="\([0-9]*\)"$/major=\1;/gp' \ "${suse_release}") if [ -z "${major}" -o -z "${_major}" ] ; then @@ -238,7 +238,7 @@ identify_sles() fi if [ -z "${minor}" ] ; then - minor=0 + minor=0 fi write_to_output "sles" "${major}" "${minor}" "${_pretty_name##*=}" diff --git a/mk/xe-linux-distribution-test b/mk/xe-linux-distribution-test index 51c800a..6bc26b8 100755 --- a/mk/xe-linux-distribution-test +++ b/mk/xe-linux-distribution-test @@ -79,4 +79,5 @@ do_test "testcases/oracle-5" "oracle 5 0" do_test "testcases/oracle-5u1" "oracle 5 1" do_test "testcases/lsb-coreos-367.1.0" "coreos 367 1.0" do_test "testcases/sle-15" "sles 15 0" +do_test "testcases/sle-15sp1" "sles 15 1" exit 0 |