summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2018-07-05 10:24:49 +0200
committerSebastien Douheret <sebastien.douheret@iot.bzh>2018-07-05 10:44:43 +0200
commit8f454ab11d3c0e9b6a40e125230539420dbbeb8b (patch)
tree907dc272ea392d5b10ace89efe8f6c7f7cd30001
parent91e5a1a769d4d5194cd6251e21bfb607b94f0c56 (diff)
Update/fix rpm and deb packaging
- fix packaging to be compliant with latest subprojects hierarchy (Master, Master-Next, ElectricEel, ...) - fix rpmlint warnings/error Change-Id: Ib8c2014624542d3dfb81818ed605dc7a2dedf2c5 Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
-rw-r--r--Makefile5
-rw-r--r--conf.d/etc/profile.d/xds-server.sh3
-rw-r--r--conf.d/packaging/deb/agl-xds-server.dsc6
-rw-r--r--conf.d/packaging/deb/debian.control2
-rw-r--r--conf.d/packaging/rpm/agl-xds-server.spec11
-rwxr-xr-xscripts/sdks/agl/db-dump2
6 files changed, 16 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index 271061c..3877ab7 100644
--- a/Makefile
+++ b/Makefile
@@ -103,7 +103,10 @@ 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
diff --git a/conf.d/etc/profile.d/xds-server.sh b/conf.d/etc/profile.d/xds-server.sh
index 3459829..738be21 100644
--- a/conf.d/etc/profile.d/xds-server.sh
+++ b/conf.d/etc/profile.d/xds-server.sh
@@ -1,5 +1,4 @@
-#!/bin/bash
- ###########################################################################
+###########################################################################
# Copyright 2017 IoT.bzh
#
# author: Sebastien Douheret <sebastien@iot.bzh>
diff --git a/conf.d/packaging/deb/agl-xds-server.dsc b/conf.d/packaging/deb/agl-xds-server.dsc
index 2dd2119..bc254a2 100644
--- a/conf.d/packaging/deb/agl-xds-server.dsc
+++ b/conf.d/packaging/deb/agl-xds-server.dsc
@@ -2,10 +2,10 @@ Format: 1.0
Source: agl-xds-server
Binary: agl-xds-server
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-server.git
+Homepage: https://gerrit.automotivelinux.org/gerrit/p/src/xds/xds-server.git
Build-Depends: debhelper (>= 5),
unzip
-Debtransform-Tar: xds-server_linux-amd64-v1.1.1_2018-04-05_111758.zip
+Debtransform-Tar: xds-server_linux-amd64-*.zip
diff --git a/conf.d/packaging/deb/debian.control b/conf.d/packaging/deb/debian.control
index 8d29279..f2dcafe 100644
--- a/conf.d/packaging/deb/debian.control
+++ b/conf.d/packaging/deb/debian.control
@@ -4,7 +4,7 @@ Source: agl-xds-server
Build-Depends: debhelper (>= 5),
unzip
Standards-Version: 3.8.2
-Homepage: https://github.com/iotbzh/xds-server.git
+Homepage: https://gerrit.automotivelinux.org/gerrit/p/src/xds/xds-server.git
Package: agl-xds-server
Section: libs
diff --git a/conf.d/packaging/rpm/agl-xds-server.spec b/conf.d/packaging/rpm/agl-xds-server.spec
index 74e5b33..ee59be1 100644
--- a/conf.d/packaging/rpm/agl-xds-server.spec
+++ b/conf.d/packaging/rpm/agl-xds-server.spec
@@ -6,14 +6,15 @@
%global debug_package %{nil}
Name: agl-xds-server
-Version: 1.1.1
+Version: 0.0.0
Release: 0
License: Apache-2.0
Summary: XDS-server
-Url: https://github.com/iotbzh/xds-server.git
-Source0: xds-server_linux-amd64-v%{version}_2018-04-05_111758.zip
+Url: https://gerrit.automotivelinux.org/gerrit/p/src/xds/xds-server.git
+Source0: xds-server_linux-amd64-%{version}.zip
BuildRequires: unzip
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Group: Development/Tools/Debuggers
# for now still embedded with xds
# Requires: syncthing
@@ -55,8 +56,8 @@ sed -e "s;@XDS_INSTALL_BIN_DIR@;%{_bindir};g" ./conf.d/etc/profile.d/xds-server.
%{_bindir}/syncthing-inotify
%dir %{_sysconfdir}/xds
%dir %{_sysconfdir}/xds/server
-%{_sysconfdir}/default/xds-server
-%{_sysconfdir}/xds/server/*
+%config %{_sysconfdir}/default/xds-server
+%config %{_sysconfdir}/xds/server/*
%config %{_sysconfdir}/profile.d/%{name}.sh
%dir %{_userunitdir}
%{_userunitdir}/xds-server.service
diff --git a/scripts/sdks/agl/db-dump b/scripts/sdks/agl/db-dump
index ec2b1d8..ab6cfd4 100755
--- a/scripts/sdks/agl/db-dump
+++ b/scripts/sdks/agl/db-dump
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/python3
#
# /**************************************************************************
# * Copyright 2017-2018 IoT.bzh