diff options
author | Ronan Le Martret <ronan.lemartret@iot.bzh> | 2018-05-14 18:21:23 +0200 |
---|---|---|
committer | Jose Bollo <jose.bollo@iot.bzh> | 2018-06-20 14:07:53 +0200 |
commit | c76c2065098751a6747e70ae9d67440003eb0c5d (patch) | |
tree | 83a665bd84d1899b69391c1d6f1fa2014b4e08bc /conf.d | |
parent | 611893f7b9b39a0d3d4cb36d2af3924251af411b (diff) |
packaging: Update spec and deb packaging
- sort files by packaging type
Change-Id: Ic914b5eedffce04356bb59db36be30ba81a8a20d
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
Diffstat (limited to 'conf.d')
-rw-r--r-- | conf.d/packaging/deb/agl-app-framework-binder.dsc (renamed from conf.d/packaging/agl-app-framework-binder.dsc) | 8 | ||||
-rw-r--r-- | conf.d/packaging/deb/debian.agl-app-framework-binder-bin.install (renamed from conf.d/packaging/debian.agl-app-framework-binder-bin.install) | 3 | ||||
-rw-r--r-- | conf.d/packaging/deb/debian.agl-app-framework-binder-dev.install (renamed from conf.d/packaging/debian.agl-app-framework-binder-dev.install) | 0 | ||||
-rw-r--r-- | conf.d/packaging/deb/debian.changelog (renamed from conf.d/packaging/debian.changelog) | 0 | ||||
-rw-r--r-- | conf.d/packaging/deb/debian.compat (renamed from conf.d/packaging/debian.compat) | 0 | ||||
-rw-r--r-- | conf.d/packaging/deb/debian.control (renamed from conf.d/packaging/debian.control) | 2 | ||||
-rw-r--r-- | conf.d/packaging/deb/debian.rules (renamed from conf.d/packaging/debian.rules) | 0 | ||||
-rw-r--r-- | conf.d/packaging/rpm/agl-app-framework-binder.spec (renamed from conf.d/packaging/agl-app-framework-binder.spec) | 41 |
8 files changed, 35 insertions, 19 deletions
diff --git a/conf.d/packaging/agl-app-framework-binder.dsc b/conf.d/packaging/deb/agl-app-framework-binder.dsc index 96612fbe..564083fd 100644 --- a/conf.d/packaging/agl-app-framework-binder.dsc +++ b/conf.d/packaging/deb/agl-app-framework-binder.dsc @@ -5,8 +5,8 @@ Architecture: any Version: 2.0-0 Maintainer: unknown <unknown@debian.org> Standards-Version: 3.8.2 -Homepage: https://gerrit.automotivelinux.org/gerrit/#/admin/projects/src/app-framework-binder -Build-Depends: debhelper (>= 5), +Homepage: https://gerrit.automotivelinux.org/gerrit/src/app-framework-binder +Build-Depends: debhelper (>= 5), pkg-config, dpkg-dev, libmicrohttpd-dev (>= 0.9.54), cmake, @@ -16,4 +16,6 @@ Build-Depends: debhelper (>= 5), libgcrypt20-dev, libjson-c-dev, libmagic-dev -Debtransform-Tar: agl-app-framework-binder_2.0.orig.tar.gz +DEBTRANSFORM-RELEASE: 1 +Files: + app-framework-binder_2.0.tar.gz diff --git a/conf.d/packaging/debian.agl-app-framework-binder-bin.install b/conf.d/packaging/deb/debian.agl-app-framework-binder-bin.install index 3faebfb3..17c19520 100644 --- a/conf.d/packaging/debian.agl-app-framework-binder-bin.install +++ b/conf.d/packaging/deb/debian.agl-app-framework-binder-bin.install @@ -1,4 +1,4 @@ -/opt/AGL/lib/*/libafbwsc.so.1.0 +/opt/AGL/lib/*/libafbwsc.so.1.1 /opt/AGL/lib/*/libafbwsc.so.1 /opt/AGL/lib/*/afb/authLogin.so /opt/AGL/lib/*/afb/demoPost.so @@ -12,3 +12,4 @@ /opt/AGL/bin/afb-client-demo /opt/AGL/bin/afb-genskel /etc/profile.d/AGL_app-framework-binder.sh +/opt/AGL/lib/*/afb/monitoring/* diff --git a/conf.d/packaging/debian.agl-app-framework-binder-dev.install b/conf.d/packaging/deb/debian.agl-app-framework-binder-dev.install index 2d1a4016..2d1a4016 100644 --- a/conf.d/packaging/debian.agl-app-framework-binder-dev.install +++ b/conf.d/packaging/deb/debian.agl-app-framework-binder-dev.install diff --git a/conf.d/packaging/debian.changelog b/conf.d/packaging/deb/debian.changelog index 131bac4b..131bac4b 100644 --- a/conf.d/packaging/debian.changelog +++ b/conf.d/packaging/deb/debian.changelog diff --git a/conf.d/packaging/debian.compat b/conf.d/packaging/deb/debian.compat index 45a4fb75..45a4fb75 100644 --- a/conf.d/packaging/debian.compat +++ b/conf.d/packaging/deb/debian.compat diff --git a/conf.d/packaging/debian.control b/conf.d/packaging/deb/debian.control index 0c57db96..29940f19 100644 --- a/conf.d/packaging/debian.control +++ b/conf.d/packaging/deb/debian.control @@ -1,7 +1,7 @@ Priority: optional Maintainer: unknown <unknown@debian.org> Source: agl-app-framework-binder -Build-Depends: debhelper (>= 5), +Build-Depends: debhelper (>= 5),pkg-config, libmicrohttpd-dev (>= 0.9.55), cmake, libsystemd-dev (>= 222), diff --git a/conf.d/packaging/debian.rules b/conf.d/packaging/deb/debian.rules index f9576409..f9576409 100644 --- a/conf.d/packaging/debian.rules +++ b/conf.d/packaging/deb/debian.rules diff --git a/conf.d/packaging/agl-app-framework-binder.spec b/conf.d/packaging/rpm/agl-app-framework-binder.spec index 9f3a2509..c35cffbb 100644 --- a/conf.d/packaging/agl-app-framework-binder.spec +++ b/conf.d/packaging/rpm/agl-app-framework-binder.spec @@ -6,14 +6,16 @@ %define __cmake cmake Name: agl-app-framework-binder +# WARNING {name} is not used for tar file name in source nor for setup +# Check hard coded values required to match git directory naming Version: 2.0 Release: 0 -License: GPL-2.0 -Summary: app-framework-binder +License: Apache-2.0 +Summary: AGL app-framework-binder Group: Development/Libraries/C and C++ Url: https://gerrit.automotivelinux.org/gerrit/#/admin/projects/src/app-framework-binder -Source: %{name}_%{version}.orig.tar.gz -#BuildRequires: gdb +Source: app-framework-binder-%{version}.tar.gz +#BuildRequires: gdb BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.55 BuildRequires: make BuildRequires: cmake @@ -24,23 +26,26 @@ BuildRequires: libgcrypt-devel BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(json-c) BuildRequires: file-devel +BuildRequires: gcc-c++ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -app-framework-binder +Provides a test agl binder service which can be used to test agl bindings on Linux PC +This service is evolving permanently and is only designed as a helper for developper. %package devel -Summary: app-framework-binder-devel Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Provides: pkgconfig(%{name}) = %{version} - +Summary: AGL app-framework-binder-devel %description devel -app-framework-binder-devel +Provides a test agl binder service which can be used to test agl bindings on Linux PC +This service is evolving permanently and is only designed as a helper for developper. + %prep -%setup -q +%setup -q -n app-framework-binder-%{version} %build export PKG_CONFIG_PATH=%{_libdir}/pkgconfig @@ -53,8 +58,8 @@ export PKG_CONFIG_PATH=%{_libdir}/pkgconfig %make_install mkdir -p %{buildroot}%{_sysconfdir}/profile.d -cat << EOF > %{buildroot}%{_sysconfdir}/profile.d/AGL_%{name}.sh -#---------- AGL %{name} options Start ---------" +cat << EOF > %{buildroot}%{_sysconfdir}/profile.d/AGL-%{name}.sh +#---------- AGL %%{name} options Start ---------" # Object: AGL cmake option for binder/bindings export LD_LIBRARY_PATH=%{_libdir}:\${LD_LIBRARY_PATH} export LIBRARY_PATH=%{_libdir}:\${LIBRARY_PATH} @@ -81,15 +86,15 @@ EOF %{_libdir}/afb/afb-dbus-binding.so %{_libdir}/afb/authLogin.so %{_libdir}/libafbwsc.so.1 -%{_libdir}/libafbwsc.so.1.0 +%{_libdir}/libafbwsc.so.1.1 #app-framework-binder demo %{_libdir}/afb/demoContext.so %{_libdir}/afb/demoPost.so %{_libdir}/afb/helloWorld.so %{_libdir}/afb/tic-tac-toe.so -%{_libdir}/afb/monitoring/* -%{_sysconfdir}/profile.d/AGL_%{name}.sh +%{_libdir}/afb/ave.so +%config(noreplace) %{_sysconfdir}/profile.d/AGL-%{name}.sh #app-framework-binder monitoring %dir %{_libdir}/afb/monitoring @@ -102,5 +107,13 @@ EOF %dir %{_includedir} %dir %{_includedir}/afb %{_includedir}/afb/*.h +%{_includedir}/afb/*.hpp +%{_includedir}/afb/afb-binding %dir %{_libdir}/pkgconfig %{_libdir}/pkgconfig/*.pc + +%changelog +* Wed Sep 27 2017 Dominig +- move to git repo +* Tue Aug 01 2017 Ronan +- initial creation |