summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2018-07-06 18:39:00 +0200
committerSebastien Douheret <sebastien.douheret@iot.bzh>2018-07-07 22:06:02 +0200
commite0faa97416aee22fa0c09f75a4040bb2bb16e2dd (patch)
treee9687d481c219a458a7ac5c39feface3c9d779d9
parentc8f5f5a7097254496b9dc8ddb458cf1fdb7169da (diff)
Update/fix rpm and deb packagingflounder_5.99.2flounder/5.99.25.99.2
Change-Id: I576c7c02def683dc3028194e68416bfc0b167067 Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
-rw-r--r--.vscode/settings.json3
-rw-r--r--Makefile18
-rw-r--r--conf.d/etc/bash_completion.d/xds-cli2
-rw-r--r--conf.d/etc/profile.d/xds-cli.sh2
-rw-r--r--conf.d/packaging/deb/agl-xds-cli.dsc6
-rw-r--r--conf.d/packaging/deb/debian.control2
-rw-r--r--conf.d/packaging/deb/debian.rules4
-rw-r--r--conf.d/packaging/obs/_service.in (renamed from conf.d/packaging/obs/_service)2
-rw-r--r--conf.d/packaging/rpm/agl-xds-cli.spec12
-rwxr-xr-xscripts/install.sh1
10 files changed, 31 insertions, 21 deletions
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 9f7f5b2..b86deb9 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,7 +3,8 @@
// The number of spaces a tab is equal to. This setting is overriden based on the file contents when `editor.detectIndentation` is on.
"editor.tabSize": 4,
// Insert spaces when pressing Tab. This setting is overriden based on the file contents when `editor.detectIndentation` is on.
- "editor.insertSpaces": true,
+ "editor.insertSpaces": false,
+
// When opening a file, `editor.tabSize` and `editor.insertSpaces` will be detected based on the file contents.
"editor.detectIndentation": false,
// Configure glob patterns for excluding files and folders.
diff --git a/Makefile b/Makefile
index 2d2586e..fadc3fe 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,6 @@
# limitations under the License.
###########################################################################
-
# Application Name
TARGET=xds-cli
@@ -84,11 +83,13 @@ else
BUILD_MODE="Release mode"
endif
-
ifeq ($(SUB_VERSION), )
PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).zip
else
- PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION)_$(SUB_VERSION).zip
+ # only use dot as separator to allow rpm packaging (see version .spec file)
+ PK_VER := $(subst _,.,$(subst -,,$(VERSION)))
+ PK_SBVER := $(subst _,.,$(subst -,,$(SUB_VERSION)))
+ PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(PK_VER).$(PK_SBVER).zip
endif
.PHONY: all
@@ -114,7 +115,7 @@ clean:
.PHONY: distclean
distclean: clean
- rm -rf $(LOCAL_BINDIR) $(ROOT_SRCDIR)/tools glide.lock vendor
+ rm -rf $(LOCAL_BINDIR) && (cd $(ROOT_SRCDIR) && rm -rf ./tools ./glide.lock ./vendor ./*.zip)
.PHONY: scripts
@@ -165,7 +166,7 @@ tools/glide:
@test -f $(LOCAL_TOOLSDIR)/glide || { \
echo "Downloading glide"; \
mkdir -p $(LOCAL_TOOLSDIR); \
- curl --silent -L https://glide.sh/get | GOBIN=$(LOCAL_TOOLSDIR) sh; \
+ curl --silent --connect-timeout 60 --retry 3 -L https://glide.sh/get | GOBIN=$(LOCAL_TOOLSDIR) sh; \
}
.PHONY:
@@ -176,12 +177,13 @@ checkgover:
.PHONY: help
help:
@echo "Main supported rules:"
- @echo " all (default)"
+ @echo " all (default)"
@echo " build"
@echo " release"
- @echo " clean"
@echo " package"
- @echo " install / uninstall"
+ @echo " install"
+ @echo " uninstall"
+ @echo " clean"
@echo " distclean"
@echo ""
@echo "Influential make variables:"
diff --git a/conf.d/etc/bash_completion.d/xds-cli b/conf.d/etc/bash_completion.d/xds-cli
index 9778180..b3618a6 100644
--- a/conf.d/etc/bash_completion.d/xds-cli
+++ b/conf.d/etc/bash_completion.d/xds-cli
@@ -1,4 +1,4 @@
-#! /bin/bash
+# xds-cli bash completion script
_cli_bash_autocomplete() {
local cur opts base
diff --git a/conf.d/etc/profile.d/xds-cli.sh b/conf.d/etc/profile.d/xds-cli.sh
index 3c8a13d..a85479f 100644
--- a/conf.d/etc/profile.d/xds-cli.sh
+++ b/conf.d/etc/profile.d/xds-cli.sh
@@ -1,5 +1,3 @@
-#!/bin/bash
-
###########################################################################
# Copyright 2017-2018 IoT.bzh
#
diff --git a/conf.d/packaging/deb/agl-xds-cli.dsc b/conf.d/packaging/deb/agl-xds-cli.dsc
index 53a4e12..37ed8b4 100644
--- a/conf.d/packaging/deb/agl-xds-cli.dsc
+++ b/conf.d/packaging/deb/agl-xds-cli.dsc
@@ -2,10 +2,10 @@ Format: 1.0
Source: agl-xds-cli
Binary: agl-xds-cli
Architecture: any
-Version: 1.1.1-0
+Version: 0.0.0
Maintainer: Sebastien Douheret <sebastien@iot.bzh>
Standards-Version: 3.8.2
-Homepage: https://github.com/iotbzh/xds-cli.git
+Homepage: https://gerrit.automotivelinux.org/gerrit/p/src/xds/xds-cli.git
Build-Depends: debhelper (>= 5),
unzip
-Debtransform-Tar: xds-cli_linux-amd64-v1.1.1_2018-04-05_110646.zip
+Debtransform-Tar: xds-cli_linux-amd64-*.zip
diff --git a/conf.d/packaging/deb/debian.control b/conf.d/packaging/deb/debian.control
index 4fd3273..226de7c 100644
--- a/conf.d/packaging/deb/debian.control
+++ b/conf.d/packaging/deb/debian.control
@@ -4,7 +4,7 @@ Source: agl-xds-cli
Build-Depends: debhelper (>= 5),
unzip
Standards-Version: 3.8.2
-Homepage: https://github.com/iotbzh/xds-cli.git
+Homepage: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src/xds/xds-cli.git
Package: agl-xds-cli
Section: libs
diff --git a/conf.d/packaging/deb/debian.rules b/conf.d/packaging/deb/debian.rules
index a1b4a6a..121ccec 100644
--- a/conf.d/packaging/deb/debian.rules
+++ b/conf.d/packaging/deb/debian.rules
@@ -62,6 +62,10 @@ install: build
mkdir -p $(DEB_BASE_DIR)/etc/profile.d
sed -e "s;@XDS_INSTALL_BIN_DIR@;$(INSTALL_BIN_DIR);g" $(DEB_INSTALL_XDS_DIR)/conf.d/etc/profile.d/xds-cli.sh > $(DEB_BASE_DIR)/etc/profile.d/$(NAME).sh
+ # Add bash_completion file
+ mkdir -p $(DEB_BASE_DIR)/etc/bash_completion.d
+ cp $(DEB_INSTALL_XDS_DIR)/conf.d/etc/bash_completion.d/xds-cli $(DEB_BASE_DIR)/etc/bash_completion.d/
+
# Cleanup
rm -rf $(DEB_INSTALL_XDS_DIR)/scripts $(DEB_INSTALL_XDS_DIR)/conf.d
diff --git a/conf.d/packaging/obs/_service b/conf.d/packaging/obs/_service.in
index 554a5bf..1540fc3 100644
--- a/conf.d/packaging/obs/_service
+++ b/conf.d/packaging/obs/_service.in
@@ -3,7 +3,7 @@
<param name="url">https://gerrit.automotivelinux.org/gerrit/src/xds/xds-cli</param>
<param name="scm">git</param>
<param name="version">@VERSION@</param>
- <param name="revision">@REVISON@</param>
+ <param name="revision">@REVISION@</param>
<param name="extract">conf.d/packaging/rpm/agl-xds-cli.spec</param>
<param name="extract">conf.d/packaging/deb/agl-xds-cli.dsc</param>
<param name="extract">conf.d/packaging/deb/agl-xds-cli.install</param>
diff --git a/conf.d/packaging/rpm/agl-xds-cli.spec b/conf.d/packaging/rpm/agl-xds-cli.spec
index f3f00db..ad3cc7b 100644
--- a/conf.d/packaging/rpm/agl-xds-cli.spec
+++ b/conf.d/packaging/rpm/agl-xds-cli.spec
@@ -6,14 +6,15 @@
%global debug_package %{nil}
Name: agl-xds-cli
-Version: 1.1.1
+Version: 0.0.0
Release: 0
License: Apache-2.0
Summary: Command line tool to interact with XDS
-Url: https://github.com/iotbzh/xds-cli.git
-Source0: xds-cli_linux-amd64-v%{version}_2018-04-05_110646.zip
+Url: https://gerrit.automotivelinux.org/gerrit/p/src/xds/xds-cli.git
+Source0: xds-cli_linux-amd64-%{version}.zip
BuildRequires: unzip
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Group: Development/Tools/Debuggers
%description
xds-cli is a client tool that should be used to interact with an XDS server.
@@ -27,6 +28,10 @@ xds-cli is a client tool that should be used to interact with an XDS server.
mkdir -p %{?buildroot}%{_prefix}/xds/cli %{?buildroot}%{_bindir}
cp xds-cli %{?buildroot}%{_prefix}/xds/cli
ln -s ../xds/cli/xds-cli %{?buildroot}%{_bindir}/xds-cli
+
+mkdir -p %{?buildroot}%{_sysconfdir}/bash_completion.d
+cp ./conf.d/etc/bash_completion.d/xds-cli %{?buildroot}%{_sysconfdir}/bash_completion.d/
+
mkdir -p %{?buildroot}%{_sysconfdir}/profile.d
sed -e "s;@XDS_INSTALL_BIN_DIR@;%{_bindir};g" ./conf.d/etc/profile.d/xds-cli.sh > %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh
@@ -38,5 +43,6 @@ sed -e "s;@XDS_INSTALL_BIN_DIR@;%{_bindir};g" ./conf.d/etc/profile.d/xds-cli.sh
%dir %{_prefix}/xds/cli
%{_prefix}/xds/cli/*
%{_bindir}/xds-cli
+%attr(644,root,root) %{_sysconfdir}/bash_completion.d/xds-cli
%config %{_sysconfdir}/profile.d/%{name}.sh
%attr(644,root,root) %{_sysconfdir}/profile.d/%{name}.sh
diff --git a/scripts/install.sh b/scripts/install.sh
index 0087302..e872923 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -1,5 +1,4 @@
#!/bin/bash
-
###########################################################################
# Copyright 2017-2018 IoT.bzh
#