From e0faa97416aee22fa0c09f75a4040bb2bb16e2dd Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Fri, 6 Jul 2018 18:39:00 +0200 Subject: Update/fix rpm and deb packaging Change-Id: I576c7c02def683dc3028194e68416bfc0b167067 Signed-off-by: Sebastien Douheret --- conf.d/etc/bash_completion.d/xds-cli | 2 +- conf.d/etc/profile.d/xds-cli.sh | 2 -- conf.d/packaging/deb/agl-xds-cli.dsc | 6 +++--- conf.d/packaging/deb/debian.control | 2 +- conf.d/packaging/deb/debian.rules | 4 ++++ conf.d/packaging/obs/_service | 20 -------------------- conf.d/packaging/obs/_service.in | 20 ++++++++++++++++++++ conf.d/packaging/rpm/agl-xds-cli.spec | 12 +++++++++--- 8 files changed, 38 insertions(+), 30 deletions(-) delete mode 100644 conf.d/packaging/obs/_service create mode 100644 conf.d/packaging/obs/_service.in (limited to 'conf.d') 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 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 deleted file mode 100644 index 554a5bf..0000000 --- a/conf.d/packaging/obs/_service +++ /dev/null @@ -1,20 +0,0 @@ - - - https://gerrit.automotivelinux.org/gerrit/src/xds/xds-cli - git - @VERSION@ - @REVISON@ - conf.d/packaging/rpm/agl-xds-cli.spec - conf.d/packaging/deb/agl-xds-cli.dsc - conf.d/packaging/deb/agl-xds-cli.install - conf.d/packaging/deb/debian.changelog - conf.d/packaging/deb/debian.compat - conf.d/packaging/deb/debian.control - conf.d/packaging/deb/debian.rules - - - gz - *.tar - - - diff --git a/conf.d/packaging/obs/_service.in b/conf.d/packaging/obs/_service.in new file mode 100644 index 0000000..1540fc3 --- /dev/null +++ b/conf.d/packaging/obs/_service.in @@ -0,0 +1,20 @@ + + + https://gerrit.automotivelinux.org/gerrit/src/xds/xds-cli + git + @VERSION@ + @REVISION@ + conf.d/packaging/rpm/agl-xds-cli.spec + conf.d/packaging/deb/agl-xds-cli.dsc + conf.d/packaging/deb/agl-xds-cli.install + conf.d/packaging/deb/debian.changelog + conf.d/packaging/deb/debian.compat + conf.d/packaging/deb/debian.control + conf.d/packaging/deb/debian.rules + + + gz + *.tar + + + 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 -- cgit 1.2.3-korg