summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2018-07-06 11:31:06 +0200
committerSebastien Douheret <sebastien.douheret@iot.bzh>2018-07-07 20:40:50 +0000
commit005e0eb072418456055783491f907fc08cb42fd7 (patch)
treeeca12060c85f48f72758ec03ac2e0c0dc6543219
parent4d76c5679e664c307036dd495ff79679079d9f71 (diff)
Update/fix rpm and deb packaging
Change-Id: I132dc3085dddfedc869135ba3a967b0060afb72b Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
-rw-r--r--conf.d/etc/profile.d/xds-agent.sh1
-rw-r--r--conf.d/packaging/deb/agl-xds-agent.dsc6
-rw-r--r--conf.d/packaging/deb/debian.control2
-rw-r--r--conf.d/packaging/deb/debian.rules1
-rw-r--r--conf.d/packaging/rpm/agl-xds-agent.spec7
-rw-r--r--lib/xdsconfig/config.go2
6 files changed, 10 insertions, 9 deletions
diff --git a/conf.d/etc/profile.d/xds-agent.sh b/conf.d/etc/profile.d/xds-agent.sh
index dd7f01d..17848f9 100644
--- a/conf.d/etc/profile.d/xds-agent.sh
+++ b/conf.d/etc/profile.d/xds-agent.sh
@@ -1,4 +1,3 @@
-#!/bin/bash
###########################################################################
# Copyright 2017-2018 IoT.bzh
#
diff --git a/conf.d/packaging/deb/agl-xds-agent.dsc b/conf.d/packaging/deb/agl-xds-agent.dsc
index 7034c51..36c4e93 100644
--- a/conf.d/packaging/deb/agl-xds-agent.dsc
+++ b/conf.d/packaging/deb/agl-xds-agent.dsc
@@ -2,10 +2,10 @@ Format: 1.0
Source: agl-xds-agent
Binary: agl-xds-agent
Architecture: any
-Version: 1.1.1
+Version: 0.0.0
Maintainer: Sebastien Douheret <sebastien@iot.bzh>
Standards-Version: 3.8.2
-Homepage: https://github.com/iotbzh/xds-agent.git
+Homepage: https://gerrit.automotivelinux.org/gerrit/p/src/xds/xds-agent.git
Build-Depends: debhelper (>= 5),
unzip
-Debtransform-Tar: xds-agent_linux-amd64-v1.1.1_2018-04-05_112625.zip
+Debtransform-Tar: xds-agent_linux-amd64-*.zip
diff --git a/conf.d/packaging/deb/debian.control b/conf.d/packaging/deb/debian.control
index afe4157..7fa3a5d 100644
--- a/conf.d/packaging/deb/debian.control
+++ b/conf.d/packaging/deb/debian.control
@@ -4,7 +4,7 @@ Source: agl-xds-agent
Build-Depends: debhelper (>= 5),
unzip
Standards-Version: 3.8.2
-Homepage: https://github.com/iotbzh/xds-agent.git
+Homepage: https://gerrit.automotivelinux.org/gerrit/p/src/xds/xds-agent.git
Package: agl-xds-agent
Section: libs
diff --git a/conf.d/packaging/deb/debian.rules b/conf.d/packaging/deb/debian.rules
index c6c7bd3..ee3eef5 100644
--- a/conf.d/packaging/deb/debian.rules
+++ b/conf.d/packaging/deb/debian.rules
@@ -78,6 +78,7 @@ postinst: install
if [ -f "/etc/xds-agent/config.json" ]; then
install -b -S .rpmsave /etc/xds-agent/config.json /etc/xds/agent/agent-config.json
fi
+ echo "[XDS Agent] To enable the service with your user session: systemctl --user enable xds-agent"
prerm:
rm -f /etc/xds-agent/*.rpm*
diff --git a/conf.d/packaging/rpm/agl-xds-agent.spec b/conf.d/packaging/rpm/agl-xds-agent.spec
index 0d493a4..66373c4 100644
--- a/conf.d/packaging/rpm/agl-xds-agent.spec
+++ b/conf.d/packaging/rpm/agl-xds-agent.spec
@@ -6,14 +6,15 @@
%global debug_package %{nil}
Name: agl-xds-agent
-Version: 1.1.1
+Version: 0.0.0
Release: 0
License: Apache-2.0
Summary: XDS agent/client tool
-Url: https://github.com/iotbzh/xds-agent.git
-Source0: xds-agent_linux-amd64-v%{version}_2018-04-05_112625.zip
+Url: https://gerrit.automotivelinux.org/gerrit/p/src/xds/xds-agent.git
+Source0: xds-agent_linux-amd64-%{version}.zip
BuildRequires: unzip
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Group: Development/Tools/Debuggers
# currently embedded with xds
# Requires: syncthing
diff --git a/lib/xdsconfig/config.go b/lib/xdsconfig/config.go
index 352ba84..ef94f0a 100644
--- a/lib/xdsconfig/config.go
+++ b/lib/xdsconfig/config.go
@@ -93,7 +93,7 @@ func Init(ctx *cli.Context, log *logrus.Logger) (*Config, error) {
},
ProfileConf: ProfileConfT{
XDSBinder: XDSBinderConf{
- URL: "http://localhost:5678",
+ URL: "http://localhost:8810",
ConnRetry: 10,
},
},