diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:40:05 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:40:05 +0100 |
| commit | 88d58c389485032c4ff7ca22f9d603b874b98ec1 (patch) | |
| tree | cfb471429dc22b4984f472d69914bbf36dbbf58b | |
| parent | ad812135181f53da367d5d8f0b2f77e486eec706 (diff) | |
| parent | 99aac466a1fe5637ead8b57ee45698622700547c (diff) | |
| download | vyos-xe-guest-utilities-88d58c389485032c4ff7ca22f9d603b874b98ec1.tar.gz vyos-xe-guest-utilities-88d58c389485032c4ff7ca22f9d603b874b98ec1.zip | |
Merge branch 'equuleus' of github.com:vyos/vyos-xe-guest-utilities into current
* 'equuleus' of github.com:vyos/vyos-xe-guest-utilities:
Jenkins: import Pipeline from vyos-1x commit e541ffc4f34c
update Jenkins file for equuleus
[xe-guest-utilities] T1413 - fix package for vyos 1.3 (equuleus) builds
| -rw-r--r-- | Jenkinsfile | 4 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/install | 2 | ||||
| -rwxr-xr-x | debian/rules | 6 | ||||
| -rw-r--r-- | debian/xe-guest-utilities.service (renamed from debian/xe-guest-utilities.xe-daemon.service) | 0 |
5 files changed, 8 insertions, 11 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index bcce16d..3b8daeb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -74,6 +74,7 @@ pipeline { docker { args '--sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006' image 'vyos/vyos-build:current' + alwaysPull true } } options { @@ -122,9 +123,6 @@ pipeline { // every option over and over again! def VYOS_REPO_PATH = '/home/sentrium/web/dev.packages.vyos.net/public_html/repositories/' + getGitBranchName() + '/' - if (getGitBranchName() != "equuleus") - VYOS_REPO_PATH += 'vyos/' - def SSH_OPTS = '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=ERROR' def SSH_REMOTE = 'khagen@10.217.48.113' diff --git a/debian/changelog b/debian/changelog index 2ef9ee7..6503525 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,8 @@ -vyos-xe-guest-utilities (1.0.0-3) unstable; urgency=medium +vyos-xe-guest-utilities (1.0.1-1+equuleus) unstable; urgency=medium - * updates from upstream merged - * systemd unit file added to package + * built for vyos 1.3 - -- hagbard <vyosdev@derith.de> Fri, 19 Jul 2019 15:57:12 -0700 + -- hagbard <vyosdev@derith.de> Tue, 18 Jun 2019 12:40:08 -0700 vyos-xe-guest-utilities (1.0.0-2) unstable; urgency=medium diff --git a/debian/install b/debian/install index 657265f..bf71c3f 100644 --- a/debian/install +++ b/debian/install @@ -1,5 +1,5 @@ debian/proc-xen.mount lib/systemd/system -debian/xe-guest-utilities.xe-daemon.service etc/systemd/system +debian/xe-guest-utilities.service etc/systemd/system debian/z10_xen-vcpu-hotplug.rules lib/udev/rules.d build/stage/usr/sbin/xe-linux-distribution usr/sbin build/stage/usr/sbin/xe-daemon usr/sbin diff --git a/debian/rules b/debian/rules index 2b05d4e..c9d0d84 100755 --- a/debian/rules +++ b/debian/rules @@ -1,11 +1,11 @@ #!/usr/bin/make -f +#export DH_VERBOSE=1 %: dh $@ --with systemd override_dh_installinit: - dh_installinit --no-restart-on-upgrade --name xe-daemon - dh_installinit --no-restart-on-upgrade --name xe-cloud + dh_installinit --no-restart-on-upgrade --name xe-guest-utilities override_dh_systemd_enable: - dh_systemd_enable --name xe-guest-utilities.xe-daemon.service + dh_systemd_enable --name xe-guest-utilities.service diff --git a/debian/xe-guest-utilities.xe-daemon.service b/debian/xe-guest-utilities.service index 8fd501a..8fd501a 100644 --- a/debian/xe-guest-utilities.xe-daemon.service +++ b/debian/xe-guest-utilities.service |